diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
index 0b98e5d02f67c5090f9b7574aebc42910173aa7a..6454e1947d3d7182b45052f89239c520dba95948 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java
@@ -22,7 +22,6 @@ import java.util.List;
 @NoArgsConstructor
 @EntityListeners(AuditingEntityListener.class)
 @EqualsAndHashCode(onlyExplicitlyIncluded = true)
-@OnDelete(action = OnDeleteAction.CASCADE)
 @Table(name = "mdb_images", uniqueConstraints = @UniqueConstraint(columnNames = {"name", "version"}))
 public class ContainerImage {
 
diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile
index 6094b8e201f82dc1beb8a5e0b3f29bb98c5b6bc2..14f1e57c1ecdbe729040dd929b5842ced137e6b4 100644
--- a/dbrepo-ui/Dockerfile
+++ b/dbrepo-ui/Dockerfile
@@ -29,8 +29,8 @@ RUN bun run build
 FROM oven/bun:1.0.26-alpine as runtime
 MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
 
-ARG VERSION="bun-dev"
-ARG COMMIT="deadbeef"
+ARG APP_VERSION="latest"
+ARG COMMIT=""
 
 USER 1000
 
@@ -38,7 +38,7 @@ WORKDIR /app
 
 COPY --from=build --chown=1000:1000 /app/.output /app/.output
 
-ENV NUXT_PUBLIC_VERSION="${VERSION:-}"
+ENV NUXT_PUBLIC_VERSION="${APP_VERSION:-}"
 ENV NUXT_PUBLIC_COMMIT="${COMMIT:-}"
 
 EXPOSE 3000
diff --git a/dbrepo-ui/nuxt.config.ts b/dbrepo-ui/nuxt.config.ts
index e5267c5edb0a2692595e35ba2f31e96a79ac2939..f3b9c06d99c96b3c542ecfbbc082496ac53698a4 100644
--- a/dbrepo-ui/nuxt.config.ts
+++ b/dbrepo-ui/nuxt.config.ts
@@ -100,7 +100,7 @@ export default defineNuxtConfig({
         },
         rabbitmq: {
           text: 'RabbitMQ Admin',
-          href: '/api/broker/'
+          href: '/admin/broker/'
         },
         keycloak: {
           text: 'Keycloak Admin',
diff --git a/docker-compose.yml b/docker-compose.yml
index 912a6b96087ca89b765379dddc4b6c37edcf6eb7..b116626b680b77cfff3d109b63fcfd76545b7617 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -301,8 +301,8 @@ services:
     build:
       context: ./dbrepo-ui
       args:
-        VERSION: ${VERSION}
-        COMMIT: ${CI_COMMIT_SHA}
+        APP_VERSION: ${APP_VERSION:-latest}
+        COMMIT: ${CI_COMMIT_SHA:-}
       network: host
     depends_on:
       dbrepo-search-service:
diff --git a/helm-charts/dbrepo/templates/data-db/pvc.yaml b/helm-charts/dbrepo/templates/data-db/pvc.yaml
index b730f78e167602e16ee2f83fba3ffefb2739cbeb..617e42f539ef13069feb41a633f73b96713f49ec 100644
--- a/helm-charts/dbrepo/templates/data-db/pvc.yaml
+++ b/helm-charts/dbrepo/templates/data-db/pvc.yaml
@@ -1,5 +1,4 @@
 {{- if .Values.dataDb.enabled }}
-{{- if .Values.dataDb.persistence.enabled }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -14,5 +13,4 @@ spec:
   resources:
     requests:
       storage: 8Gi
-{{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/helm-charts/dbrepo/values.yaml b/helm-charts/dbrepo/values.yaml
index 726251e07b876a51b3e6fc524026c23520c14e00..2ca64a0f73154562c475dde17ef226673f66b094 100644
--- a/helm-charts/dbrepo/values.yaml
+++ b/helm-charts/dbrepo/values.yaml
@@ -324,22 +324,13 @@ brokerService:
     auth_oauth2.resource_server_id = rabbitmq
     auth_oauth2.preferred_username_claims.1 = client_id
     auth_oauth2.default_key = t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM
-    auth_oauth2.signing_keys.t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM = /etc/rabbitmq/cert.pem
-    auth_oauth2.signing_keys.id2 = /etc/rabbitmq/pubkey.pem
+    auth_oauth2.signing_keys.t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM = /app/cert.pem
+    auth_oauth2.signing_keys.id2 = /app/pubkey.pem
     auth_oauth2.algorithms.1 = HS256
     auth_oauth2.algorithms.2 = RS256
   loadDefinition:
     enabled: true
     existingSecret: broker-service-secret
-  extraVolumeMounts:
-    - name: secret-map
-      mountPath: /etc/rabbitmq/pubkey.pem
-      subPath: pubkey.pem
-      readOnly: true
-    - name: secret-map
-      mountPath: /etc/rabbitmq/cert.pem
-      subPath: cert.pem
-      readOnly: true
   extraVolumes:
     - name: secret-map
       secret:
@@ -350,6 +341,7 @@ brokerService:
     size: 5Gi
   service:
     type: ClusterIP
+    managerPortEnabled: true
     # loadBalancerIP:
   replicaCount: 1
 
@@ -496,6 +488,10 @@ ingress:
       nginx.ingress.kubernetes.io/use-regex: "true"
       nginx.ingress.kubernetes.io/rewrite-target: /api/$1
     rewriteRoot:
+#      cert-manager.io/cluster-issuer: letsencrypt-cluster-issuer
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      nginx.ingress.kubernetes.io/rewrite-target: /$1
+    rewriteRootSecure:
 #      cert-manager.io/cluster-issuer: letsencrypt-cluster-issuer
       nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
       nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"