diff --git a/mender/templates/deployments-deploy.yaml b/mender/templates/deployments-deploy.yaml
index 969d1ec8..092fb6cb 100644
--- a/mender/templates/deployments-deploy.yaml
+++ b/mender/templates/deployments-deploy.yaml
@@ -105,6 +105,12 @@ spec:
         - prefix: DEPLOYMENTS_
           secretRef:
             name: s3-artifacts
+{{- if .Values.global.s3.AWS_SECRET_NAME }}
+        - prefix: DEPLOYMENTS_
+          secretRef:
+            name: {{ .Values.global.s3.AWS_SECRET_NAME }}
+{{- end}}
+
 
 {{- if .Values.global.image.username }}
       imagePullSecrets:
diff --git a/mender/templates/secret-s3-artifacts.yaml b/mender/templates/secret-s3-artifacts.yaml
index 9b8e6c9d..a92bba32 100644
--- a/mender/templates/secret-s3-artifacts.yaml
+++ b/mender/templates/secret-s3-artifacts.yaml
@@ -17,8 +17,10 @@ data:
 {{- end }}
   AWS_BUCKET: {{ .Values.global.s3.AWS_BUCKET | b64enc }}
   AWS_REGION: {{ .Values.global.s3.AWS_REGION | b64enc }}
+{{- if not .Values.global.s3.AWS_SECRET_NAME }}
 {{- if and (not .Values.global.s3.AWS_SERVICE_ACCOUNT_NAME) .Values.global.s3.AWS_ACCESS_KEY_ID }}
   AWS_AUTH_KEY: {{ .Values.global.s3.AWS_ACCESS_KEY_ID | b64enc }}
   AWS_AUTH_SECRET: {{ .Values.global.s3.AWS_SECRET_ACCESS_KEY | b64enc }}
+{{- end }}
 {{- end }}
   AWS_FORCE_PATH_STYLE: {{ .Values.global.s3.AWS_FORCE_PATH_STYLE | b64enc }}
diff --git a/mender/values.yaml b/mender/values.yaml
index 9297ca7c..3dcd274f 100644
--- a/mender/values.yaml
+++ b/mender/values.yaml
@@ -20,6 +20,7 @@ global:
     AWS_FORCE_PATH_STYLE: "true"
     AWS_TAG_ARTIFACT: "true"
     AWS_SERVICE_ACCOUNT_NAME: ""
+    AWS_SECRET_NAME: ""
   smtp:
     EMAIL_SENDER: root@localhost
     SMTP_ADDRESS: "localhost:25"