diff --git a/flux2/core/base/single-sign-on/pvc-database.yaml b/flux2/core/base/single-sign-on/pvc-database.yaml
index 2167bd048e9dc6df4f37c9ca5035d5b6bd41a274..d75e6df3af49a929350a4d37f29ef801635fad50 100644
--- a/flux2/core/base/single-sign-on/pvc-database.yaml
+++ b/flux2/core/base/single-sign-on/pvc-database.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: stackspin-single-sign-on-database
+  name: single-sign-on-database
 spec:
   accessModes:
     - ReadWriteOnce
diff --git a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
index 662e7bca57724e98e9c5c9c154f708f956afc50a..e77ce0cd67d25c4c54abd59c9ad2fe821a5eb605 100644
--- a/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
+++ b/flux2/core/base/single-sign-on/single-sign-on-values-configmap.yaml
@@ -41,7 +41,7 @@ data:
 
     postgresql:
       persistence:
-        existingClaim: stackspin-single-sign-on-database
+        existingClaim: single-sign-on-database
       initdbScripts:
         setup.sql: |
           CREATE USER hydra WITH PASSWORD '${hydra_postgresql_password}';
diff --git a/flux2/infrastructure/sources/single-sign-on.yaml b/flux2/infrastructure/sources/single-sign-on.yaml
index a418f77a05388da3a8af9825d18b55a1b8e15b65..69c64d9a8d722736c3c14897970e66db12067493 100644
--- a/flux2/infrastructure/sources/single-sign-on.yaml
+++ b/flux2/infrastructure/sources/single-sign-on.yaml
@@ -14,4 +14,5 @@ spec:
   # For all available options, see:
   # https://toolkit.fluxcd.io/components/source/api/#source.toolkit.fluxcd.io/v1beta1.GitRepositoryRef
   ref:
-    tag: 0.4.1
+    # tag: 0.4.1
+    branch: 99-database-pvc-creation-should-be-optional