diff --git a/tcs-upgrade/service_group/auth-service.yaml b/tcs-upgrade/service_group/auth-service.yaml
deleted file mode 100644
index 768e070..0000000
--- a/tcs-upgrade/service_group/auth-service.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: auth
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: auth
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: auth
-  template:
-    metadata:
-      labels:
-        app: auth
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: auth
-          image: beaconfireiic/auth:1.1.1-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "auth"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/auth
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: auth
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: auth
\ No newline at end of file
diff --git a/tcs-upgrade/service_group/batch-service.yaml b/tcs-upgrade/service_group/batch-service.yaml
deleted file mode 100644
index 7dc1ee6..0000000
--- a/tcs-upgrade/service_group/batch-service.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: batch-command
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: batch-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: batch-command
-  template:
-    metadata:
-      labels:
-        app: batch-command
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: batch-command
-          image: beaconfireiic/batch-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "batch-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/batch-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: batch-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: batch-command
-
----
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: batch-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: batch-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: batch-query
-  template:
-    metadata:
-      labels:
-        app: batch-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: batch-query
-          image: beaconfireiic/batch-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "batch-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/batch-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: batch-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: batch-query
\ No newline at end of file
diff --git a/tcs-upgrade/service_group/company-service.yaml b/tcs-upgrade/service_group/company-service.yaml
deleted file mode 100644
index 9a2cadb..0000000
--- a/tcs-upgrade/service_group/company-service.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: company-command
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: company-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: company-command
-  template:
-    metadata:
-      labels:
-        app: company-command
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: company-command
-          image: beaconfireiic/company-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "company-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/company-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: company-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: company-command
-
----
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: company-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: company-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: company-query
-  template:
-    metadata:
-      labels:
-        app: company-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: company-query
-          image: beaconfireiic/company-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "company-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/company-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: company-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: company-query
\ No newline at end of file
diff --git a/tcs-upgrade/service_group/email-service.yaml b/tcs-upgrade/service_group/email-service.yaml
deleted file mode 100644
index 08b8525..0000000
--- a/tcs-upgrade/service_group/email-service.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: email-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: email-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: email-query
-  template:
-    metadata:
-      labels:
-        app: email-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: email-query
-          image: beaconfireiic/email-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "email-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/email-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: email-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: email-query
diff --git a/tcs-upgrade/service_group/kpi-service.yaml b/tcs-upgrade/service_group/kpi-service.yaml
deleted file mode 100644
index abd9f0c..0000000
--- a/tcs-upgrade/service_group/kpi-service.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: kpi-command
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: kpi-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: kpi-command
-  template:
-    metadata:
-      labels:
-        app: kpi-command
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: kpi-command
-          image: beaconfireiic/kpi-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "kpi-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/kpi-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: kpi-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: kpi-command
-
----
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: kpi-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: kpi-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: kpi-query
-  template:
-    metadata:
-      labels:
-        app: kpi-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: kpi-query
-          image: beaconfireiic/kpi-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "kpi-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/kpi-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: kpi-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: kpi-query
\ No newline at end of file
diff --git a/tcs-upgrade/service_group/question-service.yaml b/tcs-upgrade/service_group/question-service.yaml
deleted file mode 100644
index a1f2e4e..0000000
--- a/tcs-upgrade/service_group/question-service.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: question-command
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: question-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: question-command
-  template:
-    metadata:
-      labels:
-        app: question-command
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: question-command
-          image: beaconfireiic/question-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "question-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/question-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: question-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: question-command
-
----
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: question-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: question-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: question-query
-  template:
-    metadata:
-      labels:
-        app: question-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: question-query
-          image: beaconfireiic/question-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "question-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/question-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: question-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: question-query
\ No newline at end of file
diff --git a/tcs-upgrade/service_group/subscription-service.yaml b/tcs-upgrade/service_group/subscription-service.yaml
deleted file mode 100644
index 560a947..0000000
--- a/tcs-upgrade/service_group/subscription-service.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: subscription-command
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: subscription-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: subscription-command
-  template:
-    metadata:
-      labels:
-        app: subscription-command
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: subscription-command
-          image: beaconfireiic/subscription-command:1.1.1-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "subscription-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/subscription-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: subscription-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: subscription-command
-
----
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: subscription-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: subscription-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: subscription-query
-  template:
-    metadata:
-      labels:
-        app: subscription-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: subscription-query
-          image: beaconfireiic/subscription-query:1.1.1-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "subscription-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/subscription-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: subscription-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: subscription-query
\ No newline at end of file
diff --git a/tcs-upgrade/service_group/user-service.yaml b/tcs-upgrade/service_group/user-service.yaml
deleted file mode 100644
index 72b5c86..0000000
--- a/tcs-upgrade/service_group/user-service.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: user-query
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: user-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: user-query
-  template:
-    metadata:
-      labels:
-        app: user-query
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: user-query
-          image: beaconfireiic/user-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "user-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/user-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: user-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: user-query
-
----
-# apiVersion: v1
-# kind: ConfigMap
-# metadata:
-#   name: user-command
-# data:
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: user-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: user-command
-  template:
-    metadata:
-      labels:
-        app: user-command
-    spec:
-      imagePullSecrets:
-        - name: docker-regcred
-      containers:
-        - name: user-command
-          image: beaconfireiic/user-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8888
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8888"
-            - name: "LOG_APP-NAME"
-              value: "user-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "sdet"
-          volumeMounts:
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/user-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: user-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8888
-      targetPort: http
-  selector:
-    app: user-command
\ No newline at end of file