diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml
index 608316c9da9bc438e1d4656ae0243d7bd3676269..610244f4d70e732b062b51c4d1ec50547f5e7855 100644
--- a/src/main/helm/templates/deployment.yaml
+++ b/src/main/helm/templates/deployment.yaml
@@ -58,12 +58,12 @@ spec:
             app.kubernetes.io/name: {{ .Release.Name }}
       containers:
       - env:
-          - name: SERVER_PORT
+          - name: HTTP_SERVER_PORT
             value: "8082"
-          - name: GRPC_MOCK
-            value: "{{ (.Values.grpc).mock | default false }}"
-          - name: GRPC_URL
-            value: "{{ required ".Values.grpc.url must be set" (.Values.grpc).url }}"
+          - name: GRPC_SERVER_MOCK
+            value: "{{ ((.Values.grpc).server).mock }}"
+          - name: GRPC_SERVER_PORT
+            value: "{{ ((.Values.grpc).server).port }}"
           {{- with include "app.getCustomList" . }}
 {{ . | indent 10 }}
           {{- end }}
diff --git a/src/main/helm/templates/ingress.yaml b/src/main/helm/templates/ingress.yaml
index f1d21e1c9fabbd2c42db463c6d92314ab369eb33..c70f6cd0cafda81c1123307e443e0b0e5735778f 100644
--- a/src/main/helm/templates/ingress.yaml
+++ b/src/main/helm/templates/ingress.yaml
@@ -14,7 +14,7 @@ metadata:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     {{- end }}
 spec:
-  {{- if and (.Values.ingress).className (ne (.Values).cluster_env "dataport") }}
+  {{- if and (.Values.ingress).className }}
   ingressClassName: {{ .Values.ingress.className }}
   {{- end }}
   rules:
@@ -34,6 +34,6 @@ spec:
       - {{ include "app.baseDomain" . }}
       {{- if (.Values.ingress).tlsSecretName }}
       secretName: {{ (.Values.ingress).tlsSecretName }}
-      {{- else if ne (.Values).cluster_env "dataport" }}
+      {{- else }}
       secretName: {{ (.Values.ozgcloud).bezeichner }}-{{ .Release.Name }}-tls
       {{- end }}
\ No newline at end of file
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-linter-values.yaml b/src/test/helm-linter-values.yaml
index 593ad13ff22a46f79ef370850c9f4a0ac791c234..3da471eaa5f7b25a2eaf30d65bb493c75a7cda78 100644
--- a/src/test/helm-linter-values.yaml
+++ b/src/test/helm-linter-values.yaml
@@ -4,8 +4,6 @@ networkPolicy:
   dnsServerNamespace: test-dns-namespace
 
 imagePullSecret: ozgcloud-image-pull-secret
-server:
-  port: 8080
 
 ozgcloud:
   bezeichner: antragsraum-proxy
@@ -13,4 +11,5 @@ ozgcloud:
 baseUrl: antragsraum-proxy.dev.de
 
 grpc:
-  url: vorgang-manager.de
\ No newline at end of file
+  server:
+    port: 9090
\ No newline at end of file
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 8132371b64660338674d49525b8cf5187f26d543..8e76b157eb5fca211e0de7ceafab8e60cb3ddd23 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -30,10 +30,9 @@ templates:
   - templates/deployment.yaml
 set:
   imagePullSecret: image-pull-secret
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 tests:
   - it: check metadata.labels
     asserts:
diff --git a/src/test/helm/deployment_env_test.yaml b/src/test/helm/deployment_env_test.yaml
index 5b72aa6c5c08a3094c2cc18af6e9a291288570d0..21b6ccb946ee3f46b77e9a67d76a462787d15a19 100644
--- a/src/test/helm/deployment_env_test.yaml
+++ b/src/test/helm/deployment_env_test.yaml
@@ -30,13 +30,14 @@ set:
 tests:
   - it: check customList as list
     set:
