diff --git a/charts/flyte-core/values-eks.yaml b/charts/flyte-core/values-eks.yaml
index 63daeaa349..38e1e5429d 100644
--- a/charts/flyte-core/values-eks.yaml
+++ b/charts/flyte-core/values-eks.yaml
@@ -5,6 +5,7 @@ userSettings:
   dbPassword: <DB_PASSWORD>
   rdsHost: <RDS_HOST>
   bucketName: <BUCKET_NAME>
+  userBucketName: <RAW_DATA_BUCKET_NAME>
   logGroup: <LOG_GROUP_NAME>
   redisHostUrl: <REDIS_HOST_URL>
   redisHostKey: <REDIS_HOST_KEY>
diff --git a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
index 70b391f1ec..9701837bb0 100644
--- a/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
+++ b/deployment/eks/flyte_aws_scheduler_helm_generated.yaml
@@ -180,7 +180,7 @@ data:
         durationMinutes: 3
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -391,7 +391,7 @@ data:
       storage-prefix: metadata/datacatalog
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -505,7 +505,7 @@ data:
         type: noop
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -853,7 +853,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "95d1dd730b7edaa54371c132e487b3dfc870befaaccc585aa528bbe453d993e"
+        configChecksum: "4d5a990a82cbe032ea8d812a11455c556f0ffd5758f76de1754017c3d512e29"
       labels: 
         app.kubernetes.io/name: flyteadmin
         app.kubernetes.io/instance: flyte
@@ -1141,7 +1141,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "d2b4422443675df425e730b50f585783098d47541bd8ff756cc9e2185547351"
+        configChecksum: "8a96b2f36f440c1c0ecda8d41fe1ebf1acc9acb645e902553d20063cef472b6"
       labels: 
         app.kubernetes.io/name: datacatalog
         app.kubernetes.io/instance: flyte
@@ -1232,7 +1232,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "90cbb264b40c626ef7015afd66333240c9a1556d10f2c9aa81e45a0984f7bbf"
+        configChecksum: "8c42ded7052058802087b7025eea4d26ef8cbb0fa591d929c703335c4688e02"
       labels: 
         app.kubernetes.io/name: flytepropeller
         app.kubernetes.io/instance: flyte
@@ -1314,7 +1314,7 @@ spec:
         app.kubernetes.io/name: flyte-pod-webhook
         app.kubernetes.io/version: v1.10.7-b0
       annotations:
-        configChecksum: "90cbb264b40c626ef7015afd66333240c9a1556d10f2c9aa81e45a0984f7bbf"
+        configChecksum: "8c42ded7052058802087b7025eea4d26ef8cbb0fa591d929c703335c4688e02"
     spec:
       securityContext:
         fsGroup: 65534
diff --git a/deployment/eks/flyte_helm_controlplane_generated.yaml b/deployment/eks/flyte_helm_controlplane_generated.yaml
index 6acd808de3..1f532da347 100644
--- a/deployment/eks/flyte_helm_controlplane_generated.yaml
+++ b/deployment/eks/flyte_helm_controlplane_generated.yaml
@@ -161,7 +161,7 @@ data:
         durationMinutes: 3
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -357,7 +357,7 @@ data:
       storage-prefix: metadata/datacatalog
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -557,7 +557,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "570c02a8ecfaaeb8c41b95e1c7552d79d1e8939fe9bf88fdcf46f76aa94fb4f"
+        configChecksum: "a66378327daf755a8cea8f042c9985b075f4ff1b7d41035f441301083ae3355"
       labels: 
         app.kubernetes.io/name: flyteadmin
         app.kubernetes.io/instance: flyte
@@ -845,7 +845,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "d2b4422443675df425e730b50f585783098d47541bd8ff756cc9e2185547351"
+        configChecksum: "8a96b2f36f440c1c0ecda8d41fe1ebf1acc9acb645e902553d20063cef472b6"
       labels: 
         app.kubernetes.io/name: datacatalog
         app.kubernetes.io/instance: flyte
@@ -936,7 +936,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "570c02a8ecfaaeb8c41b95e1c7552d79d1e8939fe9bf88fdcf46f76aa94fb4f"
+        configChecksum: "a66378327daf755a8cea8f042c9985b075f4ff1b7d41035f441301083ae3355"
       labels: 
         app.kubernetes.io/name: flytescheduler
         app.kubernetes.io/instance: flyte
