diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 6061a25cd4f7c1ef1d88d330c311c5e2f78dde75..66103d27b3abf330977c1ce4fe09f030a37429f9 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -123,11 +123,11 @@ spec:
           - name: ozgcloud_osiv2_api_name-identifier
             value: {{ .Values.ozgcloud.osiv2.api.nameidentifier}}
           {{- if (.Values.ozgcloud.osiv2.httpproxy).enabled}}
-          - name: ozgcloud_osiv2_http-proxy_enabled
+          - name: ozgcloud_osiv2_proxy_enabled
             value: "{{ .Values.ozgcloud.osiv2.httpproxy.enabled }}"
-          - name: ozgcloud_osiv2_http-proxy_host
+          - name: ozgcloud_osiv2_proxy_host
             value: {{ .Values.ozgcloud.osiv2.httpproxy.host }}
-          - name: ozgcloud_osiv2_http-proxy_port
+          - name: ozgcloud_osiv2_proxy_port
             value: "{{ .Values.ozgcloud.osiv2.httpproxy.port }}"
           {{- end }}
           {{- end }}
diff --git a/src/test/helm/deployment_osiv2_test.yaml b/src/test/helm/deployment_osiv2_test.yaml
index b5e43e66f1edac294897809a752c61419adfdea7..3dacf85f07155300a9174e0520a73b71ac144c28 100644
--- a/src/test/helm/deployment_osiv2_test.yaml
+++ b/src/test/helm/deployment_osiv2_test.yaml
@@ -108,7 +108,7 @@ tests:
       - notContains:
           path: spec.template.spec.containers[0].env
           content:
-            name: ozgcloud_osiv2_http-proxy_enabled
+            name: ozgcloud_osiv2_proxy_enabled
           any: true
   - it: should set osiv2 proxy values
     set:
@@ -117,23 +117,23 @@ tests:
           enabled: true
           httpproxy:
             enabled: true
-            host: "http://proxy.host"
+            host: "10.0.0.1"
             port: 8080
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: ozgcloud_osiv2_http-proxy_enabled
+            name: ozgcloud_osiv2_proxy_enabled
             value: "true"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: ozgcloud_osiv2_http-proxy_host
-            value: "http://proxy.host"
+            name: ozgcloud_osiv2_proxy_host
+            value: "10.0.0.1"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: ozgcloud_osiv2_http-proxy_port
+            name: ozgcloud_osiv2_proxy_port
             value: "8080"
   - it: should not by default set osiv2 values
     asserts: