diff --git a/test/simulator-group/consul_cbs/docker-compose.yml b/test/simulator-group/consul_cbs/docker-compose.yml
index 15d3de1..4bf9271 100644
--- a/test/simulator-group/consul_cbs/docker-compose.yml
+++ b/test/simulator-group/consul_cbs/docker-compose.yml
@@ -33,6 +33,9 @@
       - ${CONSUL_EXTERNAL_PORT}:${CONSUL_INTERNAL_PORT}
     volumes:
       - ./consul/:/consul/config
+    labels:
+      - "nrttest_app=CONSUL"
+      - "nrttest_dp=${CONSUL_DISPLAY_NAME}"
 
   config-binding-service:
     networks:
@@ -45,4 +48,7 @@
       - CONSUL_HOST=${CONSUL_HOST}
     depends_on:
       - ${CONSUL_HOST}
+    labels:
+      - "nrttest_app=CBS"
+      - "nrttest_dp=${CBS_DISPLAY_NAME}"
 
diff --git a/test/simulator-group/control_panel/docker-compose.yml b/test/simulator-group/control_panel/docker-compose.yml
index 0d603a0..94628fa 100644
--- a/test/simulator-group/control_panel/docker-compose.yml
+++ b/test/simulator-group/control_panel/docker-compose.yml
@@ -28,5 +28,8 @@
     ports:
     - ${CONTROL_PANEL_EXTERNAL_PORT}:${CONTROL_PANEL_INTERNAL_PORT}
     - ${CONTROL_PANEL_EXTERNAL_SECURE_PORT}:${CONTROL_PANEL_INTERNAL_SECURE_PORT}
-
-
+    volumes:
+    - ${CONTROL_PANEL_HOST_MNT_DIR}/$CONTROL_PANEL_CONFIG_FILE:${CONTROL_PANEL_CONFIG_MOUNT_PATH}/$CONTROL_PANEL_CONFIG_FILE
+    labels:
+      - "nrttest_app=CP"
+      - "nrttest_dp=${CONTROL_PANEL_DISPLAY_NAME}"
diff --git a/test/simulator-group/control_panel/nginx.conf b/test/simulator-group/control_panel/nginx.conf
new file mode 100644
index 0000000..0014ffb
--- /dev/null
+++ b/test/simulator-group/control_panel/nginx.conf
@@ -0,0 +1,39 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+events{}
+
+http {
+    include /etc/nginx/mime.types;
+    resolver 127.0.0.11;
+    server {
+        listen 8080;
+        server_name localhost;
+        root /usr/share/nginx/html;
+        index index.html;
+        location /a1-policy/ {
+            set $upstream ${NGW_DOMAIN_NAME};
+            proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
+        }
+        location /ei-producer/{
+            set $upstream ${NGW_DOMAIN_NAME};
+            proxy_pass http://$upstream:${NRT_GATEWAY_EXTERNAL_PORT};
+        }
+        location / {
+            try_files $uri $uri/ /index.html;
+        }
+    }
+}
diff --git a/test/simulator-group/cr/docker-compose.yml b/test/simulator-group/cr/docker-compose.yml
index 4fc3991..634a464 100644
--- a/test/simulator-group/cr/docker-compose.yml
+++ b/test/simulator-group/cr/docker-compose.yml
@@ -29,3 +29,6 @@
     ports:
       - ${CR_EXTERNAL_PORT}:${CR_INTERNAL_PORT}
       - ${CR_EXTERNAL_SECURE_PORT}:${CR_INTERNAL_SECURE_PORT}
+    labels:
+      - "nrttest_app=CR"
+      - "nrttest_dp=${CR_DISPLAY_NAME}"
diff --git a/test/simulator-group/dmaapmr/docker-compose.yaml b/test/simulator-group/dmaapmr/docker-compose.yml
similarity index 93%
rename from test/simulator-group/dmaapmr/docker-compose.yaml
rename to test/simulator-group/dmaapmr/docker-compose.yml
index b418028..c468b2f 100644
--- a/test/simulator-group/dmaapmr/docker-compose.yaml
+++ b/test/simulator-group/dmaapmr/docker-compose.yml
@@ -42,6 +42,9 @@
       -  ./mnt/zk/zk_server_jaas.conf:/etc/zookeeper/secrets/jaas/zk_server_jaas.conf
     networks:
       - default
+    labels:
+      - "nrttest_app=DMAAPMR"
+      - "nrttest_dp=ZooKeeper"
 
   kafka:
    image: $ONAP_KAFKA_IMAGE
@@ -66,9 +69,12 @@
    volumes:
      -  ./mnt/kafka/zk_client_jaas.conf:/etc/kafka/secrets/jaas/zk_client_jaas.conf
    networks:
-      - default
+    - default
    depends_on:
     - zookeeper
+   labels:
+    - "nrttest_app=DMAAPMR"
+    - "nrttest_dp=Kafka"
 
   dmaap:
     image: $ONAP_DMAAPMR_IMAGE
@@ -87,3 +93,6 @@
     depends_on:
       - zookeeper
       - kafka
+    labels:
+      - "nrttest_app=DMAAPMR"
+      - "nrttest_dp=DMAAP Message Router"
diff --git a/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf b/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf
index d4ef1eb..dca46d5 100644
--- a/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf
+++ b/test/simulator-group/dmaapmr/mnt/kafka/zk_client_jaas.conf
@@ -2,4 +2,5 @@
    org.apache.zookeeper.server.auth.DigestLoginModule required
    username="kafka"
    password="kafka_secret";
- };
\ No newline at end of file
+ };
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties b/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties
index 66c7db1..e174b6f 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties
+++ b/test/simulator-group/dmaapmr/mnt/mr/KUBE-MsgRtrApi.properties
@@ -1,8 +1,8 @@
 # LICENSE_START=======================================================
 #  org.onap.dmaap
 #  ================================================================================
-#  Copyright © 2020 Nordix Foundation. All rights reserved.
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#  Copyright Â© 2020 Nordix Foundation. All rights reserved.
+#  Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -170,4 +170,5 @@
 kafka.max.poll.interval.ms=300000
 kafka.heartbeat.interval.ms=60000
 kafka.session.timeout.ms=240000
-kafka.max.poll.records=1000
\ No newline at end of file
+kafka.max.poll.records=1000
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties b/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties
index 573a81a..dc5ddd7 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties
+++ b/test/simulator-group/dmaapmr/mnt/mr/MsgRtrApi.properties
@@ -1,8 +1,8 @@
 # LICENSE_START=======================================================
 #  org.onap.dmaap
 #  ================================================================================
-#  Copyright © 2020 Nordix Foundation. All rights reserved.
-#  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#  Copyright Â© 2020 Nordix Foundation. All rights reserved.
+#  Copyright Â© 2017 AT&T Intellectual Property. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -170,4 +170,5 @@
 kafka.max.poll.interval.ms=300000
 kafka.heartbeat.interval.ms=60000
 kafka.session.timeout.ms=240000
-kafka.max.poll.records=1000
\ No newline at end of file
+kafka.max.poll.records=1000
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/cadi.properties b/test/simulator-group/dmaapmr/mnt/mr/cadi.properties
index dca56c8..4d28b52 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/cadi.properties
+++ b/test/simulator-group/dmaapmr/mnt/mr/cadi.properties
@@ -16,4 +16,5 @@
 cadi_loglevel=INFO
 cadi_protocols=TLSv1.1,TLSv1.2
 cadi_latitude=37.78187
-cadi_longitude=-122.26147
\ No newline at end of file
+cadi_longitude=-122.26147
+
diff --git a/test/simulator-group/dmaapmr/mnt/mr/logback.xml b/test/simulator-group/dmaapmr/mnt/mr/logback.xml
index 8471208..02499fb 100644
--- a/test/simulator-group/dmaapmr/mnt/mr/logback.xml
+++ b/test/simulator-group/dmaapmr/mnt/mr/logback.xml
@@ -1,7 +1,7 @@
 <!--
      ============LICENSE_START=======================================================
-     Copyright © 2020 Nordix Foundation. All rights reserved.
-     Copyright © 2019 AT&T Intellectual Property. All rights reserved.
+     Copyright Â© 2020 Nordix Foundation. All rights reserved.
+     Copyright Â© 2019 AT&T Intellectual Property. All rights reserved.
      ================================================================================
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -207,3 +207,4 @@
   </root>
 
 </configuration>
+
diff --git a/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf b/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf
index 26bf460..9a32a72 100644
--- a/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf
+++ b/test/simulator-group/dmaapmr/mnt/zk/zk_server_jaas.conf
@@ -1,4 +1,5 @@
 Server {
        org.apache.zookeeper.server.auth.DigestLoginModule required
        user_kafka=kafka_secret;
-};
\ No newline at end of file
+};
+
diff --git a/test/simulator-group/ecs/docker-compose.yml b/test/simulator-group/ecs/docker-compose.yml
index b74252a..b057753 100644
--- a/test/simulator-group/ecs/docker-compose.yml
+++ b/test/simulator-group/ecs/docker-compose.yml
@@ -32,6 +32,6 @@
     ports:
     - ${ECS_EXTERNAL_PORT}:${ECS_INTERNAL_PORT}
     - ${ECS_EXTERNAL_SECURE_PORT}:${ECS_INTERNAL_SECURE_PORT}
-
-
-
+    labels:
+      - "nrttest_app=ECS"
+      - "nrttest_dp=${ECS_DISPLAY_NAME}"
diff --git a/test/simulator-group/ecs/mnt/.gitignore b/test/simulator-group/ecs/mnt/.gitignore
index 1e82fc7..72e8ffc 100644
--- a/test/simulator-group/ecs/mnt/.gitignore
+++ b/test/simulator-group/ecs/mnt/.gitignore
@@ -1 +1 @@
-*.yaml
+*
diff --git a/test/simulator-group/ecs/pv.yaml b/test/simulator-group/ecs/pv.yaml
new file mode 100644
index 0000000..ffccecc
--- /dev/null
+++ b/test/simulator-group/ecs/pv.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: $ECS_DATA_PV_NAME
+  labels:
+    run: $ECS_APP_NAME
+    autotest: ECS
+spec:
+  storageClassName: ecs-standard
+  capacity:
+    storage: 1Mi
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Delete
+  hostPath:
+    path: "/tmp/$ECS_PV_PATH"
diff --git a/test/simulator-group/ecs/pvc.yaml b/test/simulator-group/ecs/pvc.yaml
index 3abd359..dca9f1c 100644
--- a/test/simulator-group/ecs/pvc.yaml
+++ b/test/simulator-group/ecs/pvc.yaml
@@ -11,6 +11,6 @@
   - ReadWriteOnce
   resources:
     requests:
-      storage: 10Mi
-  storageClassName: standard
-  volumeMode: Filesystem
\ No newline at end of file
+      storage: 1Mi
+  storageClassName: ecs-standard
+  volumeMode: Filesystem
diff --git a/test/simulator-group/httpproxy/docker-compose.yaml b/test/simulator-group/httpproxy/docker-compose.yml
similarity index 92%
rename from test/simulator-group/httpproxy/docker-compose.yaml
rename to test/simulator-group/httpproxy/docker-compose.yml
index 7d61802..ff4243b 100644
--- a/test/simulator-group/httpproxy/docker-compose.yaml
+++ b/test/simulator-group/httpproxy/docker-compose.yml
@@ -29,4 +29,7 @@
     tty: true
     command: mitmweb --web-host 0.0.0.0 --no-web-open-browser --set ssl_insecure
     ports:
-      - ${HTTP_PROXY_WEB_EXTERNAL_PORT}:${HTTP_PROXY_WEB_INTERNAL_PORT}
\ No newline at end of file
+      - ${HTTP_PROXY_WEB_EXTERNAL_PORT}:${HTTP_PROXY_WEB_INTERNAL_PORT}
+    labels:
+      - "nrttest_app=HTTPPROXY"
+      - "nrttest_dp=${HTTP_PROXY_DISPLAY_NAME}"
diff --git a/test/simulator-group/httpproxy/svc.yaml b/test/simulator-group/httpproxy/svc.yaml
index cd27563..1e3c009 100644
--- a/test/simulator-group/httpproxy/svc.yaml
+++ b/test/simulator-group/httpproxy/svc.yaml
@@ -5,9 +5,9 @@
   namespace: $KUBE_SIM_NAMESPACE
   labels:
     run: $HTTP_PROXY_APP_NAME
-    autotest: HTTP_PROXY_APP_NAME
+    autotest: HTTPPROXY
 spec:
-  type: ClusterIP
+  type: NodePort
   ports:
   - port: $HTTP_PROXY_EXTERNAL_PORT
     targetPort: $HTTP_PROXY_INTERNAL_PORT
@@ -18,4 +18,4 @@
     protocol: TCP
     name: web
   selector:
-    run: $HTTP_PROXY_APP_NAME
\ No newline at end of file
+    run: $HTTP_PROXY_APP_NAME
diff --git a/test/simulator-group/kubeproxy/.gitignore b/test/simulator-group/kubeproxy/.gitignore
new file mode 100644
index 0000000..ab8f024
--- /dev/null
+++ b/test/simulator-group/kubeproxy/.gitignore
@@ -0,0 +1 @@
+.dockererr
diff --git a/test/simulator-group/kubeproxy/app.yaml b/test/simulator-group/kubeproxy/app.yaml
new file mode 100644
index 0000000..08241a3
--- /dev/null
+++ b/test/simulator-group/kubeproxy/app.yaml
@@ -0,0 +1,30 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: $KUBE_PROXY_APP_NAME
+  namespace: $KUBE_SIM_NAMESPACE
+  labels:
+    run: $KUBE_PROXY_APP_NAME
+    autotest: KUBEPROXY
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: $KUBE_PROXY_APP_NAME
+  template:
+    metadata:
+      labels:
+        run: $KUBE_PROXY_APP_NAME
+        autotest: KUBEPROXY
+    spec:
+      containers:
+      - name: $KUBE_PROXY_APP_NAME
+        image: $KUBE_PROXY_IMAGE
+        imagePullPolicy: Never
+        ports:
+        - name: http
+          containerPort: $KUBE_PROXY_INTERNAL_PORT
+        - name: web
+          containerPort: $KUBE_PROXY_WEB_INTERNAL_PORT
+        command: ["mitmweb"]
+        args: ["--web-host", "0.0.0.0", "--no-web-open-browser", "-p", "$KUBE_PROXY_INTERNAL_PORT", "--set", "ssl_insecure"]
diff --git a/test/simulator-group/kubeproxy/svc.yaml b/test/simulator-group/kubeproxy/svc.yaml
new file mode 100644
index 0000000..1a11fc4
--- /dev/null
+++ b/test/simulator-group/kubeproxy/svc.yaml
@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: $KUBE_PROXY_APP_NAME
+  namespace: $KUBE_SIM_NAMESPACE
+  labels:
+    run: $KUBE_PROXY_APP_NAME
+    autotest: KUBEPROXY
+spec:
+  type: NodePort
+  ports:
+  - port: $KUBE_PROXY_EXTERNAL_PORT
+    targetPort: $KUBE_PROXY_INTERNAL_PORT
+    protocol: TCP
+    name: http
+    nodePort:
+  - port: $KUBE_PROXY_WEB_EXTERNAL_PORT
+    targetPort: $KUBE_PROXY_WEB_INTERNAL_PORT
+    protocol: TCP
+    name: web
+  selector:
+    run: $KUBE_PROXY_APP_NAME
diff --git a/test/simulator-group/mrstub/docker-compose.yml b/test/simulator-group/mrstub/docker-compose.yml
index 02f80a3..9101b5b 100644
--- a/test/simulator-group/mrstub/docker-compose.yml
+++ b/test/simulator-group/mrstub/docker-compose.yml
@@ -34,3 +34,6 @@
     environment:
       - TOPIC_READ=${TOPIC_READ}
       - TOPIC_WRITE=${TOPIC_WRITE}
