diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 5d1d5fc030be81f4efe84efaca223be42a8c7ba5..ca756599792558620754a1a0a3f48c37bf71b904 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -164,9 +164,9 @@ spec:
             value: {{ (.Values.zufiManager).grpcClientNegotiationType | default "PLAINTEXT" }}
           {{- end}}
           - name: grpc_client_forwarder_address
-            value: {{ ((.Values.ozgcloud).forwarder).address }}
+            value: {{ (.Values.forwarder).address }}
           - name: grpc_client_forwarder_negotiationType
-            value: {{ ((.Values.ozgcloud).forwarder).grpcClientNegotiationType | default "TLS" }}
+            value: {{ (.Values.forwarder).grpcClientNegotiationType | default "TLS" }}
 
           {{- if not (.Values.database).useExternal }}
           - name: spring_data_mongodb_uri
diff --git a/src/test/helm/deployment_forwarder_env_test.yaml b/src/test/helm/deployment_forwarder_env_test.yaml
index 77d32f0179ade44cd5c13ce8ed66ecc79de92bca..fefb761dc274ae86a63c798b6ffe7101ebd7a224 100644
--- a/src/test/helm/deployment_forwarder_env_test.yaml
+++ b/src/test/helm/deployment_forwarder_env_test.yaml
@@ -37,9 +37,8 @@ set:
 tests:
   - it: should set the grpc forwarder client address
     set:
-      ozgcloud:
-        forwarder:
-          address: https://forwarder.my-wonderful-domain.local:9000
+      forwarder:
+        address: https://forwarder.my-wonderful-domain.local:9000
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -55,9 +54,8 @@ tests:
             value: TLS
   - it: should set the negotiation type
     set:
-      ozgcloud:
-        forwarder:
-          grpcClientNegotiationType: PLAINTEXT
+      forwarder:
+        grpcClientNegotiationType: PLAINTEXT
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env