diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index cd6460a01e84e2344612559760767de1ddec7e55..610244f4d70e732b062b51c4d1ec50547f5e7855 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -61,9 +61,9 @@ spec:
           - name: HTTP_SERVER_PORT
             value: "8082"
           - name: GRPC_SERVER_MOCK
-            value: "{{ ((.Values.grpc).server).mock | default false }}"
+            value: "{{ ((.Values.grpc).server).mock }}"
           - name: GRPC_SERVER_PORT
-            value: "{{ required "Values.grpc.server.port must be set" ((.Values.grpc).server).port }}"
+            value: "{{ ((.Values.grpc).server).port }}"
           {{- with include "app.getCustomList" . }}
 {{ . | indent 10 }}
           {{- end }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index 09010a8f931a92ced5a05fe62a39127da4ed36c9..e0ed2fb868d47e802495dcc2b2f9adaf7262b4a0 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -33,4 +33,7 @@ image:
 
 
 
-
+grpc:
+  server:
+    port: 9090
+    mock: false
\ No newline at end of file
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 9cac3fe36e6aeeaa2d7f86927d127ee7a1e516e6..21b6ccb946ee3f46b77e9a67d76a462787d15a19 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -69,11 +69,7 @@ tests:
             name: test_environment
             value: "B test value"
 
-  - it: check envs
-    set:
-      grpc:
-        server:
-          port: 9090
+  - it: check envs default values
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -95,7 +91,6 @@ tests:
     set:
       grpc:
         server:
-          port: 9090
           mock: true
     asserts:
       - contains:
@@ -103,8 +98,15 @@ tests:
           content:
             name: GRPC_SERVER_MOCK
             value: "true"
-
-  - it: should fail template if grpc.server.port not set
+            
+  - it: should set GRPC_SERVER_PORT 
+    set:
+      grpc:
+        server:
+          port: 9091
     asserts:
-      - failedTemplate:
-          errormessage: Values.grpc.server.port must be set
\ No newline at end of file
+      - contains:
+          path: spec.template.spec.containers[0].env
+          content:
+            name: GRPC_SERVER_PORT
+            value: "9091"
\ No newline at end of file