diff --git a/.gitea/workflows/build-backend.yml b/.gitea/workflows/build-backend.yml
index a0d86d2..2d2fa7a 100644
--- a/.gitea/workflows/build-backend.yml
+++ b/.gitea/workflows/build-backend.yml
@@ -1,4 +1,4 @@
-name: 'Build Backend'
+name: 'Deploy Backend'
 on:
   workflow_dispatch:
     inputs:
@@ -89,8 +89,8 @@ jobs:
             --set-string 'repository.name=${{ github.event.inputs.repo_path }}' \
             --set-string 'repository.branch=${{ github.event.inputs.branch }}' \
             --set "imagePullSecrets[0].name=regcred" \
-            -f ./helms/devspc/stands/${{ github.event.inputs.namespace }}/values.yaml \
             -f ./helms/devspc/stands/values.yaml \
+            -f ./helms/devspc/stands/${{ github.event.inputs.namespace }}/values.yaml \
             --wait
       - name: 'Cleanup'
         if: always()
diff --git a/.gitea/workflows/build-frontend.yml b/.gitea/workflows/build-frontend.yml
index b231392..3d00903 100644
--- a/.gitea/workflows/build-frontend.yml
+++ b/.gitea/workflows/build-frontend.yml
@@ -1,4 +1,4 @@
-name: 'Build Frontend'
+name: 'Deploy Frontend'
 on:
   workflow_dispatch:
     inputs:
@@ -136,8 +136,8 @@ jobs:
             --set-string 'repository.name=${{ github.event.inputs.repo_path }}' \
             --set-string 'repository.branch=${{ github.event.inputs.branch }}' \
             --set "imagePullSecrets[0].name=regcred" \
-            -f "${{ github.workspace }}/devspc/stands/${{ github.event.inputs.namespace }}/values.yaml" \
             -f "${{ github.workspace }}/devspc/values.yaml" \
+            -f "${{ github.workspace }}/devspc/stands/${{ github.event.inputs.namespace }}/values.yaml" \
             --wait
       - name: 'Cleanup'
         if: always()
diff --git a/devspc/devspace-api/values.yaml b/devspc/devspace-api/values.yaml
index 5cfb354..98cead8 100644
--- a/devspc/devspace-api/values.yaml
+++ b/devspc/devspace-api/values.yaml
@@ -12,6 +12,7 @@ image:
   pullPolicy: Always
   version: ''
 ingress:
+  domain: 'ui'
   host: 'ui.devx.kube.xx'
   prefix: '/devspace-api'
 s3:
diff --git a/devspc/devspace-apiregistry-core-service/values.yaml b/devspc/devspace-apiregistry-core-service/values.yaml
index c597f3d..ceb373a 100644
--- a/devspc/devspace-apiregistry-core-service/values.yaml
+++ b/devspc/devspace-apiregistry-core-service/values.yaml
@@ -11,6 +11,7 @@ image:
   pullPolicy: Always
   version: ''
 ingress:
+  domain: 'core'
   host: 'core.devx.kube.xx'
 name: agent
 securityContext:
diff --git a/devspc/devspace-apiregistry-generator-service/values.yaml b/devspc/devspace-apiregistry-generator-service/values.yaml
index 355b516..0b96cd8 100644
--- a/devspc/devspace-apiregistry-generator-service/values.yaml
+++ b/devspc/devspace-apiregistry-generator-service/values.yaml
@@ -11,6 +11,7 @@ image:
   pullPolicy: Always
   version: ''
 ingress:
+  domain: 'generator'
   host: 'generator.devx.kube.xx'
 name: agent
 securityContext:
diff --git a/devspc/devspace-gateway/values.yaml b/devspc/devspace-gateway/values.yaml
index 21f8776..aab743a 100644
--- a/devspc/devspace-gateway/values.yaml
+++ b/devspc/devspace-gateway/values.yaml
@@ -17,5 +17,6 @@ keycloak:
   jwk: 'http://192.168.76.150/realms/devspace-dev/protocol/openid-connect/certs'
   claimName: 'dev-space'
 ingress:
+  domain: 'ui'
   host: 'ui.devx.kube.xx'
   prefix: '/devspace-gateway'
\ No newline at end of file
diff --git a/devspc/devspace-selfkit-ui/values.yaml b/devspc/devspace-selfkit-ui/values.yaml
index 68feee4..3cfc29e 100644
--- a/devspc/devspace-selfkit-ui/values.yaml
+++ b/devspc/devspace-selfkit-ui/values.yaml
@@ -11,5 +11,6 @@ image:
   pullPolicy: Always
   version: ''
 ingress:
+  domain: 'ui'
   host: 'ui.devx.kube.xx'
   prefix: '/devspace-ui'
\ No newline at end of file
diff --git a/devspc/stands/production/values.yaml b/devspc/stands/production/values.yaml
index 837d073..9e20151 100644
--- a/devspc/stands/production/values.yaml
+++ b/devspc/stands/production/values.yaml
@@ -1,4 +1,6 @@
 database:
   url: '192.168.76.114:5432/production'
   user: 'postgres'
-  password: 'postgres'
\ No newline at end of file
+  password: 'postgres'
+ingress:
+  host: '{{$.Values.ingress.domain}}.devspace.xx'
\ No newline at end of file
diff --git a/devspc/stands/values.yaml b/devspc/stands/values.yaml
index e69de29..a24fa3d 100644
--- a/devspc/stands/values.yaml
+++ b/devspc/stands/values.yaml
@@ -0,0 +1,2 @@
+ingress:
+  host: '{{$.Values.ingress.domain}}.{{$.Release.Namespace}}.kube.xx'
\ No newline at end of file