diff --git a/aggregation-manager-server/src/main/helm/values.yaml b/aggregation-manager-server/src/main/helm/values.yaml
index 4cfe7dcdb16e442b0362a2cca6c5f66990612d8f..28717156a07df4447f3cee6e1ae73bc2a066eeb3 100644
--- a/aggregation-manager-server/src/main/helm/values.yaml
+++ b/aggregation-manager-server/src/main/helm/values.yaml
@@ -32,7 +32,7 @@ ozgcloud:
 
 database:
   useExternal: false
-  databaseName: aggregation-manager-server-database
+  databaseName: aggregation-manager-database
   secretName: ozg-mongodb-admin-aggregation-manager-user
   tls:
     enabled: false
diff --git a/aggregation-manager-server/src/test/helm/deployment_database_test.yaml b/aggregation-manager-server/src/test/helm/deployment_database_test.yaml
index cb3b4c83a32465b3ad01cd0259f6806a63e2c963..c433399484c3e1d568c815f41383e74bd43ed2cf 100644
--- a/aggregation-manager-server/src/test/helm/deployment_database_test.yaml
+++ b/aggregation-manager-server/src/test/helm/deployment_database_test.yaml
@@ -50,7 +50,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: spring_data_mongodb_database
-            value: aggregation-manager-server-database
+            value: aggregation-manager-database
   - it: should configure external mongodb if useExternal
     set:
       database.useExternal: true