+    labels:
+      - "nrttest_app=MR"
+      - "nrttest_dp=${MR_STUB_DISPLAY_NAME}"
diff --git a/test/simulator-group/ngw/.gitignore b/test/simulator-group/ngw/.gitignore
new file mode 100644
index 0000000..59aac41
--- /dev/null
+++ b/test/simulator-group/ngw/.gitignore
@@ -0,0 +1,2 @@
+.tmp.json
+.dockererr
diff --git a/test/simulator-group/ngw/app.yaml b/test/simulator-group/ngw/app.yaml
new file mode 100644
index 0000000..c38de9f
--- /dev/null
+++ b/test/simulator-group/ngw/app.yaml
@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: $NRT_GATEWAY_APP_NAME
+  namespace: $KUBE_NONRTRIC_NAMESPACE
+  labels:
+    run: $NRT_GATEWAY_APP_NAME
+    autotest: NGW
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: $NRT_GATEWAY_APP_NAME
+  template:
+    metadata:
+      labels:
+        run: $NRT_GATEWAY_APP_NAME
+        autotest: NGW
+    spec:
+      containers:
+      - name: $NRT_GATEWAY_APP_NAME
+        image: $NRT_GATEWAY_IMAGE
+        imagePullPolicy: Never
+        ports:
+        - name: http
+          containerPort: $NRT_GATEWAY_INTERNAL_PORT
+        - name: https
+          containerPort: $NRT_GATEWAY_INTERNAL_SECURE_PORT
+        volumeMounts:
+        - mountPath: $NRT_GATEWAY_CONFIG_MOUNT_PATH/$NRT_GATEWAY_CONFIG_FILE
+          subPath: $NRT_GATEWAY_CONFIG_FILE
+          name: ngw-conf-name
+      volumes:
+      - configMap:
+          defaultMode: 420
+          name: $NGW_CONFIG_CONFIGMAP_NAME
+        name: ngw-conf-name
diff --git a/test/simulator-group/ngw/application.yaml b/test/simulator-group/ngw/application.yaml
new file mode 100644
index 0000000..c734461
--- /dev/null
+++ b/test/simulator-group/ngw/application.yaml
@@ -0,0 +1,52 @@
+################################################################################
+#   Copyright (c) 2021 Nordix Foundation.                                      #
+#                                                                              #
+#   Licensed under the Apache License, Version 2.0 (the "License");            #
+#   you may not use this file except in compliance with the License.           #
+#   You may obtain a copy of the License at                                    #
+#                                                                              #
+#       http://www.apache.org/licenses/LICENSE-2.0                             #
+#                                                                              #
+#   Unless required by applicable law or agreed to in writing, software        #
+#   distributed under the License is distributed on an "AS IS" BASIS,          #
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+#   See the License for the specific language governing permissions and        #
+#   limitations under the License.                                             #
+################################################################################
+
+server:
+  port: 9090
+spring:
+  cloud:
+    gateway:
+      httpclient:
+        ssl:
+          useInsecureTrustManager: true
+        wiretap: true
+      httpserver:
+        wiretap: true
+      routes:
+      - id: A1-Policy
+        uri: https://${POLICY_AGENT_DOMAIN_NAME}:${POLICY_AGENT_EXTERNAL_SECURE_PORT}
+        predicates:
+        - Path=/a1-policy/**
+      - id: A1-EI
+        uri: https://${ECS_DOMAIN_NAME}:${ECS_EXTERNAL_SECURE_PORT}
+        predicates:
+        - Path=/ei-producer/**
+management:
+  endpoint:
+    gateway:
+      enabled: true
+  endpoints:
+    web:
+      exposure:
+        include: "gateway,loggers,logfile,health,info,metrics,threaddump,heapdump"
+logging:
+  level:
+    ROOT: ERROR
+    org.springframework: ERROR
+    org.springframework.cloud.gateway: INFO
+    reactor.netty: INFO
+  file:
+    name: /var/log/nonrtric-gateway/application.log
diff --git a/test/simulator-group/httpproxy/docker-compose.yaml b/test/simulator-group/ngw/docker-compose.yml
similarity index 67%
copy from test/simulator-group/httpproxy/docker-compose.yaml
copy to test/simulator-group/ngw/docker-compose.yml
index 7d61802..c897ba7 100644
--- a/test/simulator-group/httpproxy/docker-compose.yaml
+++ b/test/simulator-group/ngw/docker-compose.yml
@@ -21,12 +21,16 @@
     external:
       name: ${DOCKER_SIM_NWNAME}
 services:
-  httpproxy:
+  nonrtric-gateway:
+    image: ${NRT_GATEWAY_IMAGE}
+    container_name: ${NRT_GATEWAY_APP_NAME}
     networks:
       - default
-    container_name: ${HTTP_PROXY_APP_NAME}
-    image: ${HTTP_PROXY_IMAGE}
-    tty: true
-    command: mitmweb --web-host 0.0.0.0 --no-web-open-browser --set ssl_insecure
     ports:
-      - ${HTTP_PROXY_WEB_EXTERNAL_PORT}:${HTTP_PROXY_WEB_INTERNAL_PORT}
\ No newline at end of file
+    - ${NRT_GATEWAY_EXTERNAL_PORT}:${NRT_GATEWAY_INTERNAL_PORT}
+#    - ${NRT_GATEWAY_EXTERNAL_SECURE_PORT}:${NRT_GATEWAY_INTERNAL_SECURE_PORT}
+    volumes:
+    - ${NRT_GATEWAY_HOST_MNT_DIR}/$NRT_GATEWAY_CONFIG_FILE:${NRT_GATEWAY_CONFIG_MOUNT_PATH}/$NRT_GATEWAY_CONFIG_FILE
+    labels:
+      - "nrttest_app=NGW"
+      - "nrttest_dp=${NRT_GATEWAY_DISPLAY_NAME}"
diff --git a/test/simulator-group/ngw/svc.yaml b/test/simulator-group/ngw/svc.yaml
new file mode 100644
index 0000000..b86aeaf
--- /dev/null
+++ b/test/simulator-group/ngw/svc.yaml
@@ -0,0 +1,21 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: $NRT_GATEWAY_APP_NAME
+  namespace: $KUBE_NONRTRIC_NAMESPACE
+  labels:
+    run: $NRT_GATEWAY_APP_NAME
+    autotest: NGW
+spec:
+  type: ClusterIP
+  ports:
+  - port: $NRT_GATEWAY_EXTERNAL_PORT
+    targetPort: $NRT_GATEWAY_INTERNAL_PORT
+    protocol: TCP
+    name: http
+  - port: $NRT_GATEWAY_EXTERNAL_SECURE_PORT
+    targetPort: $NRT_GATEWAY_INTERNAL_SECURE_PORT
+    protocol: TCP
+    name: https
+  selector:
+    run: $NRT_GATEWAY_APP_NAME
diff --git a/test/simulator-group/policy_agent/docker-compose.yml b/test/simulator-group/policy_agent/docker-compose.yml
index 18350a0..e89fc86 100644
--- a/test/simulator-group/policy_agent/docker-compose.yml
+++ b/test/simulator-group/policy_agent/docker-compose.yml
@@ -1,3 +1,4 @@
+#  ============LICENSE_START===============================================
 #  Copyright (C) 2020 Nordix Foundation. All rights reserved.
 #  ========================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -36,5 +37,6 @@
       - HOSTNAME=${POLICY_AGENT_CONFIG_KEY}
     volumes:
     - ${POLICY_AGENT_HOST_MNT_DIR}/$POLICY_AGENT_CONFIG_FILE:${POLICY_AGENT_CONFIG_MOUNT_PATH}/$POLICY_AGENT_CONFIG_FILE
-
-
+    labels:
+      - "nrttest_app=PA"
+      - "nrttest_dp=${POLICY_AGENT_DISPLAY_NAME}"
diff --git a/test/simulator-group/policy_agent/mnt/.gitignore b/test/simulator-group/policy_agent/mnt/.gitignore
index 1e82fc7..72e8ffc 100644
--- a/test/simulator-group/policy_agent/mnt/.gitignore
+++ b/test/simulator-group/policy_agent/mnt/.gitignore
@@ -1 +1 @@
-*.yaml
+*
diff --git a/test/simulator-group/prodstub/docker-compose.yml b/test/simulator-group/prodstub/docker-compose.yml
index 1ce8b49..f771352 100644
--- a/test/simulator-group/prodstub/docker-compose.yml
+++ b/test/simulator-group/prodstub/docker-compose.yml
@@ -31,3 +31,6 @@
     ports:
       - ${PROD_STUB_EXTERNAL_PORT}:${PROD_STUB_INTERNAL_PORT}
       - ${PROD_STUB_EXTERNAL_SECURE_PORT}:${PROD_STUB_INTERNAL_SECURE_PORT}
+    labels:
+      - "nrttest_app=PRODSTUB"
+      - "nrttest_dp=${PROD_STUB_DISPLAY_NAME}"
diff --git a/test/simulator-group/rapp_catalogue/docker-compose.yml b/test/simulator-group/rapp_catalogue/docker-compose.yml
index 35d2bef..3dbd45b 100644
--- a/test/simulator-group/rapp_catalogue/docker-compose.yml
+++ b/test/simulator-group/rapp_catalogue/docker-compose.yml
@@ -28,7 +28,6 @@
     ports:
     - ${RAPP_CAT_EXTERNAL_PORT}:${RAPP_CAT_INTERNAL_PORT}
     - ${RAPP_CAT_EXTERNAL_SECURE_PORT}:${RAPP_CAT_INTERNAL_SECURE_PORT}
-
-
-
-
+    labels:
+      - "nrttest_app=RC"
+      - "nrttest_dp=${PROD_STUB_DISPLAY_NAME}"
diff --git a/test/simulator-group/ric/docker-compose.yml b/test/simulator-group/ric/docker-compose.yml
index 70ec587..5a04ce9 100644
--- a/test/simulator-group/ric/docker-compose.yml
+++ b/test/simulator-group/ric/docker-compose.yml
@@ -37,6 +37,10 @@
       - ALLOW_HTTP=true
     volumes:
       - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
+    labels:
+      - "nrttest_app=RICSIM"
+      - "nrttest_dp=${RIC_SIM_DISPLAY_NAME}"
+
   g2:
     image: ${RIC_SIM_IMAGE}
     networks:
@@ -50,6 +54,10 @@
       - ALLOW_HTTP=true
     volumes:
       - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
+    labels:
+      - "nrttest_app=RICSIM"
+      - "nrttest_dp=${RIC_SIM_DISPLAY_NAME}"
+
   g3:
     image: ${RIC_SIM_IMAGE}
     networks:
@@ -62,4 +70,7 @@
       - REMOTE_HOSTS_LOGGING=1
       - ALLOW_HTTP=true
     volumes:
-      - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
\ No newline at end of file
+      - ${RIC_SIM_CERT_MOUNT_DIR}:/usr/src/app/cert:ro
+    labels:
+      - "nrttest_app=RICSIM"
+      - "nrttest_dp=${RIC_SIM_DISPLAY_NAME}"
diff --git a/test/simulator-group/sdnc/app.yaml b/test/simulator-group/sdnc/app.yaml
index cd170f6..75e30d4 100644
--- a/test/simulator-group/sdnc/app.yaml
+++ b/test/simulator-group/sdnc/app.yaml
@@ -35,6 +35,10 @@
           value: 'true'
         - name: A1_TRUSTSTORE_PASSWORD
           value: $SDNC_A1_TRUSTSTORE_PASSWORD
+        - name: ODL_ADMIN_USERNAME
+          value: $SDNC_USER
+        - name: ODL_ADMIN_PASSWORD
+          value: $SDNC_PWD
         command:
         - /opt/onap/sdnc/bin/startODL.sh
 ---
diff --git a/test/simulator-group/sdnc/app2.yaml b/test/simulator-group/sdnc/app2.yaml
new file mode 100644
index 0000000..116ce66
--- /dev/null
+++ b/test/simulator-group/sdnc/app2.yaml
@@ -0,0 +1,96 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: $SDNC_APP_NAME
+  namespace: $KUBE_NONRTRIC_NAMESPACE
+  labels:
+    run: $SDNC_APP_NAME
+    autotest: SDNC
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: $SDNC_APP_NAME
+  template:
+    metadata:
+      labels:
+        run: $SDNC_APP_NAME
+        autotest: SDNC
+    spec:
+      containers:
+      - name: $SDNC_APP_NAME
+        image: $SDNC_A1_CONTROLLER_IMAGE
+        imagePullPolicy: Never
+        ports:
+        - name: http
+          containerPort: $SDNC_INTERNAL_PORT
+        - name: https
+          containerPort: $SDNC_INTERNAL_SECURE_PORT
+        env:
+        - name: MYSQL_ROOT_PASSWORD
+          value: 'itsASecret'
+        - name: MYSQL_USER
+          value: 'sdnctl'
+        - name: MYSQL_PASSWORD
+          value: 'gamma'
+        - name: MYSQL_DATABASE
+          value: 'sdnctl'
+        - name: SDNC_CONFIG_DIR
+          value: '/opt/onap/sdnc/data/properties'
+        - name: SDNC_BIN
+          value: '/opt/onap/sdnc/bin'
+        - name: ODL_CERT_DIR
+          value: '/tmp'
+        - name: ODL_ADMIN_USERNAME
+          value: $SDNC_USER
+        - name: ODL_ADMIN_PASSWORD
+          value: $SDNC_PWD
+        - name: ODL_USERNAME
+          value: $SDNC_USER
+        - name: ODL_PASSWORD
+          value: $SDNC_PWD
+        - name: SDNC_DB_INIT
+          value: 'true'
+        - name: A1_TRUSTSTORE_PASSWORD
+          value: $SDNC_A1_TRUSTSTORE_PASSWORD
+        command:
+        - /opt/onap/sdnc/bin/startODL.sh
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: $SDNC_DB_APP_NAME
+  namespace: $KUBE_NONRTRIC_NAMESPACE
+  labels:
+    run: $SDNC_DB_APP_NAME
+    autotest: SDNC
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      run: $SDNC_DB_APP_NAME
+  template:
+    metadata:
+      labels:
+        run: $SDNC_DB_APP_NAME
+        autotest: SDNC
+    spec:
+      containers:
+        - name: $SDNC_DB_APP_NAME
+          image: $SDNC_DB_IMAGE
+          imagePullPolicy: Never
+          ports:
+          - name: http
+            containerPort: 3306
+          env:
+          - name: MYSQL_ROOT_PASSWORD
+            value: 'itsASecret'
+          - name: MYSQL_ROOT_HOST
+            value: '%'
+          - name: MYSQL_USER
+            value: 'sdnctl'
+          - name: MYSQL_PASSWORD
+            value: 'gamma'
+          - name: MYSQL_DATABASE
+            value: 'sdnctl'
+
diff --git a/test/simulator-group/sdnc/docker-compose-2.yml b/test/simulator-group/sdnc/docker-compose-2.yml
new file mode 100644
index 0000000..9d81df5
--- /dev/null
+++ b/test/simulator-group/sdnc/docker-compose-2.yml
@@ -0,0 +1,83 @@
+# ==================================================================================
+#   Modifications Copyright (c) 2019 Nordix Foundation.
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+# ==================================================================================
+version: '3'
+
+networks:
+  default:
+    external:
+      name: ${DOCKER_SIM_NWNAME}
+
+services:
+  db:
+    image: ${SDNC_DB_IMAGE}
+    container_name: ${SDNC_DB_APP_NAME}
+    networks:
+      - default
+    ports:
+      - "3306"
+    environment:
+      - MYSQL_ROOT_PASSWORD=itsASecret
+      - MYSQL_ROOT_HOST=%
+      - MYSQL_USER=sdnctl
+      - MYSQL_PASSWORD=gamma
+      - MYSQL_DATABASE=sdnctl
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    labels:
+      - "nrttest_app=SDNC"
+      - "nrttest_dp=SDNC DB"
+
+  a1controller:
+    image: ${SDNC_A1_CONTROLLER_IMAGE}
+    depends_on :
+      - db
+    container_name: ${SDNC_APP_NAME}
+    networks:
+      - default
+    entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
+    ports:
+      - ${SDNC_EXTERNAL_PORT}:${SDNC_INTERNAL_PORT}
+      - ${SDNC_EXTERNAL_SECURE_PORT}:${SDNC_INTERNAL_SECURE_PORT}
+    links:
+      - db:dbhost
+      - db:sdnctldb01
+      - db:sdnctldb02
+    environment:
+      - MYSQL_ROOT_PASSWORD=itsASecret
+      - MYSQL_USER=sdnctl
+      - MYSQL_PASSWORD=gamma
+      - MYSQL_DATABASE=sdnctl
+      - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
+      - SDNC_BIN=/opt/onap/sdnc/bin
+      - ODL_CERT_DIR=/tmp
+      - ODL_ADMIN_USERNAME=${SDNC_USER}
+      - ODL_ADMIN_PASSWORD=${SDNC_PWD}
+      - ODL_USER=${SDNC_USER}
+      - ODL_PASSWORD=${SDNC_PWD}
+      - SDNC_DB_INIT=true
+      - A1_TRUSTSTORE_PASSWORD=${SDNC_A1_TRUSTSTORE_PASSWORD}
+      - AAI_TRUSTSTORE_PASSWORD=changeit
+    logging:
+      driver:   "json-file"
+      options:
+        max-size: "30m"
+        max-file: "5"
+    labels:
+      - "nrttest_app=SDNC"
+      - "nrttest_dp=${SDNC_DISPLAY_NAME}"
diff --git a/test/simulator-group/sdnc/docker-compose.yml b/test/simulator-group/sdnc/docker-compose.yml
index 80f60f7..0b6f357 100644
--- a/test/simulator-group/sdnc/docker-compose.yml
+++ b/test/simulator-group/sdnc/docker-compose.yml
@@ -36,6 +36,9 @@
       options:
         max-size: "30m"
         max-file: "5"
+    labels:
+      - "nrttest_app=SDNC"
+      - "nrttest_dp=SDNC DB"
 
   a1controller:
     image: ${SDNC_A1_CONTROLLER_IMAGE}
@@ -57,9 +60,13 @@
       - SDNC_DB_INIT=true
       - SDNC_CONFIG_DIR=/opt/onap/sdnc/data/properties
       - A1_TRUSTSTORE_PASSWORD=${SDNC_A1_TRUSTSTORE_PASSWORD}
+      - ODL_ADMIN_USERNAME=${SDNC_USER}
+      - ODL_ADMIN_PASSWORD=${SDNC_PWD}
     logging:
       driver:   "json-file"
       options:
         max-size: "30m"
         max-file: "5"
-
+    labels:
+      - "nrttest_app=SDNC"
+      - "nrttest_dp=${SDNC_DISPLAY_NAME}"
diff --git a/test/simulator-group/sim-monitor.js b/test/simulator-group/sim-monitor.js
index aabc7d7..e118e17 100644
--- a/test/simulator-group/sim-monitor.js
+++ b/test/simulator-group/sim-monitor.js
@@ -236,7 +236,7 @@
         if (getCtr%3 == 0) {
             //Extract the port numbers from the running simulators, for every 3 calls
             const { exec } = require('child_process');
-            exec('docker ps --filter "name='+ricbasename+'" --format "{{.Names}} {{.Ports}}" | sed s/0.0.0.0:// | cut -d \'>\' -f1 | sed \'s/[[-]]*$//\'', (err, stdout, stderr) => {
+            exec('docker ps --filter "name='+ricbasename+'" --filter "network=nonrtric-docker-net" --format "{{.Names}} {{.Ports}}" | sed s/0.0.0.0:// | cut -d \'>\' -f1 | sed \'s/[[-]]*$//\'', (err, stdout, stderr) => {
 
                 var simulators = ""
                 simulators=`${stdout}`.replace(/(\r\n|\n|\r)/gm," ");
@@ -511,7 +511,8 @@
                             var jd=JSON.parse(data);
                             var jda=jd["supported_ei_types"]
                             for(var j=0;j<jda.length;j++) {
-                                row=""+row+jda[j]["ei_type_identity"]+" "
+                                row=""+row+jda[j]+" "
+
                             }
                             tmp_ecs_producer_type_arr[idx]=row
                         }