diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 610244f4d70e732b062b51c4d1ec50547f5e7855..942807a4bb991f8962de65e9fefae4731c12cfc6 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -63,7 +63,7 @@ spec:
           - name: GRPC_SERVER_MOCK
             value: "{{ ((.Values.grpc).server).mock }}"
           - name: GRPC_SERVER_PORT
-            value: "{{ ((.Values.grpc).server).port }}"
+            value: "9090"
           {{- with include "app.getCustomList" . }}
 {{ . | indent 10 }}
           {{- end }}
diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml
index e0ed2fb868d47e802495dcc2b2f9adaf7262b4a0..23944b1fd07e6d2d985be494fb8a255d817758d6 100644
--- a/src/main/helm/values.yaml
+++ b/src/main/helm/values.yaml
@@ -35,5 +35,4 @@ 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 21b6ccb946ee3f46b77e9a67d76a462787d15a19..a4a5edba7cf2d29ec5b6b201256eb8ab4d834f35 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -30,9 +30,6 @@ set:
 tests:
   - it: check customList as list
     set:
-      grpc:
-        server:
-          port: 9090
       env.customList:
         - name: my_test_environment_name
           value: "A test value"
@@ -51,9 +48,6 @@ tests:
             value: "B test value"
   - it: check customList as dict
     set:
-      grpc:
-        server:
-          port: 9090
       env.customList:
         my_test_environment_name: "A test value"
         test_environment: "B test value"
@@ -97,16 +91,4 @@ tests:
           path: spec.template.spec.containers[0].env
           content:
             name: GRPC_SERVER_MOCK
-            value: "true"
-            
-  - it: should set GRPC_SERVER_PORT 
-    set:
-      grpc:
-        server:
-          port: 9091
-    asserts:
-      - contains:
-          path: spec.template.spec.containers[0].env
-          content:
-            name: GRPC_SERVER_PORT
-            value: "9091"
\ No newline at end of file
+            value: "true"
\ No newline at end of file