diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json
index 3b03205..c953559 100755
--- a/kubernetes/sdc/resources/config/environments/AUTO.json
+++ b/kubernetes/sdc/resources/config/environments/AUTO.json
@@ -8,7 +8,7 @@
     "chef_type": "environment",
 
     "default_attributes": {
-        "disableHttp": {{ .Values.global.security.disableHttp }},
+        "disableHttp": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
         "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}",
         "BE_VIP": "sdc-be.{{include "common.namespace" .}}",
         "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}",
@@ -112,11 +112,13 @@
             "username": "user1@sdc.com",
             "password": "password=="
          }
+      {{- if .Values.global.aafEnabled }}
       },
       "jetty": {
          "keystore_pwd": "${KEYSTORE_PASS}",
          "truststore_pwd": "${TRUSTSTORE_PASS}",
          "keymanager_pwd": "${KEYMANAGER_PASS}"
+      {{- end }}
       }
     }
 }