diff --git a/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml b/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml
index d86e96d..a590c78 100644
--- a/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml
+++ b/kubernetes/apps/fediverse/mastodon/app/cnpg/cluster.yaml
@@ -35,7 +35,7 @@ spec:
         maxParallel: 8
       destinationPath: s3://valinor-cnpg/
       endpointURL: https://${SECRET_CLOUDFLARE_ACCOUNT_ID}.r2.cloudflarestorage.com
-      serverName: postgres-v3
+      serverName: valinor-postgres
       s3Credentials:
         accessKeyId:
           name: cloudnative-pg-secret
diff --git a/kubernetes/apps/fediverse/mastodon/ks.yaml b/kubernetes/apps/fediverse/mastodon/ks.yaml
index 79f1f93..7d7206e 100644
--- a/kubernetes/apps/fediverse/mastodon/ks.yaml
+++ b/kubernetes/apps/fediverse/mastodon/ks.yaml
@@ -170,6 +170,8 @@ kind: Kustomization
 metadata:
   name: cluster-apps-cloudnative-pg-cluster-mastodon
   namespace: flux-system
+  labels:
+    substitution.flux.home.arpa/enabled: "true"
 spec:
   dependsOn:
     - name: cluster-apps-cloudnative-pg