diff --git a/Deployment/Munich/ProductionLine.yaml b/Deployment/Munich/ProductionLine.yaml
index 588b878..ab1349f 100644
--- a/Deployment/Munich/ProductionLine.yaml
+++ b/Deployment/Munich/ProductionLine.yaml
@@ -9,22 +9,22 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ua-cloudcommander
+  name: commander
   namespace: munich
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: ua-cloudcommander
+      app: commander
   template:
     metadata:
       labels:
-        app: ua-cloudcommander
+        app: commander
     spec:
       nodeSelector:
         "kubernetes.io/os": linux
       containers:
-      - name: ua-cloudcommander
+      - name: commander
         image: ghcr.io/opcfoundation/ua-cloudcommander:main
         imagePullPolicy: Always
         env:
@@ -55,14 +55,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: ua-cloudcommander
+  name: commander
   namespace: munich
 spec:
   ports:
   - targetPort: 4840
     port: 4840
   selector:
-    app: ua-cloudcommander
+    app: commander
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/Deployment/Seattle/ProductionLine.yaml b/Deployment/Seattle/ProductionLine.yaml
index 6c03815..a677c8f 100644
--- a/Deployment/Seattle/ProductionLine.yaml
+++ b/Deployment/Seattle/ProductionLine.yaml
@@ -9,22 +9,22 @@ spec:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: ua-cloudcommander
+  name: commander
   namespace: seattle
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: ua-cloudcommander
+      app: commander
   template:
     metadata:
       labels:
-        app: ua-cloudcommander
+        app: commander
     spec:
       nodeSelector:
         "kubernetes.io/os": linux
       containers:
-      - name: ua-cloudcommander
+      - name: commander
         image: ghcr.io/opcfoundation/ua-cloudcommander:main
         imagePullPolicy: Always
         env:
@@ -55,14 +55,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: ua-cloudcommander
+  name: commander
   namespace: seattle
 spec:
   ports:
   - targetPort: 4840
     port: 4840
   selector:
-    app: ua-cloudcommander
+    app: commander
 ---
 apiVersion: apps/v1
 kind: Deployment