diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6ff1361..0d27bd2 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -49,67 +49,17 @@ jobs:
       run: |
         export KUBECONFIG=kubeconfig
         
-        # Create deployment
-        cat <<EOF | kubectl apply -f -
-        apiVersion: apps/v1
-        kind: Deployment
-        metadata:
-          name: ${{ env.APP_NAME }}
-          namespace: ${{ env.NAMESPACE }}
-          labels:
-            app: ${{ env.APP_NAME }}
-        spec:
-          replicas: 2
-          selector:
-            matchLabels:
-              app: ${{ env.APP_NAME }}
-          template:
-            metadata:
-              labels:
-                app: ${{ env.APP_NAME }}
-            spec:
-              containers:
-              - name: ${{ env.APP_NAME }}
-                image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.image_tag }}
-                ports:
-                - containerPort: 5173
-                resources:
-                  requests:
-                    memory: "256Mi"
-                    cpu: "250m"
-                  limits:
-                    memory: "512Mi"
-                    cpu: "500m"
-        ---
-        apiVersion: v1
-        kind: Service
-        metadata:
-          name: ${{ env.APP_NAME }}-service
-          namespace: ${{ env.NAMESPACE }}
-        spec:
-          selector:
-            app: ${{ env.APP_NAME }}
-          ports:
-            - protocol: TCP
-              port: 80
-              targetPort: 5173
-          type: ClusterIP
-        ---
-        apiVersion: traefik.containo.us/v1alpha1
-        kind: IngressRoute
-        metadata:
-          name: ${{ env.APP_NAME }}-ingress
-          namespace: ${{ env.NAMESPACE }}
-        spec:
-          entryPoints:
-            - web
-          routes:
-            - match: Host(\`${{ env.HOST }}\`)
-              kind: Rule
-              services:
-                - name: ${{ env.APP_NAME }}-service
-                  port: 80
-        EOF
+        # Replace variables in manifests and apply
+        for manifest in k8s/*.yaml; do
+          envsubst < "$manifest" | kubectl apply -f -
+        done
+      env:
+        APP_NAME: ${{ env.APP_NAME }}
+        NAMESPACE: ${{ env.NAMESPACE }}
+        REGISTRY: ${{ env.REGISTRY }}
+        IMAGE_NAME: ${{ env.IMAGE_NAME }}
+        IMAGE_TAG: ${{ inputs.image_tag }}
+        HOST: ${{ env.HOST }}
         
     - name: Verify deployment
       run: |
diff --git a/k8s/deployment.yaml b/k8s/deployment.yaml
new file mode 100644
index 0000000..79eefa1
--- /dev/null
+++ b/k8s/deployment.yaml
@@ -0,0 +1,29 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: ${APP_NAME}
+  namespace: ${NAMESPACE}
+  labels:
+    app: ${APP_NAME}
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: ${APP_NAME}
+  template:
+    metadata:
+      labels:
+        app: ${APP_NAME}
+    spec:
+      containers:
+      - name: ${APP_NAME}
+        image: ${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
+        ports:
+        - containerPort: 5173
+        resources:
+          requests:
+            memory: "256Mi"
+            cpu: "250m"
+          limits:
+            memory: "512Mi"
+            cpu: "500m"
\ No newline at end of file
diff --git a/k8s/ingress.yaml b/k8s/ingress.yaml
new file mode 100644
index 0000000..88893be
--- /dev/null
+++ b/k8s/ingress.yaml
@@ -0,0 +1,21 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ${APP_NAME}-ingress
+  namespace: ${NAMESPACE}
+  labels:
+    app: ${APP_NAME}
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: web
+spec:
+  rules:
+  - host: ${HOST}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: ${APP_NAME}-service
+            port:
+              number: 80
\ No newline at end of file
diff --git a/k8s/service.yaml b/k8s/service.yaml
new file mode 100644
index 0000000..f0d5cfd
--- /dev/null
+++ b/k8s/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: ${APP_NAME}-service
+  namespace: ${NAMESPACE}
+spec:
+  selector:
+    app: ${APP_NAME}
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 5173
+  type: ClusterIP
\ No newline at end of file