+      grpc:
+        server:
+          port: 9090
       env.customList:
         - name: my_test_environment_name
           value: "A test value"
         - name: test_environment
           value: "B test value"
-      grpc:
-        url: "vorgang-manager.de:9090"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -50,11 +51,12 @@ 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"
-      grpc:
-        url: "vorgang-manager.de:9090"
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
@@ -67,28 +69,44 @@ tests:
             name: test_environment
             value: "B test value"
 
-  - it: check envs
-    set:       
-      grpc:
-        url: "vorgang-manager.de:9090"
+  - it: check envs default values
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: GRPC_URL
-            value: "vorgang-manager.de:9090"
+            name: GRPC_SERVER_MOCK
+            value: "false"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: GRPC_MOCK
-            value: "false"
+            name: HTTP_SERVER_PORT
+            value: "8082"
       - contains:
           path: spec.template.spec.containers[0].env
           content:
-            name: SERVER_PORT
-            value: "8082"
-  - it: should fail template if grpc.url not set
+            name: GRPC_SERVER_PORT
+            value: "9090"
+
+  - it: should set GRPC_SERVER_MOCK 
     set:
+      grpc:
+        server:
+          mock: true
+    asserts:
+      - contains:
+          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:
-      - failedTemplate:
-          errormessage: ".Values.grpc.url 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
diff --git a/src/test/helm/deployment_imagepull_secret_test.yaml b/src/test/helm/deployment_imagepull_secret_test.yaml
index 49303446d423d1fd82f5254cd662b483cb2ceac3..cd06492bd3fd39fe3454a056c5fce78c21514cf5 100644
--- a/src/test/helm/deployment_imagepull_secret_test.yaml
+++ b/src/test/helm/deployment_imagepull_secret_test.yaml
@@ -29,10 +29,9 @@ release:
 templates:
   - templates/deployment.yaml
 set:
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 tests:
   - it: should use correct imagePull secret
     set:
diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml
index 1ddac27e58edd0ce422f1918b15096530a0ec51f..2b4a57287d264d5afa2e6e64fb6bb6244736c2ca 100644
--- a/src/test/helm/deployment_resources_test.yaml
+++ b/src/test/helm/deployment_resources_test.yaml
@@ -29,10 +29,9 @@ templates:
   - templates/deployment.yaml
 set:
   imagePullSecret: image-pull-secret
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 
 tests:
   - it: should generate resources when values set
diff --git a/src/test/helm/deployment_test.yaml b/src/test/helm/deployment_test.yaml
index ded18ee6c5cbfe4827ea924abc86ef610510990b..8dc0f68864dec3d18b76de3e055894a306a98fae 100644
--- a/src/test/helm/deployment_test.yaml
+++ b/src/test/helm/deployment_test.yaml
@@ -29,10 +29,9 @@ templates:
   - templates/deployment.yaml
 set:
   imagePullSecret: image-pull-secret
-  server:
-    port: 8080
   grpc:
-    url: "vorgang-manager.de:9090"
+    server:
+      port: 9090
 
 tests:
   - it: should have metadata values
diff --git a/src/test/helm/ingress_tests.yaml b/src/test/helm/ingress_tests.yaml
index 40a349d8b56eaf542b8dd30bc5deb77421d75bde..f35e8e294a2bd82d8f5c80db3f1a694d8dc5004d 100644
--- a/src/test/helm/ingress_tests.yaml
+++ b/src/test/helm/ingress_tests.yaml
@@ -43,15 +43,6 @@ tests:
       - equal:
           path: spec.tls[0].secretName
           value: helm-antragsraum-proxy-tls
-
-  - it: should not create ingress tls/ingressClass
-    set:
-      cluster_env: dataport
-    asserts:
-      - isNull:
-          path: spec.ingressClassName
-      - isNull:
-          path: spec.tls[0].secretName
   
   - it: should use default letsencrypt-prod cluster-issuer
     asserts: