diff --git a/helm/consoleme/templates/configmap-base.yaml b/helm/consoleme/templates/configmap-base.yaml
index 60ce72978..27c6e7887 100644
--- a/helm/consoleme/templates/configmap-base.yaml
+++ b/helm/consoleme/templates/configmap-base.yaml
@@ -70,10 +70,10 @@ data:
       {{- toYaml . | nindent 6 }}
     {{- end }}
 
+    {{- with .Values.aws }}
     aws:
-      issuer: {{ .Values.aws.issuer  }}
-      account_number: {{ .Values.aws.account_number  }}
-      region: {{ .Values.aws.region  }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
 
     celery:
       active_region: {{ .Values.consoleme.celery.region  }}
diff --git a/helm/consoleme/values.yaml b/helm/consoleme/values.yaml
index 4001f29aa..56247fdaf 100644
--- a/helm/consoleme/values.yaml
+++ b/helm/consoleme/values.yaml
@@ -224,6 +224,7 @@ aws:
   issuer: YourCompany
   account_number: "<Main AWS account number>"
   region: us-east-1
+  session_duration: 3600
 
 cache_accounts_from_aws_organizations:
   enabled: false