diff --git a/chart/templates/uds-package.yaml b/chart/templates/uds-package.yaml
index 9993bea8..27149464 100644
--- a/chart/templates/uds-package.yaml
+++ b/chart/templates/uds-package.yaml
@@ -105,11 +105,11 @@ spec:
       - direction: Egress
         selector:
           app.kubernetes.io/name: mattermost-enterprise-edition
-        {{- if .Values.objectStorage.internal }}
-        remoteNamespace: {{ .Values.objectStorage.namespace | quote }}
+        {{- if .Values.storage.internal }}
+        remoteNamespace: {{ .Values.storage.namespace | quote }}
         remoteSelector:
-          {{ .Values.objectStorage.selector | toYaml | nindent 10 }}
-        port: {{ .Values.objectStorage.port }}
+          {{ .Values.storage.selector | toYaml | nindent 10 }}
+        port: {{ .Values.storage.port }}
         {{- else }}
         remoteGenerated: Anywhere
         {{- end }}
diff --git a/chart/values.yaml b/chart/values.yaml
index b419ac35..2d3c5f51 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -4,11 +4,6 @@
 domain: "###ZARF_VAR_DOMAIN###"
 
 objectStorage:
-  internal: true
-  selector:
-    app: minio
-  namespace: minio
-  port: 9000
   secure: true
   accessKey: ""
   secretKey: ""
@@ -70,13 +65,13 @@ config:
 # Additional environment variables for Mattermost
 extraEnv: {}
 
-# storage:
-#   # Set to false to use external storage
-#   internal: true
-#   selector:
-#     app: minio
-#   namespace: dev-minio
-#   port: 9000
+storage:
+  # Set to false to use external storage
+  internal: true
+  selector:
+    app: minio
+  namespace: minio
+  port: 9000
 
 # custom:
 #    # Notice no `remoteGenerated` field here on custom internal rule