diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index f74799ec35cb5b4b299f1aca916e9c9a5937c22c..e7259dfb131f2e8a24f5941f315f6c8bece87dd8 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -98,7 +98,7 @@ spec:
           {{- end }}
           {{- end }}
           - name: ozgcloud_osiv2_enabled
-            value: {{ (.Values.ozgcloud.osiv2).enabled }}
+            value: "{{ (.Values.ozgcloud.osiv2).enabled }}"
           {{- if (.Values.ozgcloud.osiv2).enabled}}
           - name: ozgcloud_osiv2_auth_client-id
             valueFrom:
@@ -122,9 +122,9 @@ spec:
             value: {{ .Values.ozgcloud.osiv2.api.tenant}}
           - name: ozgcloud_osiv2_api_name-identifier
             value: {{ .Values.ozgcloud.osiv2.api.nameidentifier}}
-          - name: ozgcloud_osiv2_http-proxy_enabled
-            value: {{ (.Values.ozgcloud.osiv2.httpproxy).enabled }}
           {{- if (.Values.ozgcloud.osiv2.httpproxy).enabled}}
+          - name: ozgcloud_osiv2_http-proxy_enabled
+            value: "{{ (.Values.ozgcloud.osiv2.httpproxy).enabled }}"
           - name: ozgcloud_osiv2_http-proxy_host
             value: {{ .Values.ozgcloud.osiv2.httpproxy.host }}
           - name: ozgcloud_osiv2_http-proxy_port
diff --git a/src/test/helm/deployment_osiv2_test.yaml b/src/test/helm/deployment_osiv2_test.yaml
index 8fc1b6c166bcda8b017b9c9dd491475cdc2080ba..bb752f9a355476b7494fc706625f334eb514c01d 100644
--- a/src/test/helm/deployment_osiv2_test.yaml
+++ b/src/test/helm/deployment_osiv2_test.yaml
@@ -46,7 +46,7 @@ set:
         tenant: "tenant"
         nameidentifier: "name-identifier"
       httpproxy:
-        enabled: "false"
+        enabled: false
 tests:
   - it: should set osiv2 values
     set:
@@ -58,7 +58,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_osiv2_enabled
-            value: true
+            value: "true"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -111,7 +111,7 @@ tests:
         osiv2:
           enabled: true
           httpproxy:
-            enabled: "true"
+            enabled: true
             host: "http://proxy.host"
             port: "8080"
     asserts:
@@ -119,7 +119,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_osiv2_http-proxy_enabled
-            value: true
+            value: "true"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
@@ -136,7 +136,7 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: ozgcloud_osiv2_enabled
-            value: false
+            value: "false"
       - notContains:
           path: spec.template.spec.containers[0].env
           content: