diff --git a/manifests/auth-proxy/ingress.yaml b/manifests/auth-proxy/auth-ingress.yaml
similarity index 100%
rename from manifests/auth-proxy/ingress.yaml
rename to manifests/auth-proxy/auth-ingress.yaml
diff --git a/manifests/auth-proxy/auth-proxy.yaml b/manifests/auth-proxy/auth-proxy.yaml
index 5a98fa4..42d22f0 100644
--- a/manifests/auth-proxy/auth-proxy.yaml
+++ b/manifests/auth-proxy/auth-proxy.yaml
@@ -1,28 +1,3 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: auth-proxy
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: auth-proxy
-  namespace: auth-proxy
-  annotations:
-    kube-1password: mr6spkkx7n3memkbute6ojaarm
-    kube-1password/vault: Kubernetes
-type: Opaque
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: tailscale-auth
-  namespace: auth-proxy
-  annotations:
-    kube-1password: 2cqycmsgv5r7vcyvjpblcl2l4y
-    kube-1password/vault: Kubernetes
-type: Opaque
----
 
 apiVersion: v1
 kind: Secret
diff --git a/manifests/auth-proxy/internal-services.yaml b/manifests/auth-proxy/internal-services.yaml
new file mode 100644
index 0000000..7abed63
--- /dev/null
+++ b/manifests/auth-proxy/internal-services.yaml
@@ -0,0 +1,85 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: tekton-el
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: loki-distributed
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: prometheus
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: vmcluster
+  namespace: auth-proxy
+  labels:
+    app: internal-proxy
+spec:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: 8080
+  selector:
+    app: internal-proxy
+  type: ClusterIP
+---
diff --git a/manifests/auth-proxy/namespace.yaml b/manifests/auth-proxy/namespace.yaml
new file mode 100644
index 0000000..1b20555
--- /dev/null
+++ b/manifests/auth-proxy/namespace.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: auth-proxy
+---
diff --git a/manifests/auth-proxy/non-auth-proxy.yaml b/manifests/auth-proxy/non-auth-ingress.yaml
similarity index 89%
rename from manifests/auth-proxy/non-auth-proxy.yaml
rename to manifests/auth-proxy/non-auth-ingress.yaml
index f8067c2..dcc3ed0 100644
--- a/manifests/auth-proxy/non-auth-proxy.yaml
+++ b/manifests/auth-proxy/non-auth-ingress.yaml
@@ -20,7 +20,6 @@ spec:
         pathType: ImplementationSpecific
         backend:
           service:
-            # name: tailscale-proxy
-            name: auth-proxy
+            name: tailscale-proxy
             port:
               name: http
diff --git a/manifests/auth-proxy/internal-proxy.yaml b/manifests/auth-proxy/proxy.yaml
similarity index 62%
rename from manifests/auth-proxy/internal-proxy.yaml
rename to manifests/auth-proxy/proxy.yaml
index 96044fb..ea1f55f 100644
--- a/manifests/auth-proxy/internal-proxy.yaml
+++ b/manifests/auth-proxy/proxy.yaml
@@ -88,88 +88,3 @@ spec:
     app: internal-proxy
   type: ClusterIP
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  name: tekton-el
-  namespace: auth-proxy
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: loki
-  namespace: auth-proxy
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: loki-distributed
-  namespace: auth-proxy
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: prometheus
-  namespace: auth-proxy
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: vmcluster
-  namespace: auth-proxy
-  labels:
-    app: internal-proxy
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: internal-proxy
-  type: ClusterIP
----
diff --git a/manifests/auth-proxy/secrets.yaml b/manifests/auth-proxy/secrets.yaml
new file mode 100644
index 0000000..ea9e1ad
--- /dev/null
+++ b/manifests/auth-proxy/secrets.yaml
@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: auth-proxy
+  namespace: auth-proxy
+  annotations:
+    kube-1password: mr6spkkx7n3memkbute6ojaarm
+    kube-1password/vault: Kubernetes
+type: Opaque
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: tailscale-auth
+  namespace: auth-proxy
+  annotations:
+    kube-1password: 2cqycmsgv5r7vcyvjpblcl2l4y
+    kube-1password/vault: Kubernetes
+type: Opaque
+---