diff --git a/qa-upgrade/sevice-group_qa/config-server.yaml b/prod-upgrade/service_group/config-server.yaml
similarity index 93%
rename from qa-upgrade/sevice-group_qa/config-server.yaml
rename to prod-upgrade/service_group/config-server.yaml
index fa04a46..6960a88 100644
--- a/qa-upgrade/sevice-group_qa/config-server.yaml
+++ b/prod-upgrade/service_group/config-server.yaml
@@ -15,8 +15,8 @@ data:
               search-paths:
                 - '{application}'
                 - micro/*
-              username: zyu@beaconfireinc.com
-              password: ENC(5/I4EP0HwkLv/ZFigX3bmP+U/yR0HAOgWpbVg4tHuREz0G9CfOZzZfFTHA342PpoLYVkj924iqo=)
+              username: landon@beaconfireinc.com
+              password: ENC(1DPnWNsXwpvCGsIF8qOLYRkdtlGEfz1dkZQytZK8QBRHKxDLVJ5b+pPAo2AJJ9QqOVqp+1ORQkQ=)
         bus:
           refresh:
             enabled: true
diff --git a/qa-upgrade/sevice-group_qa/discover-service.yaml b/prod-upgrade/service_group/discover.yaml
similarity index 98%
rename from qa-upgrade/sevice-group_qa/discover-service.yaml
rename to prod-upgrade/service_group/discover.yaml
index 390ddc0..665cafe 100644
--- a/qa-upgrade/sevice-group_qa/discover-service.yaml
+++ b/prod-upgrade/service_group/discover.yaml
@@ -39,7 +39,7 @@ spec:
             - name: "LOG_APP-NAME"
               value: "discovery-service"
             - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
+              value:  "prod"
           volumeMounts:
             - name: app-logs
               mountPath: /logs
@@ -106,7 +106,7 @@ spec:
             - name: "LOG_APP-NAME"
               value: "gateway"
             - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
+              value:  "prod"
           volumeMounts:
             - name: app-logs
               mountPath: /logs
diff --git a/qa-upgrade/sevice-group_qa/admin-console.yml b/qa-upgrade/sevice-group_qa/admin-console.yml
deleted file mode 100644
index 0c288b7..0000000
--- a/qa-upgrade/sevice-group_qa/admin-console.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: admin-console
-data:
-  application.yml: |
-    spring:
-      application:
-        name: admin-console
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: admin-console
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: admin-console
-  template:
-    metadata:
-      labels:
-        app: admin-console
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: admin-console
-          image: beaconfireiic/admin-console:1.0.0-prod
-          command: ["java", "-Djasypt.encryptor.password=secret", "-cp","app:app/lib/*","com.beaconfire.adminconsole.AdminConsoleApplication"]
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "admin-console"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: admin-console
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/admin-console
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: admin-console
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: admin-console
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/auth-middleware.yml b/qa-upgrade/sevice-group_qa/auth-middleware.yml
deleted file mode 100644
index d2448b3..0000000
--- a/qa-upgrade/sevice-group_qa/auth-middleware.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: auth-middleware
-data:
-  application.yml: |
-    spring:
-      application:
-        name: auth-middleware
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: auth-middleware
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: auth-middleware
-  template:
-    metadata:
-      labels:
-        app: auth-middleware
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: auth-middleware
-          image: beaconfireiic/auth-middleware:1.1.0-6-dev
-          command: ["java", "-Djasypt.encryptor.password=secret", "-cp","app:app/lib/*","com.beaconfire.authmiddleware.AuthMiddlewareApplication"]
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "auth-middleware"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: auth-middleware
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/auth-middleware
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: auth-middleware
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: auth-middleware
diff --git a/qa-upgrade/sevice-group_qa/auth.yaml b/qa-upgrade/sevice-group_qa/auth.yaml
deleted file mode 100644
index a1b7312..0000000
--- a/qa-upgrade/sevice-group_qa/auth.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: auth
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: auth
-  template:
-    metadata:
-      labels:
-        app: auth
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: auth
-          image: beaconfireiic/auth:1.1.1-sdet
-          command: ["java", "-Djasypt.encryptor.password=secret", "-cp","app:app/lib/*","com.beaconfire.auth.AuthApplication"]
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "auth"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: auth
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/batch.yaml b/qa-upgrade/sevice-group_qa/batch.yaml
deleted file mode 100644
index eeb7530..0000000
--- a/qa-upgrade/sevice-group_qa/batch.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-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: deploy-regcred
-      containers:
-        - name: batch-command
-          image: beaconfireiic/batch-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "batch-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: batch-command
-
----
-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: deploy-regcred
-      containers:
-        - name: batch-query
-          image: beaconfireiic/batch-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "batch-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: batch-query
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/beaconfire-auth.yml b/qa-upgrade/sevice-group_qa/beaconfire-auth.yml
deleted file mode 100644
index 4281a4c..0000000
--- a/qa-upgrade/sevice-group_qa/beaconfire-auth.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: beaconfire-auth
-data:
-  application.yml: |
-    spring:
-      application:
-        name: beaconfire-auth
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: beaconfire-auth
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: beaconfire-auth
-  template:
-    metadata:
-      labels:
-        app: beaconfire-auth
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: beaconfire-auth
-          image: beaconfireiic/beaconfire-auth:1.0.0-3-dev
-          command: ["java", "-Djasypt.encryptor.password=secret", "-cp","app:app/lib/*","com.beaconfire.beaconfireauth.BeaconfireAuthApplication"]
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "beaconfire-auth"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: beaconfire-auth
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/beaconfire-auth
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: beaconfire-auth
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: beaconfire-auth
diff --git a/qa-upgrade/sevice-group_qa/company.yaml b/qa-upgrade/sevice-group_qa/company.yaml
deleted file mode 100644
index 240b4b2..0000000
--- a/qa-upgrade/sevice-group_qa/company.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-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: deploy-regcred
-      containers:
-        - name: company-command
-          image: beaconfireiic/company-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "company-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: company-command
-
----
-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: deploy-regcred
-      containers:
-        - name: company-query
-          image: beaconfireiic/company-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "company-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: company-query
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/email.yaml b/qa-upgrade/sevice-group_qa/email.yaml
deleted file mode 100644
index 6dd391d..0000000
--- a/qa-upgrade/sevice-group_qa/email.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
----
-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: deploy-regcred
-      containers:
-        - name: email-query
-          image: beaconfireiic/email-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "email-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: email-query
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: email-config
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: email-config
-  template:
-    metadata:
-      labels:
-        app: email-config
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: email-query
-          image: beaconfireiic/email-config:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "email-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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-config
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: email-config
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: email-config
-
diff --git a/qa-upgrade/sevice-group_qa/file-service.yml b/qa-upgrade/sevice-group_qa/file-service.yml
deleted file mode 100644
index 93ad4ae..0000000
--- a/qa-upgrade/sevice-group_qa/file-service.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: file-service
-data:
-  application.yml: |
-    spring:
-      application:
-        name: file-service
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: file-service
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: file-service
-  template:
-    metadata:
-      labels:
-        app: file-service
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: file-service
-          image: beaconfireiic/file-service:1.0.0-prod
-          command: ["java", "-Djasypt.encryptor.password=secret", "-cp","app:app/lib/*","com.beaconfire.fileservice.FileServiceApplication"]
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "file-service"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: file-service
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/file-service
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: file-service
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: file-service
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/kpi.yaml b/qa-upgrade/sevice-group_qa/kpi.yaml
deleted file mode 100644
index 98f8171..0000000
--- a/qa-upgrade/sevice-group_qa/kpi.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-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: deploy-regcred
-      containers:
-        - name: kpi-command
-          image: beaconfireiic/kpi-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "kpi-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: kpi-command
-
----
-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: deploy-regcred
-      containers:
-        - name: kpi-query
-          image: beaconfireiic/kpi-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "kpi-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: kpi-query
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/oauth-service.yml b/qa-upgrade/sevice-group_qa/oauth-service.yml
deleted file mode 100644
index 9402a39..0000000
--- a/qa-upgrade/sevice-group_qa/oauth-service.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: oauth-service
-data:
-  application.yml: |
-    spring:
-      application:
-        name: oauth-service
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: oauth-service
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: oauth-service
-  template:
-    metadata:
-      labels:
-        app: oauth-service
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: oauth-service
-          image: beaconfireiic/oauth-service:1.0.0-dev
-          command: ["java", "-Djasypt.encryptor.password=secret", "-cp","app:app/lib/*","com.beaconfire.oauthservice.OauthServiceApplication"]
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "oauth-service"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: oauth-service
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/oauth-service
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: oauth-service
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: oauth-service
diff --git a/qa-upgrade/sevice-group_qa/question.yaml b/qa-upgrade/sevice-group_qa/question.yaml
deleted file mode 100644
index 0009c78..0000000
--- a/qa-upgrade/sevice-group_qa/question.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-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: deploy-regcred
-      containers:
-        - name: question-command
-          image: beaconfireiic/question-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "question-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: question-command
-
----
-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: deploy-regcred
-      containers:
-        - name: question-query
-          image: beaconfireiic/question-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "question-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: question-query
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/recruiting.yml b/qa-upgrade/sevice-group_qa/recruiting.yml
deleted file mode 100644
index e69a070..0000000
--- a/qa-upgrade/sevice-group_qa/recruiting.yml
+++ /dev/null
@@ -1,265 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: recruiting-command
-data:
-  application.yml: |
-    spring:
-      application:
-        name: recruiting-command
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: recruiting-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: recruiting-command
-  template:
-    metadata:
-      labels:
-        app: recruiting-command
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: recruiting-command
-          image: beaconfireiic/recruiting-command:1.1.0-dev
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "recruiting-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: recruiting-command
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/recruiting-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: recruiting-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: recruiting-command
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: recruiting-query
-data:
-  application.yml: |
-    spring:
-      application:
-        name: recruiting-query
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: recruiting-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: recruiting-query
-  template:
-    metadata:
-      labels:
-        app: recruiting-query
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: recruiting-query
-          image: beaconfireiic/recruiting-query:1.1.0-dev
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "recruiting-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: recruiting-query
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/recruiting-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: recruiting-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: recruiting-query
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: recruit-config
-data:
-  application.yml: |
-    spring:
-      application:
-        name: recruit-config
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: recruit-config
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: recruit-config
-  template:
-    metadata:
-      labels:
-        app: recruit-config
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: recruit-config
-          image: beaconfireiic/recruit-config:1.1.0-dev
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "recruit-config"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: recruit-config
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/recruit-config
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: recruit-config
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: recruit-config
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/subscription.yaml b/qa-upgrade/sevice-group_qa/subscription.yaml
deleted file mode 100644
index 26dfc94..0000000
--- a/qa-upgrade/sevice-group_qa/subscription.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-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: deploy-regcred
-      containers:
-        - name: subscription-command
-          image: beaconfireiic/subscription-command:1.1.1-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "subscription-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: subscription-command
-
----
-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: deploy-regcred
-      containers:
-        - name: subscription-query
-          image: beaconfireiic/subscription-query:1.1.1-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "subscription-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: subscription-query
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/summary.yaml b/qa-upgrade/sevice-group_qa/summary.yaml
deleted file mode 100644
index 4f2da54..0000000
--- a/qa-upgrade/sevice-group_qa/summary.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: summary-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: summary-query
-  template:
-    metadata:
-      labels:
-        app: summary-query
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: summary-query
-          image: beaconfireiic/summary-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "summary-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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/summary-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: summary-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: summary-query
diff --git a/qa-upgrade/sevice-group_qa/timesheet.yml b/qa-upgrade/sevice-group_qa/timesheet.yml
deleted file mode 100644
index 5dffbfd..0000000
--- a/qa-upgrade/sevice-group_qa/timesheet.yml
+++ /dev/null
@@ -1,265 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: time-sheet-command
-data:
-  application.yml: |
-    spring:
-      application:
-        name: time-sheet-command
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: time-sheet-command
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: time-sheet-command
-  template:
-    metadata:
-      labels:
-        app: time-sheet-command
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: time-sheet-command
-          image: beaconfireiic/time-sheet-command:1.0.0-dev
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "time-sheet-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: time-sheet-command
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/time-sheet-command
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: time-sheet-command
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: time-sheet-command
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: time-sheet-query
-data:
-  application.yml: |
-    spring:
-      application:
-        name: time-sheet-query
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: time-sheet-query
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: time-sheet-query
-  template:
-    metadata:
-      labels:
-        app: time-sheet-query
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: time-sheet-query
-          image: beaconfireiic/time-sheet-query:1.0.0-dev
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "time-sheet-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: time-sheet-query
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/time-sheet-query
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: time-sheet-query
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: time-sheet-query
-
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: time-sheet-config
-data:
-  application.yml: |
-    spring:
-      application:
-        name: time-sheet-config
-      profiles:
-        active: qa
-      cloud:
-        config:
-          label: main
-      config:
-        import: optional:configserver:http://config-server:8888
-    springdoc:
-      api-docs:
-        enabled: false
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: time-sheet-config
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: time-sheet-config
-  template:
-    metadata:
-      labels:
-        app: time-sheet-config
-    spec:
-      imagePullSecrets:
-        - name: deploy-regcred
-      containers:
-        - name: time-sheet-config
-          image: beaconfireiic/time-sheet-config:1.0.0-dev
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "time-sheet-config"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          volumeMounts:
-            - name: config
-              mountPath: /app/application.yml
-              subPath: application.yml
-            - name: app-logs
-              mountPath: /logs
-          resources: 
-            requests:
-              cpu: 0.1
-              memory: 128Mi
-            limits:
-              cpu: 1
-              memory: 2Gi
-      volumes:
-        - name: config
-          configMap: 
-            name: time-sheet-config
-        - name: app-logs
-          hostPath:
-            path: /data/app_logs/time-sheet-config
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: time-sheet-config
-spec:
-  type: ClusterIP
-  ports:
-    - name: http
-      protocol: TCP
-      port: 8080
-      targetPort: http
-  selector:
-    app: time-sheet-config
\ No newline at end of file
diff --git a/qa-upgrade/sevice-group_qa/user.yaml b/qa-upgrade/sevice-group_qa/user.yaml
deleted file mode 100644
index 586fbca..0000000
--- a/qa-upgrade/sevice-group_qa/user.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
----
-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: deploy-regcred
-      containers:
-        - name: user-query
-          image: beaconfireiic/user-query:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "user-query"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: user-query
-
----
-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: deploy-regcred
-      containers:
-        - name: user-command
-          image: beaconfireiic/user-command:1.1.0-sdet
-          imagePullPolicy: Always
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          env:
-            - name: "LOGGING_LEVEL_ROOT"
-              value: "info"
-            - name: "SERVER_PORT"
-              value: "8080"
-            - name: "LOG_APP-NAME"
-              value: "user-command"
-            - name: "SPRING_PROFILES_ACTIVE"
-              value:  "qa"
-          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: 8080
-      targetPort: http
-  selector:
-    app: user-command
\ No newline at end of file