diff --git a/charts/bigdata-notebook-service/Chart.yaml b/charts/bigdata-notebook-service/Chart.yaml
index f7e6687e..41985aca 100644
--- a/charts/bigdata-notebook-service/Chart.yaml
+++ b/charts/bigdata-notebook-service/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-notebook-service
 description: A Helm chart for the Spot Big Data Notebook Service
 type: application
-version: 0.2.3
+version: 0.2.4
 appVersion: 0.1.16
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-notebook-service/templates/deployment.yaml b/charts/bigdata-notebook-service/templates/deployment.yaml
index 71920b14..0b5ef3e9 100644
--- a/charts/bigdata-notebook-service/templates/deployment.yaml
+++ b/charts/bigdata-notebook-service/templates/deployment.yaml
@@ -134,16 +134,6 @@ spec:
               containerPort: 2020
               protocol: TCP
           env:
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_ACCESS_KEY_ID
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_SECRET_ACCESS_KEY
             - name: AWS_BUCKET_NAME
               valueFrom:
                 secretKeyRef:
@@ -187,6 +177,8 @@ spec:
             - name: varlibdockercontainers
               readOnly: true
               mountPath: /var/lib/docker/containers
+            - name: aws-credentials-volume
+              mountPath: /root/.aws
       volumes:
         - name: config
           configMap:
@@ -197,6 +189,9 @@ spec:
         - name: varlibdockercontainers
           hostPath:
             path: /var/lib/docker/containers
