diff --git a/Traefik/test/dishes-certificate.yaml b/Test-Deployment/dishes-certificate-gomplate.yaml
similarity index 86%
rename from Traefik/test/dishes-certificate.yaml
rename to Test-Deployment/dishes-certificate-gomplate.yaml
index 5e43300..9738fd3 100644
--- a/Traefik/test/dishes-certificate.yaml
+++ b/Test-Deployment/dishes-certificate-gomplate.yaml
@@ -9,4 +9,4 @@ spec:
     name: cloudflare-cluster-issuer
     kind: ClusterIssuer
   dnsNames:
-  - schnipo.k8s.schnrbs.work
\ No newline at end of file
+  - schnipo.{{.Env.EXTERNAL_DOMAIN}}
diff --git a/Test-Deployment/dishes-deployment.yaml b/Test-Deployment/dishes-deployment.yaml
new file mode 100644
index 0000000..e06012d
--- /dev/null
+++ b/Test-Deployment/dishes-deployment.yaml
@@ -0,0 +1,43 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: dishes
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: dish-schnipo
+  namespace: dishes
+  labels:
+    app: dishes
+spec:
+  replicas: 3
+  selector:
+    matchLabels:
+      app: dishes
+  template:
+    metadata:
+      labels:
+        app: dishes
+    spec:
+      containers:
+        - name: dish-schnipo
+          image: bschnorbus/dish-schnipo
+          ports:
+            - containerPort: 8080
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: dish-schnipo
+  namespace: dishes
+spec:
+  type: ClusterIP
+  selector:
+    app: dishes
+  ports:
+    - port: 80
+      targetPort: 8080
+      protocol: TCP
diff --git a/Traefik/test/dishes-ingress-route.yaml b/Test-Deployment/dishes-ingress-route-gomplate.yaml
similarity index 73%
rename from Traefik/test/dishes-ingress-route.yaml
rename to Test-Deployment/dishes-ingress-route-gomplate.yaml
index 6accdea..e1d2c0f 100644
--- a/Traefik/test/dishes-ingress-route.yaml
+++ b/Test-Deployment/dishes-ingress-route-gomplate.yaml
@@ -7,10 +7,12 @@ spec:
   entryPoints:
   - websecure
   routes:
-  - match: Host(`schnipo.k8s.schnrbs.work`)
+  - match: Host(`schnipo.{{.Env.EXTERNAL_DOMAIN}}`)
     kind: Rule
     services:
     - name: schnipo
-      port: 8080
+      port: 80
+      targetPort: 8080
   tls:
     secretName: schnipo-certificate-secret
+
diff --git a/Traefik/test/nginx-certificate.yaml b/Test-Deployment/nginx-certificate-gomplate.yaml
similarity index 85%
rename from Traefik/test/nginx-certificate.yaml
rename to Test-Deployment/nginx-certificate-gomplate.yaml
index 37e10d9..ee27446 100644
--- a/Traefik/test/nginx-certificate.yaml
+++ b/Test-Deployment/nginx-certificate-gomplate.yaml
@@ -9,4 +9,4 @@ spec:
     name: cloudflare-cluster-issuer
     kind: ClusterIssuer
   dnsNames:
-  - nginx-test.k8s.schnrbs.work
\ No newline at end of file
+  - nginx-test.{{.Env.EXTERNAL_DOMAIN}}
diff --git a/Metallb_Setup/test-deployment.yaml b/Test-Deployment/nginx-deployment.yaml
similarity index 100%
rename from Metallb_Setup/test-deployment.yaml
rename to Test-Deployment/nginx-deployment.yaml
diff --git a/Traefik/test/nginx-ingress-route.yaml b/Test-Deployment/nginx-ingress-route-gomplate.yaml
similarity index 69%
rename from Traefik/test/nginx-ingress-route.yaml
rename to Test-Deployment/nginx-ingress-route-gomplate.yaml
index 74cd328..78d2066 100644
--- a/Traefik/test/nginx-ingress-route.yaml
+++ b/Test-Deployment/nginx-ingress-route-gomplate.yaml
@@ -7,10 +7,10 @@ spec:
   entryPoints:
   - websecure
   routes:
-  - match: Host(`nginx-test.k8s.schnrbs.work`)
+  - match: Host(`nginx-test.{{.Env.EXTERNAL_DOMAIN}}`)
     kind: Rule
     services:
     - name: nginx
       port: 80
   tls: 
-    secretName: nginx-certificate-secret
\ No newline at end of file
+    secretName: nginx-certificate-secret
diff --git a/Traefik/test/nginx-ingress.yaml b/Test-Deployment/nginx-ingress.yaml
similarity index 85%
rename from Traefik/test/nginx-ingress.yaml
rename to Test-Deployment/nginx-ingress.yaml
index 98e8002..04ab510 100644
--- a/Traefik/test/nginx-ingress.yaml
+++ b/Test-Deployment/nginx-ingress.yaml
@@ -7,7 +7,7 @@ metadata:
     traefik.ingress.kubernetes.io/router.entrypoints: websecure
 spec:
   rules:
-    - host: nginx-test.k8s.schnrbs.work
+    - host: nginx-test.int.schnrbs.work
       http:
         paths: 
           - path: /
@@ -19,5 +19,5 @@ spec:
                   number: 80
   tls:
     - hosts:
-        - nginx-test.k8s.schnrbs.work
+        - nginx-test.int.schnrbs.work
       secretName: nginx-certificate-secret