diff --git a/bundles/uds-core-swf/uds-bundle.yaml b/bundles/uds-core-swf/uds-bundle.yaml
index 2f21d479..36e430b9 100644
--- a/bundles/uds-core-swf/uds-bundle.yaml
+++ b/bundles/uds-core-swf/uds-bundle.yaml
@@ -15,6 +15,19 @@ packages:
     optionalComponents:
       - git-server
     ref: v0.33.0
+    overrides:
+      zarf-seed-registry:
+        docker-registry:
+          variables:
+            - name: REGISTRY_STORAGE_CLASS
+              path: persistence.storageClass
+              default: "nutanix-dynamicfile"
+      zarf-registry:
+        docker-registry:
+          variables:
+            - name: REGISTRY_STORAGE_CLASS
+              path: persistence.storageClass
+              default: "nutanix-dynamicfile"
 
   # Namespace pre-reqs for swf capabilities
   - name: software-factory-namespaces
diff --git a/config/uds-config.yaml b/config/uds-config.yaml
index 3dd74c8a..dfd11847 100644
--- a/config/uds-config.yaml
+++ b/config/uds-config.yaml
@@ -6,7 +6,22 @@ shared:
   ADDITIONAL_CA_CHAIN: replace-me-with-additional-ca-chain
 variables:
   init:
-    REGISTRY_HPA_ENABLE: false
+    REGISTRY_AFFINITY_CUSTOM: |
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                  - key: app
+                    operator: In
+                    values:
+                      - docker-registry
+              topologyKey: kubernetes.io/hostname    REGISTRY_HPA_AUTO_SIZE: true
+    REGISTRY_HPA_ENABLE: true
+    REGISTRY_PVC_ACCESS_MODE: ReadWriteMany
+    REGISTRY_PVC_ENABLED: true
+    REGISTRY_STORAGE_CLASS: "nutanix-dynamicfile"
     PRISM_ENDPOINT: "PRISM element IP address"
     PRISM_USERNAME: "csi-user-prism-element-user"
     PRISM_PASSWORD: "csi-user-passoword"