diff --git a/helm-chart/Chart.lock b/helm-chart/Chart.lock
index fe0ada4065..f55982f1f5 100644
--- a/helm-chart/Chart.lock
+++ b/helm-chart/Chart.lock
@@ -5,5 +5,8 @@ dependencies:
 - name: redis
   repository: oci://registry-1.docker.io/bitnamicharts
   version: 20.11.2
-digest: sha256:6233567e6d133fd87585de7cb11f835125ab649fc7979eac7b17d4b2881f54dc
-generated: "2025-03-06T15:48:20.190945+05:30"
+- name: minio
+  repository: oci://registry-1.docker.io/bitnamicharts
+  version: 15.0.7
+digest: sha256:ce42b49e555fb89d365b44de289a2020c6cc8696eaa2aab6f5317b9ee8558ec2
+generated: "2025-03-27T14:35:28.229585+05:30"
diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml
index 5176281925..2d531e2e59 100644
--- a/helm-chart/Chart.yaml
+++ b/helm-chart/Chart.yaml
@@ -26,3 +26,7 @@ dependencies:
     version: 20.11.2
     repository: "oci://registry-1.docker.io/bitnamicharts"
     condition: redis.enabled
+  - name: minio
+    repository: "oci://registry-1.docker.io/bitnamicharts"
+    version: 15.0.7
+    condition: minio.enabled
diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml
index d82d71025c..87417a718f 100644
--- a/helm-chart/templates/deployment.yaml
+++ b/helm-chart/templates/deployment.yaml
@@ -127,6 +127,22 @@ spec:
           {{- end }}
           {{- end }}
           env:
+            {{- if .Values.minio.enabled }}
+            - name: S3_ACCESS_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: formbricks-minio
+                  key: root-user
+            - name: S3_SECRET_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: formbricks-minio
+                  key: root-password
+            - name: S3_BUCKET_NAME
+              value: formbricks
+            - name: S3_ENDPOINT
+              value: http://formbricks-minio:9000
+            {{- end }}
             {{- range $key, $value := .Values.deployment.env }}
             - name: {{ include "formbricks.tplvalues.render" ( dict "value" $key "context" $ ) }}
               {{- if kindIs "string" $value }}
diff --git a/helm-chart/templates/secrets.yaml b/helm-chart/templates/secrets.yaml
index 6872e3e0ab..7d430040b8 100644
--- a/helm-chart/templates/secrets.yaml
+++ b/helm-chart/templates/secrets.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- include "formbricks.labels" . | nindent 4 }}
 data:
   {{- if .Values.redis.enabled }}
-  REDIS_URL: {{ printf "redis://:%s@formbricks-redis-master:6379" $redisPassword | b64enc }}
+  REDIS_URL: {{ printf "redis://default:%s@formbricks-redis-master:6379" $redisPassword | b64enc }}
   {{- else }}
   REDIS_URL: {{ .Values.redis.externalRedisUrl | b64enc }}
   {{- end }}
@@ -34,4 +34,7 @@ data:
   POSTGRES_ADMIN_PASSWORD: {{ $postgresAdminPassword | b64enc }}
   POSTGRES_USER_PASSWORD: {{ $postgresUserPassword | b64enc }}
   {{- end }}
+  {{- if .Values.minio.enabled }}
+
+  {{- end }}
 {{- end }}
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index f69386f54f..aa8b20dc8b 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -326,3 +326,15 @@ prometheusRule:
        for: 1m
        labels:
          severity: critical
+
+##########################################################
+# Minio
+##########################################################
+minio:
+  enabled: true
+  fullnameOverride: formbricks-minio
+  mode: standalone
+  persistence:
+    enabled: true
+    size: 50Gi
+  defaultBuckets: "formbricks"
diff --git a/infra/formbricks-cloud-helm/values.yaml.gotmpl b/infra/formbricks-cloud-helm/values.yaml.gotmpl
index eb57fcec7b..93d644b4e4 100644
--- a/infra/formbricks-cloud-helm/values.yaml.gotmpl
+++ b/infra/formbricks-cloud-helm/values.yaml.gotmpl
@@ -166,3 +166,5 @@ postgresql:
   enabled: false
 redis:
   enabled: false
+minio:
+  enabled: false
diff --git a/docker/formbricks.sh b/infra/quickstart/formbricks.sh
similarity index 100%
rename from docker/formbricks.sh
rename to infra/quickstart/formbricks.sh