diff --git a/kubernetes/entity-ident-deployment.yaml b/kubernetes/entity-ident-deployment.yaml
deleted file mode 100644
index 36868fe..0000000
--- a/kubernetes/entity-ident-deployment.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: entity-ident
-  labels:
-    app: dse
-    tier: entity-ident
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: dse
-  template:
-    metadata:
-      labels:
-        app: dse
-        tier: entity-ident
-    spec:
-      containers:
-        - name: entity-ident
-          image: entity-ident
-          ports:
-            - containerPort: 5000
-          imagePullPolicy: Never
diff --git a/kubernetes/entity-ident-service.yaml b/kubernetes/entity-ident-service.yaml
deleted file mode 100644
index 0283224..0000000
--- a/kubernetes/entity-ident-service.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: entity-ident
-  labels:
-    service: entity-ident
-spec:
-  selector:
-    app: dse
-    tier: entity-ident
-  ports:
-  - port: 5000
-    targetPort: 5000
\ No newline at end of file
diff --git a/kubernetes/entityident-deployment.yaml b/kubernetes/entityident-deployment.yaml
new file mode 100644
index 0000000..880f79a
--- /dev/null
+++ b/kubernetes/entityident-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: entityident
+  name: entityident
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: entityident
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: entityident
+    spec:
+      containers:
+      - image: entityident
+        imagePullPolicy: ""
+        name: entityident
+        ports:
+        - containerPort: 5000
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/entityident-service.yaml b/kubernetes/entityident-service.yaml
new file mode 100644
index 0000000..2cae359
--- /dev/null
+++ b/kubernetes/entityident-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: entityident
+  name: entityident
+spec:
+  ports:
+  - name: "5000"
+    port: 5000
+    targetPort: 5000
+  selector:
+    io.kompose.service: entityident
+status:
+  loadBalancer: {}
diff --git a/kubernetes/eventstore-deployment.yaml b/kubernetes/eventstore-deployment.yaml
new file mode 100644
index 0000000..6868bfa
--- /dev/null
+++ b/kubernetes/eventstore-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: eventstore
+  name: eventstore
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: eventstore
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: eventstore
+    spec:
+      containers:
+      - image: eventstore
+        imagePullPolicy: ""
+        name: eventstore
+        ports:
+        - containerPort: 5000
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/eventstore-service.yaml b/kubernetes/eventstore-service.yaml
new file mode 100644
index 0000000..79119db
--- /dev/null
+++ b/kubernetes/eventstore-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: eventstore
+  name: eventstore
+spec:
+  ports:
+  - name: "5000"
+    port: 5000
+    targetPort: 5000
+  selector:
+    io.kompose.service: eventstore
+status:
+  loadBalancer: {}
diff --git a/kubernetes/ifeed-deployment.yaml b/kubernetes/ifeed-deployment.yaml
new file mode 100644
index 0000000..17b4c35
--- /dev/null
+++ b/kubernetes/ifeed-deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: ifeed
+  name: ifeed
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: ifeed
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: ifeed
+    spec:
+      containers:
+      - image: ifeed
+        imagePullPolicy: ""
+        name: ifeed
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/mongo-deployment.yaml b/kubernetes/mongo-deployment.yaml
index 89a454b..2efdd26 100644
--- a/kubernetes/mongo-deployment.yaml
+++ b/kubernetes/mongo-deployment.yaml
@@ -1,24 +1,36 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: mongo
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
   labels:
-    app: dse
+    io.kompose.service: mongo
+  name: mongo
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: dse
-      tier: mongo
+      io.kompose.service: mongo
+  strategy: {}
   template:
     metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
       labels:
-        app: dse
-        tier: mongo
+        io.kompose.service: mongo
     spec:
       containers:
-        - name: mongo
-          image: mongo
-          ports:
-            - containerPort: 27017
-          imagePullPolicy: Never
+      - image: mongo
+        imagePullPolicy: ""
+        name: mongo
+        ports:
+        - containerPort: 27017
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/mongo-service.yaml b/kubernetes/mongo-service.yaml
index d70286a..b81acde 100644
--- a/kubernetes/mongo-service.yaml
+++ b/kubernetes/mongo-service.yaml
@@ -1,13 +1,19 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: mongo
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
   labels:
-    service: mongo
+    io.kompose.service: mongo
+  name: mongo
 spec:
-  type: ClusterIP
-  selector:
-    app: dse
   ports:
-  - port: 27017
-    targetPort: 27017
\ No newline at end of file
+  - name: "27017"
+    port: 27017
+    targetPort: 27017
+  selector:
+    io.kompose.service: mongo
+status:
+  loadBalancer: {}
diff --git a/kubernetes/orchestration-deployment.yaml b/kubernetes/orchestration-deployment.yaml
new file mode 100644
index 0000000..c0f8048
--- /dev/null
+++ b/kubernetes/orchestration-deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: orchestration
+  name: orchestration
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: orchestration
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: orchestration
+    spec:
+      containers:
+      - image: orchestration
+        imagePullPolicy: ""
+        name: orchestration
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/rabbitmq-deployment.yaml b/kubernetes/rabbitmq-deployment.yaml
new file mode 100644
index 0000000..c4d8ad2
--- /dev/null
+++ b/kubernetes/rabbitmq-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: rabbitmq
+  name: rabbitmq
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: rabbitmq
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: rabbitmq
+    spec:
+      containers:
+      - image: rabbitmq
+        imagePullPolicy: ""
+        name: rabbitmq
+        ports:
+        - containerPort: 5672
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/rabbitmq-service.yaml b/kubernetes/rabbitmq-service.yaml
new file mode 100644
index 0000000..586c541
--- /dev/null
+++ b/kubernetes/rabbitmq-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: rabbitmq
+  name: rabbitmq
+spec:
+  ports:
+  - name: "5672"
+    port: 5672
+    targetPort: 5672
+  selector:
+    io.kompose.service: rabbitmq
+status:
+  loadBalancer: {}
diff --git a/kubernetes/redis-deployment.yaml b/kubernetes/redis-deployment.yaml
new file mode 100644
index 0000000..1589602
--- /dev/null
+++ b/kubernetes/redis-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: redis
+  name: redis
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: redis
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: redis
+    spec:
+      containers:
+      - image: redis
+        imagePullPolicy: ""
+        name: redis
+        ports:
+        - containerPort: 6379
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/redis-service.yaml b/kubernetes/redis-service.yaml
new file mode 100644
index 0000000..44a0e9b
--- /dev/null
+++ b/kubernetes/redis-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: redis
+  name: redis
+spec:
+  ports:
+  - name: "6379"
+    port: 6379
+    targetPort: 6379
+  selector:
+    io.kompose.service: redis
+status:
+  loadBalancer: {}
diff --git a/kubernetes/xway-deployment.yaml b/kubernetes/xway-deployment.yaml
new file mode 100644
index 0000000..653a31f
--- /dev/null
+++ b/kubernetes/xway-deployment.yaml
@@ -0,0 +1,36 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: xway
+  name: xway
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      io.kompose.service: xway
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+        kompose.version: 1.21.0 (992df58d8)
+      creationTimestamp: null
+      labels:
+        io.kompose.service: xway
+    spec:
+      containers:
+      - image: xway
+        imagePullPolicy: ""
+        name: xway
+        ports:
+        - containerPort: 5000
+        resources: {}
+      restartPolicy: Always
+      serviceAccountName: ""
+      volumes: null
+status: {}
diff --git a/kubernetes/xway-service.yaml b/kubernetes/xway-service.yaml
new file mode 100644
index 0000000..efdcd8e
--- /dev/null
+++ b/kubernetes/xway-service.yaml
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.cmd: C:\ProgramData\kompose\kompose.exe convert
+    kompose.version: 1.21.0 (992df58d8)
+  creationTimestamp: null
+  labels:
+    io.kompose.service: xway
+  name: xway
+spec:
+  ports:
+  - name: "5000"
+    port: 5000
+    targetPort: 5000
+  selector:
+    io.kompose.service: xway
+status:
+  loadBalancer: {}