diff --git a/flux2/apps/nextcloud/release.yaml b/flux2/apps/nextcloud/release.yaml
index bcef09fd615d253078545271fa2ada08b41b39a7..6061b8e9e96ed6b4882c5f0bd3d4ac482d6547f3 100644
--- a/flux2/apps/nextcloud/release.yaml
+++ b/flux2/apps/nextcloud/release.yaml
@@ -192,10 +192,6 @@ spec:
       client_id: nextcloud
       client_secret: "${nextcloud_oauth_client_secret}"
       groups_claim: "openappstack_roles"
-  valuesFrom:
-    - kind: ConfigMap
-      name: nextcloud-values-override
-      optional: true
   # Allow custom values either by configMap or by secret
   valuesFrom:
     - kind: ConfigMap
diff --git a/install/install-nextcloud.sh b/install/install-nextcloud.sh
index e6aea0346665a8490e3afbb01bdafa28eda5b8ea..b1a2961641f07a38e43230cf03d475814e299f04 100755
--- a/install/install-nextcloud.sh
+++ b/install/install-nextcloud.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # First, add some overrides for values that are only useful in CI
-kubectl apply -n oas-apps -f $( dirname "${BASH_SOURCE[0]}" )/nextcloud-values-override.yaml
+kubectl apply -n oas-apps -f $( dirname "${BASH_SOURCE[0]}" )/oas-nextcloud-override.yaml
 
 # This kustomization's only purpose is to add the kustomization that is in the
 # flxu2/cluster/optional/nextcloud folder. After this kustomization is applied
diff --git a/install/nextcloud-values-override.yaml b/install/oas-nextcloud-override.yaml
similarity index 81%
rename from install/nextcloud-values-override.yaml
rename to install/oas-nextcloud-override.yaml
index 238c6409e4380ad5c327b10e396efa16fcbf6ae1..5ad5657aea91c73c72d1db5ee08debbb856ca9c1 100644
--- a/install/nextcloud-values-override.yaml
+++ b/install/oas-nextcloud-override.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: nextcloud-values-override
+  name: oas-nextcloud-override
 data:
   values.yaml: |
     onlyoffice: