diff --git a/apps/base/chat-ui-proxy/kustomization.yaml b/apps/base/chat-ui-proxy/kustomization.yaml
deleted file mode 100644
index 52b5ae4..0000000
--- a/apps/base/chat-ui-proxy/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: chat-ui
-
-resources:
-  - namespace.yaml
-  - service.yaml
\ No newline at end of file
diff --git a/apps/base/llamactl-proxy/kustomization.yaml b/apps/base/homelab-proxy/kustomization.yaml
similarity index 87%
rename from apps/base/llamactl-proxy/kustomization.yaml
rename to apps/base/homelab-proxy/kustomization.yaml
index 76f801d..60c5dd5 100644
--- a/apps/base/llamactl-proxy/kustomization.yaml
+++ b/apps/base/homelab-proxy/kustomization.yaml
@@ -4,4 +4,3 @@ namespace: llamactl
 
 resources:
   - namespace.yaml
-  - service.yaml
diff --git a/apps/base/chat-ui-proxy/namespace.yaml b/apps/base/homelab-proxy/namespace.yaml
similarity index 66%
rename from apps/base/chat-ui-proxy/namespace.yaml
rename to apps/base/homelab-proxy/namespace.yaml
index b9c5c90..a9e6fdb 100644
--- a/apps/base/chat-ui-proxy/namespace.yaml
+++ b/apps/base/homelab-proxy/namespace.yaml
@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: chat-ui
+  name: homelab-proxy
\ No newline at end of file
diff --git a/apps/base/llamactl-proxy/namespace.yaml b/apps/base/llamactl-proxy/namespace.yaml
deleted file mode 100644
index 82ae514..0000000
--- a/apps/base/llamactl-proxy/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: llamactl
\ No newline at end of file
diff --git a/apps/prod/chat-ui-proxy/kustomization.yaml b/apps/prod/chat-ui-proxy/kustomization.yaml
deleted file mode 100644
index 035e804..0000000
--- a/apps/prod/chat-ui-proxy/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: chat-ui
-
-resources:
-  - ../../base/chat-ui-proxy
-  - ingress.yaml
\ No newline at end of file
diff --git a/apps/prod/chat-ui-proxy/ingress.yaml b/apps/prod/homelab-proxy/chatui-ingress.yaml
similarity index 100%
rename from apps/prod/chat-ui-proxy/ingress.yaml
rename to apps/prod/homelab-proxy/chatui-ingress.yaml
diff --git a/apps/base/chat-ui-proxy/service.yaml b/apps/prod/homelab-proxy/chatui-service.yaml
similarity index 100%
rename from apps/base/chat-ui-proxy/service.yaml
rename to apps/prod/homelab-proxy/chatui-service.yaml
diff --git a/apps/prod/homelab-proxy/kustomization.yaml b/apps/prod/homelab-proxy/kustomization.yaml
new file mode 100644
index 0000000..7f87045
--- /dev/null
+++ b/apps/prod/homelab-proxy/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: homelab-proxy
+
+resources:
+  - ../../base/homelab-proxy
+  - chatui-ingress.yaml
+  - chatui-service.yaml
+  - llamactl-ingress.yaml
+  - llamactl-service.yaml
\ No newline at end of file
diff --git a/apps/prod/llamactl-proxy/ingress.yaml b/apps/prod/homelab-proxy/llamactl-ingress.yaml
similarity index 100%
rename from apps/prod/llamactl-proxy/ingress.yaml
rename to apps/prod/homelab-proxy/llamactl-ingress.yaml
diff --git a/apps/base/llamactl-proxy/service.yaml b/apps/prod/homelab-proxy/llamactl-service.yaml
similarity index 100%
rename from apps/base/llamactl-proxy/service.yaml
rename to apps/prod/homelab-proxy/llamactl-service.yaml
diff --git a/apps/prod/kustomization.yaml b/apps/prod/kustomization.yaml
index 0086c38..0b34ce2 100644
--- a/apps/prod/kustomization.yaml
+++ b/apps/prod/kustomization.yaml
@@ -7,5 +7,4 @@ resources:
   - lemma
   - ghost
   - dashboard
-  - llamactl-proxy
-  - chat-ui-proxy
\ No newline at end of file
+  - homelab-proxy
\ No newline at end of file
diff --git a/apps/prod/llamactl-proxy/kustomization.yaml b/apps/prod/llamactl-proxy/kustomization.yaml
deleted file mode 100644
index 8a0bbb0..0000000
--- a/apps/prod/llamactl-proxy/kustomization.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: llamactl
-
-resources:
-  - ../../base/llamactl-proxy
-  - ingress.yaml
\ No newline at end of file