diff --git a/customers/base/nextcloud-deployment.yml b/customers/base/nextcloud-deployment.yml
index 9236a1e..35cf8b3 100644
--- a/customers/base/nextcloud-deployment.yml
+++ b/customers/base/nextcloud-deployment.yml
@@ -97,9 +97,9 @@ spec:
                   name: mail-secret
                   key: "smtp_password"
             - name: MYSQL_DATABASE
-              value: "customer_nextcloud"
+              value: "nextcloud_customer"
             - name: MYSQL_USER
-              value: "customer_nextcloud"
+              value: "nextcloud_customer"
             - name: MYSQL_HOST
               value: "proxysqlcluster.proxysql"
             - name: MYSQL_PASSWORD
diff --git a/customers/overlays/vr/test/nextcloud-deployment.yml b/customers/overlays/vr/test/nextcloud-deployment.yml
index 2c32d8d..861ceaa 100644
--- a/customers/overlays/vr/test/nextcloud-deployment.yml
+++ b/customers/overlays/vr/test/nextcloud-deployment.yml
@@ -15,9 +15,9 @@ spec:
           name: init-config
           env:
             - name: MYSQL_DATABASE
-              value: "vr_nextcloud"
+              value: "nextcloud_vr"
             - name: MYSQL_USER
-              value: "vr_nextcloud"
+              value: "nextcloud_vr"
             - name: GSS_MASTER_URL
               value: "https://drive.test.sunet.se"
             - name: LOOKUP_SERVER