diff --git a/deployment/eks/flyte_helm_dataplane_generated.yaml b/deployment/eks/flyte_helm_dataplane_generated.yaml
index 647599150e..b9cd21e64b 100644
--- a/deployment/eks/flyte_helm_dataplane_generated.yaml
+++ b/deployment/eks/flyte_helm_dataplane_generated.yaml
@@ -166,7 +166,7 @@ data:
         type: noop
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -429,7 +429,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "90cbb264b40c626ef7015afd66333240c9a1556d10f2c9aa81e45a0984f7bbf"
+        configChecksum: "8c42ded7052058802087b7025eea4d26ef8cbb0fa591d929c703335c4688e02"
       labels: 
         app.kubernetes.io/name: flytepropeller
         app.kubernetes.io/instance: flyte
@@ -511,7 +511,7 @@ spec:
         app.kubernetes.io/name: flyte-pod-webhook
         app.kubernetes.io/version: v1.10.7-b0
       annotations:
-        configChecksum: "90cbb264b40c626ef7015afd66333240c9a1556d10f2c9aa81e45a0984f7bbf"
+        configChecksum: "8c42ded7052058802087b7025eea4d26ef8cbb0fa591d929c703335c4688e02"
     spec:
       securityContext:
         fsGroup: 65534
diff --git a/deployment/eks/flyte_helm_generated.yaml b/deployment/eks/flyte_helm_generated.yaml
index 838e76c4bf..7f9a774d7f 100644
--- a/deployment/eks/flyte_helm_generated.yaml
+++ b/deployment/eks/flyte_helm_generated.yaml
@@ -192,7 +192,7 @@ data:
         durationMinutes: 3
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -388,7 +388,7 @@ data:
       storage-prefix: metadata/datacatalog
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -536,7 +536,7 @@ data:
         type: noop
   storage.yaml: | 
     propeller:
-      rawoutput-prefix: s3:///data
+      rawoutput-prefix: s3://<RAW_DATA_BUCKET_NAME>/data
     storage:
       type: s3
       container: "<BUCKET_NAME>"
@@ -884,7 +884,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "570c02a8ecfaaeb8c41b95e1c7552d79d1e8939fe9bf88fdcf46f76aa94fb4f"
+        configChecksum: "a66378327daf755a8cea8f042c9985b075f4ff1b7d41035f441301083ae3355"
       labels: 
         app.kubernetes.io/name: flyteadmin
         app.kubernetes.io/instance: flyte
@@ -1172,7 +1172,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "d2b4422443675df425e730b50f585783098d47541bd8ff756cc9e2185547351"
+        configChecksum: "8a96b2f36f440c1c0ecda8d41fe1ebf1acc9acb645e902553d20063cef472b6"
       labels: 
         app.kubernetes.io/name: datacatalog
         app.kubernetes.io/instance: flyte
@@ -1263,7 +1263,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "570c02a8ecfaaeb8c41b95e1c7552d79d1e8939fe9bf88fdcf46f76aa94fb4f"
+        configChecksum: "a66378327daf755a8cea8f042c9985b075f4ff1b7d41035f441301083ae3355"
       labels: 
         app.kubernetes.io/name: flytescheduler
         app.kubernetes.io/instance: flyte
@@ -1351,7 +1351,7 @@ spec:
   template:
     metadata:
       annotations:
-        configChecksum: "90cbb264b40c626ef7015afd66333240c9a1556d10f2c9aa81e45a0984f7bbf"
+        configChecksum: "8c42ded7052058802087b7025eea4d26ef8cbb0fa591d929c703335c4688e02"
       labels: 
         app.kubernetes.io/name: flytepropeller
         app.kubernetes.io/instance: flyte
@@ -1433,7 +1433,7 @@ spec:
         app.kubernetes.io/name: flyte-pod-webhook
         app.kubernetes.io/version: v1.10.7-b0
       annotations:
-        configChecksum: "90cbb264b40c626ef7015afd66333240c9a1556d10f2c9aa81e45a0984f7bbf"
+        configChecksum: "8c42ded7052058802087b7025eea4d26ef8cbb0fa591d929c703335c4688e02"
     spec:
       securityContext:
         fsGroup: 65534