diff --git a/helm/dbrepo/templates/search-secret.yaml b/helm/dbrepo/templates/search-secret.yaml
index 6bbc747123f6f5aa8d0e669dd991b43baa135a67..08ed410c06442ae4fce27295d129b578f772795a 100644
--- a/helm/dbrepo/templates/search-secret.yaml
+++ b/helm/dbrepo/templates/search-secret.yaml
@@ -24,4 +24,6 @@ stringData:
   OPENSEARCH_PORT: "{{ .Values.searchdb.port }}"
   OPENSEARCH_USERNAME: "{{ .Values.searchdb.security.adminUsername }}"
   OPENSEARCH_PASSWORD: "{{ .Values.searchdb.security.adminPassword }}"
+  SYSTEM_USERNAME: "{{ .Values.identityservice.users }}"
+  SYSTEM_PASSWORD: "{{ .Values.identityservice.userPasswords }}"
 {{- end }}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index 4d9376c06ea315e13a615477b4b618cbe1e5afad..9afc47022d690ba679276c2cd5b4c76c4e7a34be 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -112,7 +112,7 @@ authservice:
   init:
     image:
       ## @skip authservice.init.image.name
-      name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.1rc4
+      name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.1
     ## @param authservice.init.resourcesPreset The container resource preset
     resourcesPreset: "nano"
     ## @param authservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -383,7 +383,7 @@ analyseservice:
   enabled: true
   image:
     ## @skip analyseservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.1rc4
+    name: registry.datalab.tuwien.ac.at/dbrepo/analyse-service:1.6.1
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param analyseservice.podSecurityContext.enabled Enable pods' Security Context
@@ -444,7 +444,7 @@ metadataservice:
   enabled: true
   image:
     ## @skip metadataservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.1rc4
+    name: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.1
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param metadataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -541,7 +541,7 @@ dataservice:
   endpoint: http://data-service
   image:
     ## @skip dataservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.1rc4
+    name: registry.datalab.tuwien.ac.at/dbrepo/data-service:1.6.1
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param dataservice.podSecurityContext.enabled Enable pods' Security Context
@@ -627,7 +627,7 @@ searchservice:
   endpoint: http://search-service
   image:
     ## @skip searchservice.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.1rc4
+    name: registry.datalab.tuwien.ac.at/dbrepo/search-service:1.6.1
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param searchservice.podSecurityContext.enabled Enable pods' Security Context
@@ -674,7 +674,7 @@ searchservice:
   init:
     image:
       ## @skip searchservice.init.image.name
-      name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.1rc4
+      name: registry.datalab.tuwien.ac.at/dbrepo/search-service-init:1.6.1
     ## @param searchservice.init.resourcesPreset The container resource preset
     resourcesPreset: "nano"
     ## @param searchservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
@@ -735,7 +735,7 @@ storageservice:
   init:
     image:
       ## @skip storageservice.init.image.name
-      name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.1rc4
+      name: registry.datalab.tuwien.ac.at/dbrepo/storage-service-init:1.6.1
     s3:
       ## @param storageservice.init.s3.endpoint The S3-capable endpoint the microservice connects to.
       endpoint: http://storage-service-s3:8333
@@ -844,7 +844,7 @@ ui:
   enabled: true
   image:
     ## @skip ui.image.name
-    name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.1rc4
+    name: registry.datalab.tuwien.ac.at/dbrepo/ui:1.6.1
   ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
   podSecurityContext:
     ## @param ui.podSecurityContext.enabled Enable pods' Security Context