Issue Description: 

To make it easier to track deployments between our self-managed and app-interface environments, we can drop the usage of the "-jvm" suffix on the container images that we create as part of our CI pipeline.

Acceptance Criteria: 

• Drop the usage of the "-jvm" suffix from our container names in our self-managed environments.