diff --git a/aggregation-manager-job/src/main/helm/values.yaml b/aggregation-manager-job/src/main/helm/values.yaml
index 490feccbcbedd761dbb7f0031bc0cabbf7795359..e619c25c4f0b53888af78724f990ae368aa49569 100644
--- a/aggregation-manager-job/src/main/helm/values.yaml
+++ b/aggregation-manager-job/src/main/helm/values.yaml
@@ -32,8 +32,8 @@ ozgcloud:
 
 database:
   useExternal: false
-  databaseName: aggregation-manager-database
-  secretName: ozg-mongodb-admin-aggregation-manager-user
+  databaseName: aggregation-manager-job-database
+  secretName: ozg-mongodb-admin-aggregation-manager-job-user
   tls:
     enabled: false
     secretName: ozg-mongodb-tls-cert
diff --git a/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml
index df55f9f418f22fb025af3a4e13a6cb3c5bdef32d..e29aca6a4f7fe3f44eb4b75a93e96f38abe1a7ab 100644
--- a/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml
+++ b/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml
@@ -68,14 +68,14 @@ tests:
             name: spring_data_mongodb_uri
             valueFrom:
               secretKeyRef:
-                name: ozg-mongodb-admin-aggregation-manager-user
+                name: ozg-mongodb-admin-aggregation-manager-job-user
                 key: connectionString.standardSrv
                 optional: false
       - contains:
           path: spec.jobTemplate.spec.template.spec.containers[0].env
           content:
             name: spring_data_mongodb_database
-            value: aggregation-manager-database
+            value: aggregation-manager-job-database
   - it: should configure external mongodb if useExternal
     set:
       database.useExternal: true
@@ -84,7 +84,7 @@ tests:
           path: spec.jobTemplate.spec.template.spec.containers[0].envFrom
           content:
             secretRef:
-              name: ozg-mongodb-admin-aggregation-manager-user
+              name: ozg-mongodb-admin-aggregation-manager-job-user
   - it: should not have a volume for the mongodb certificate if tls is disabled
     set:
       database:
diff --git a/aggregation-manager-server/src/main/helm/values.yaml b/aggregation-manager-server/src/main/helm/values.yaml
index 9a8ce77be198ce12e66400b3198c012565a7abbc..4bdf812cfa4ba86de984d7ab832bb40f09b730db 100644
--- a/aggregation-manager-server/src/main/helm/values.yaml
+++ b/aggregation-manager-server/src/main/helm/values.yaml
@@ -32,8 +32,8 @@ ozgcloud:
 
 database:
   useExternal: false
-  databaseName: aggregation-manager-database
-  secretName: ozg-mongodb-admin-aggregation-manager-user
+  databaseName: aggregation-manager-server-database
+  secretName: ozg-mongodb-admin-aggregation-manager-server-user
   tls:
     enabled: false
     secretName: ozg-mongodb-tls-cert