+        - name: aws-credentials-volume
+          secret:
+            secretName: spot-bigdata-telemetry-creds
     {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/bigdata-operator/Chart.yaml b/charts/bigdata-operator/Chart.yaml
index 40cf36a4..d3b2e8b5 100644
--- a/charts/bigdata-operator/Chart.yaml
+++ b/charts/bigdata-operator/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-operator
 description: Spot Ocean BigData Operator
 type: application
-version: 0.4.4
+version: 0.4.5
 appVersion: 0.4.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-operator/templates/deployment.yaml b/charts/bigdata-operator/templates/deployment.yaml
index de98896a..41c9b4ab 100644
--- a/charts/bigdata-operator/templates/deployment.yaml
+++ b/charts/bigdata-operator/templates/deployment.yaml
@@ -84,16 +84,6 @@ spec:
               containerPort: 2020
               protocol: TCP
           env:
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_ACCESS_KEY_ID
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_SECRET_ACCESS_KEY
             - name: AWS_BUCKET_NAME
               valueFrom:
                 secretKeyRef:
@@ -137,6 +127,8 @@ spec:
             - name: varlibdockercontainers
               readOnly: true
               mountPath: /var/lib/docker/containers
+            - name: aws-credentials-volume
+              mountPath: /root/.aws
       volumes:
         - name: config
           configMap:
@@ -147,6 +139,9 @@ spec:
         - name: varlibdockercontainers
           hostPath:
             path: /var/lib/docker/containers
+        - name: aws-credentials-volume
+          secret:
+            secretName: spot-bigdata-telemetry-creds
     {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
@@ -159,4 +154,4 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
   {{- toYaml . | nindent 8 }}
-  {{- end }}
+  {{- end }}
\ No newline at end of file
diff --git a/charts/bigdata-proxy/Chart.yaml b/charts/bigdata-proxy/Chart.yaml
index da4b3b2e..c0968d0e 100644
--- a/charts/bigdata-proxy/Chart.yaml
+++ b/charts/bigdata-proxy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-proxy
 description: A Helm chart for the Spot Big Data Proxy
 type: application
-version: 0.4.3
+version: 0.4.4
 appVersion: 0.5.3
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-proxy/templates/deployment.yaml b/charts/bigdata-proxy/templates/deployment.yaml
index fb6e5f2c..23c73c07 100644
--- a/charts/bigdata-proxy/templates/deployment.yaml
+++ b/charts/bigdata-proxy/templates/deployment.yaml
@@ -61,16 +61,6 @@ spec:
               containerPort: 2020
               protocol: TCP
           env:
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_ACCESS_KEY_ID
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_SECRET_ACCESS_KEY
             - name: AWS_BUCKET_NAME
               valueFrom:
                 secretKeyRef:
@@ -91,6 +81,18 @@ spec:
                 configMapKeyRef:
                   name: spot-ofas-cluster-info
                   key: accountId
+            - name: HTTP_PROXY
+              valueFrom:
+                configMapKeyRef:
+                  name: spot-ofas-cluster-info
+                  key: proxyUrl
+                  optional: true
+            - name: HTTPS_PROXY
+              valueFrom:
+                configMapKeyRef:
+                  name: spot-ofas-cluster-info
+                  key: proxyUrl
+                  optional: true
           resources: {}
           volumeMounts:
             - name: config
@@ -102,6 +104,8 @@ spec:
             - name: varlibdockercontainers
               readOnly: true
               mountPath: /var/lib/docker/containers
+            - name: aws-credentials-volume
+              mountPath: /root/.aws
       volumes:
         - name: config
           configMap:
@@ -112,6 +116,9 @@ spec:
         - name: varlibdockercontainers
           hostPath:
             path: /var/lib/docker/containers
+        - name: aws-credentials-volume
+          secret:
+            secretName: spot-bigdata-telemetry-creds
     {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/bigdata-spark-watcher/Chart.yaml b/charts/bigdata-spark-watcher/Chart.yaml
index 910f5a7c..00c0b7d8 100644
--- a/charts/bigdata-spark-watcher/Chart.yaml
+++ b/charts/bigdata-spark-watcher/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bigdata-spark-watcher
 description: A Helm chart for the Spot Big Data Spark Watcher
 type: application
-version: 0.5.0
+version: 0.5.1
 appVersion: 0.4.5
 home: https://github.com/spotinst/charts
 icon: https://docs.spot.io/_media/images/spot_mark.png
diff --git a/charts/bigdata-spark-watcher/templates/deployment.yaml b/charts/bigdata-spark-watcher/templates/deployment.yaml
index 8b3fa8ef..fa556e77 100644
--- a/charts/bigdata-spark-watcher/templates/deployment.yaml
+++ b/charts/bigdata-spark-watcher/templates/deployment.yaml
@@ -76,16 +76,6 @@ spec:
               containerPort: 2020
               protocol: TCP
           env:
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_ACCESS_KEY_ID
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_SECRET_ACCESS_KEY
             - name: AWS_BUCKET_NAME
               valueFrom:
                 secretKeyRef:
@@ -129,6 +119,8 @@ spec:
             - name: varlibdockercontainers
               readOnly: true
               mountPath: /var/lib/docker/containers
+            - name: aws-credentials-volume
+              mountPath: /root/.aws
       volumes:
         - name: config
           configMap:
@@ -139,6 +131,9 @@ spec:
         - name: varlibdockercontainers
           hostPath:
             path: /var/lib/docker/containers
+        - name: aws-credentials-volume
+          secret:
+            secretName: spot-bigdata-telemetry-creds
     {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
diff --git a/charts/spark-operator/Chart.yaml b/charts/spark-operator/Chart.yaml
index d3bae843..70bdbccf 100644
--- a/charts/spark-operator/Chart.yaml
+++ b/charts/spark-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Spark Operator (b/g part)
 name: spark-operator
-version: 0.1.22
+version: 0.1.23
 appVersion: v1beta2-1.3.4-3.1.1
 dependencies:
   - name: spark-operator
diff --git a/charts/spark-operator/charts/spark-operator/templates/deployment.yaml b/charts/spark-operator/charts/spark-operator/templates/deployment.yaml
index 81b409e5..2da28abf 100644
--- a/charts/spark-operator/charts/spark-operator/templates/deployment.yaml
+++ b/charts/spark-operator/charts/spark-operator/templates/deployment.yaml
@@ -142,16 +142,6 @@ spec:
               containerPort: 2020
               protocol: TCP
           env:
-            - name: AWS_ACCESS_KEY_ID
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_ACCESS_KEY_ID
-            - name: AWS_SECRET_ACCESS_KEY
-              valueFrom:
-                secretKeyRef:
-                  name: spot-bigdata-telemetry-creds
-                  key: AWS_SECRET_ACCESS_KEY
             - name: AWS_BUCKET_NAME
               valueFrom:
                 secretKeyRef:
@@ -183,6 +173,8 @@ spec:
             - name: varlibdockercontainers
               readOnly: true
               mountPath: /var/lib/docker/containers
+            - name: aws-credentials-volume
+              mountPath: /root/.aws
       {{- end }}
       {{- if or .Values.webhook.enable (ne (len .Values.volumes) 0) .Values.telemetry.enabled }}
       volumes:
@@ -199,6 +191,9 @@ spec:
         - name: config
           configMap:
             name: bigdata-telemetry-fluentbit-cm
+        - name: aws-credentials-volume
+          secret:
+            secretName: spot-bigdata-telemetry-creds
         - name: varlog
           hostPath:
             path: /var/log/