diff --git a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
index ce517fd3..45784391 100644
--- a/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
+++ b/charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml
@@ -20,7 +20,11 @@ runtimeScheduler:
   envVars:
   {{- with $engineContext.env }}
     {{- range $key, $val := . }}
+      {{- if or (kindIs "bool" $val) }}
     {{ $key }}: {{ $val | squote }}
+      {{- else }}
+    {{ $key }}: {{ $val }}
+      {{- end }}
     {{- end }}
   {{- end }}
     COMPOSE_IMAGE: {{ include "runtime.runtimeImageName" (dict "registry" $imageRegistry "imageFullName" $engineContext.runtimeImages.COMPOSE_IMAGE) | squote }}
@@ -93,7 +97,11 @@ dockerDaemonScheduler:
   {{- with $dindContext.env }}
   envVars:
     {{- range $key, $val := . }}
+      {{- if or (kindIs "bool" $val) }}
     {{ $key }}: {{ $val | squote }}
+      {{- else }}
+    {{ $key }}: {{ $val }}
+      {{- end }}
     {{- end }}
   {{- end }}
   cluster:
diff --git a/charts/cf-runtime/tests/private-registry/private_registry_test.yaml b/charts/cf-runtime/tests/private-registry/private_registry_test.yaml
index 1f600d9a..865f7ed3 100644
--- a/charts/cf-runtime/tests/private-registry/private_registry_test.yaml
+++ b/charts/cf-runtime/tests/private-registry/private_registry_test.yaml
@@ -38,9 +38,9 @@ tests:
                 - run
                 - start
               envVars:
-                CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
+                CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
                 FORCE_COMPOSE_SERIAL_PULL: 'false'
-                LOGGER_LEVEL: 'debug'
+                LOGGER_LEVEL: debug
                 LOG_OUTGOING_HTTP_REQUESTS: 'false'
                 METRICS_PROMETHEUS_ENABLED: 'true'
                 COMPOSE_IMAGE: 'somedomain.io/codefresh/compose:tagoverride'
diff --git a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
index 3dafb255..bdbbf09a 100644
--- a/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml
@@ -45,10 +45,10 @@ tests:
                 - two
                 - three
               envVars:
-                CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
-                FOO: 'BAR'
+                CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
+                FOO: BAR
                 FORCE_COMPOSE_SERIAL_PULL: 'false'
-                LOGGER_LEVEL: 'debug'
+                LOGGER_LEVEL: debug
                 LOG_OUTGOING_HTTP_REQUESTS: 'false'
                 METRICS_PROMETHEUS_ENABLED: 'true'
                 COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverride'
@@ -108,7 +108,7 @@ tests:
               imagePullPolicy: IfNotPresent
               userAccess: true
               envVars:
-                ALICE: 'BOB'
+                ALICE: BOB
                 DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
               cluster:
                 namespace: codefresh
diff --git a/charts/cf-runtime/tests/runtime/runtime_test.yaml b/charts/cf-runtime/tests/runtime/runtime_test.yaml
index 6e43594d..31a0ddfe 100644
--- a/charts/cf-runtime/tests/runtime/runtime_test.yaml
+++ b/charts/cf-runtime/tests/runtime/runtime_test.yaml
@@ -46,10 +46,10 @@ tests:
                 - two
                 - three
               envVars:
-                CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
-                FOO: 'BAR'
+                CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: 1000
+                FOO: BAR
                 FORCE_COMPOSE_SERIAL_PULL: 'false'
-                LOGGER_LEVEL: 'debug'
+                LOGGER_LEVEL: debug
                 LOG_OUTGOING_HTTP_REQUESTS: 'false'
                 METRICS_PROMETHEUS_ENABLED: 'true'
                 COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverride'
@@ -118,7 +118,7 @@ tests:
               imagePullPolicy: Always
               userAccess: true
               envVars:
-                ALICE: 'BOB'
+                ALICE: BOB
                 DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: 'true'
               cluster:
                 namespace: codefresh
diff --git a/charts/cf-runtime/values.yaml b/charts/cf-runtime/values.yaml
index b8944d45..bb19ef97 100644
--- a/charts/cf-runtime/values.yaml
+++ b/charts/cf-runtime/values.yaml
@@ -457,7 +457,7 @@ runtime:
         reuseVolumeSortOrder: pipeline_id
     # -- Set additional env vars.
     env:
-      DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: "true"
+      DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE: true
     # -- Set pod annotations.
     podAnnotations: {}
     # -- Set pod labels.
@@ -539,7 +539,7 @@ runtime:
       # -- If "true", composition images will be pulled sequentially
       FORCE_COMPOSE_SERIAL_PULL: false
       # -- Level of logging for engine
-      LOGGER_LEVEL: "debug"
+      LOGGER_LEVEL: debug
       # -- Enable debug-level logging of outgoing HTTP/HTTPS requests
       LOG_OUTGOING_HTTP_REQUESTS: false
       # -- Enable emitting metrics from engine