diff --git a/havoice/namespace.yaml b/havoice/namespace.yaml
new file mode 100644
index 0000000..837ebf1
--- /dev/null
+++ b/havoice/namespace.yaml
@@ -0,0 +1,5 @@
+# namespace.yaml
+kind: Namespace
+apiVersion: v1
+metadata:
+  name: havoice
diff --git a/havoice/wyoming-piper-deployment.yaml b/havoice/wyoming-piper-deployment.yaml
index 7450538..07e0a2d 100644
--- a/havoice/wyoming-piper-deployment.yaml
+++ b/havoice/wyoming-piper-deployment.yaml
@@ -5,13 +5,14 @@ metadata:
     kompose.cmd: kompose convert -f compose.yaml
     kompose.version: 1.34.0 (cbf2835db)
   labels:
-    io.kompose.service: wyoming-piper
-  name: wyoming-piper
+    io.kompose.service: havoice-piper
+  name: havoice-piper
+  namespace: havoice
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: wyoming-piper
+      io.kompose.service: havoice-piper
   strategy:
     type: Recreate
   template:
@@ -20,7 +21,7 @@ spec:
         kompose.cmd: kompose convert -f compose.yaml
         kompose.version: 1.34.0 (cbf2835db)
       labels:
-        io.kompose.service: wyoming-piper
+        io.kompose.service: havoice-piper
     spec:
       containers:
         - args:
@@ -30,15 +31,15 @@ spec:
             - name: TZ
               value: Europe/Berlin
           image: rhasspy/wyoming-piper:1.3.2
-          name: ha-piper
+          name: havoice-piper
           ports:
             - containerPort: 10200
               protocol: TCP
           volumeMounts:
             - mountPath: /data
-              name: wyoming-piper-claim0
+              name: havoice-piper-claim
       restartPolicy: Always
       volumes:
-        - name: wyoming-piper-claim0
+        - name: havoice-piper-claim
           persistentVolumeClaim:
-            claimName: wyoming-piper-claim0
+            claimName: havoice-piper-claim
diff --git a/havoice/wyoming-whisper-deployment.yaml b/havoice/wyoming-whisper-deployment.yaml
index 7e396a7..e77fdb3 100644
--- a/havoice/wyoming-whisper-deployment.yaml
+++ b/havoice/wyoming-whisper-deployment.yaml
@@ -5,13 +5,14 @@ metadata:
     kompose.cmd: kompose convert -f compose.yaml
     kompose.version: 1.34.0 (cbf2835db)
   labels:
-    io.kompose.service: wyoming-whisper
-  name: wyoming-whisper
+    io.kompose.service: havoice-whisper
+  name: havoice-whisper
+  namespace: havoice
 spec:
   replicas: 1
   selector:
     matchLabels:
-      io.kompose.service: wyoming-whisper
+      io.kompose.service: havoice-whisper
   strategy:
     type: Recreate
   template:
@@ -20,7 +21,7 @@ spec:
         kompose.cmd: kompose convert -f compose.yaml
         kompose.version: 1.34.0 (cbf2835db)
       labels:
-        io.kompose.service: wyoming-whisper
+        io.kompose.service: havoice-whisper
     spec:
       containers:
         - args:
@@ -32,15 +33,15 @@ spec:
             - name: TZ
               value: Europe/Berlin
           image: rhasspy/wyoming-whisper:2.5.0
-          name: ha-whisper
+          name: havoice-whisper
           ports:
             - containerPort: 10300
               protocol: TCP
           volumeMounts:
             - mountPath: /data
-              name: wyoming-whisper-claim0
+              name: havoice-whisper-claim
       restartPolicy: Always
       volumes:
-        - name: wyoming-whisper-claim0
+        - name: havoice-whisper-claim
           persistentVolumeClaim:
-            claimName: wyoming-whisper-claim0
+            claimName: havoice-whisper-claim