diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env
index 957bdbc..647f53a 100644
--- a/plans/so/integration-etsi-testing/config/env
+++ b/plans/so/integration-etsi-testing/config/env
@@ -1,6 +1,6 @@
 NEXUS_DOCKER_REPO_MSO=nexus3.onap.org:10001
 DOCKER_ENVIRONMENT=remote
-TAG=1.5.2
+TAG=1.6.0
 TIME_OUT_DEFAULT_VALUE_SEC=1200
 PROJECT_NAME=etsiintegrationtesting
 DEFAULT_NETWORK_NAME=etsiintegrationtesting_default
diff --git a/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
index b5479a9..bdf5c4d 100644
--- a/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
@@ -48,8 +48,8 @@
       retry:
         count: 3
   aai:
-    endpoint: https://aai.api.simpledemo.onap.org:8443
-    auth: 2630606608347B7124C244AB0FE34F6F
+    endpoint: https://aai-simulator:9993
+    auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
   extApi:
     endpoint: http://nbi.onap:8080/nbi/api/v3
   so:
diff --git a/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml
index f2494fb..426d4fd 100644
--- a/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/bpmn-infra/onapheat/override.yaml
@@ -5,6 +5,11 @@
   endpoint: https://aai-simulator:9993
   workflowAaiDistributionDelay: PT30S
   pnfEntryNotificationTimeout: P14D
+cds:
+  endpoint: blueprints-processor
+  port: 9111
+  auth: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
+  timeout: 60
 camunda:
   bpm:
     admin-user:
@@ -14,11 +19,6 @@
     job-execution:
       max-pool-size: 30
       core-pool-size: 3
-cds:
-    endpoint: blueprints-processor
-    port: 9111
-    auth: Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
-    timeout: 60
 entitymanager:
   packagesToScan: com
 pnf:
@@ -27,10 +27,13 @@
     port: 3904
     protocol: http
     uriPathPrefix: events
-    topicName: pnfReady
+    topicName: unauthenticated.PNF_READY
     consumerGroup: consumerGroup
     consumerId: consumerId
     topicListenerDelayInSeconds: 5
+bpelURL: http://bpmn-infra:8081
+msb-ip: msb-iag
+msb-port: 80
 mso:
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
   config:
@@ -82,6 +85,12 @@
         endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/rest/v1/volume-groups
     vnf-async:
       endpoint: http://c1.vm1.mso.simpledemo.onap.org:8087/services/VnfAdapterAsync
+    vfc:
+      rest:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8084/services/v1/vfcadapter
+    workflow:
+      message:
+        endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
   bpmn:
     process:
       historyTimeToLive: '30'
@@ -225,6 +234,9 @@
       endpoint: http://bpmn-infra:8081/mso/WorkflowMessage
     notification:
       name: GenericNotificationServiceATT
+    sdnc:
+      replication:
+        delay: PT60S
     sdncadapter:
       callback: http://bpmn-infra:8081/mso/SDNCAdapterCallbackService
     vnfadapter:
@@ -236,16 +248,23 @@
         callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
       rollback:
         callback: http://c1.vm1.mso.simpledemo.onap.org:8087/mso/vnfAdapterNotify
+  use:
+    qualified:
+      host: false
   global:
     dmaap:
       username: testuser
       password: alRyMzJ3NUNeakxl
       host: http://10.42.111.36:904
-      auth: A4DE725B8B0D1A745049409B16762C16BC9B48555DC157272741D616323104442B3AAC052ED17E74EECA136B89C8C6615C8CC269ED5834EC47C6BE6A75DF39C6C07B07DF064CE268BE6510F472
       publisher:
         topic: replaceme
+  naming:
+    endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName
+    auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
 policy:
   auth: Basic dGVzdHBkcDphbHBoYTEyMw==
+  default:
+    disposition: Skip
   client:
     auth: Basic bTAzNzQzOnBvbGljeVIwY2sk
   endpoint: https://localhost:8081/pdp/api/
@@ -257,13 +276,15 @@
   si:
     svc:
       types: PORT-MIRROR,PPROBE
-
-so:
-  vnfm:
-    adapter:
-      url: https://so-vnfm-adapter:9092/so/vnfm-adapter/v1/
-      auth: Basic dm5mbTpwYXNzd29yZDEk
-
+  dmaap:
+    host: ueb1.simpledemo.onap.org:3904
+    timeout: 30000
+  lcm:
+    path: '/restconf/operations/LCM:'
+    actionTimeout: 300000
+    dmapp:
+      readTopic: SDNC-LCM-WRITE
+      writeTopic: SDNC-LCM-READ
 appc:
   client:
     topic:
@@ -272,8 +293,7 @@
         timeout: 360000
       write: APPC-LCM-READ
       sdnc:
-        read:
-          name: SDNC-LCM-WRITE
+        read: SDNC-LCM-WRITE
         write: SDNC-LCM-READ
     response:
       timeout: 360000
@@ -281,21 +301,34 @@
     secret: 64AG2hF4pYeG2pq7CT6XwUOT
     service: ueb
     poolMembers: ueb1.simpledemo.onap.org:3904,ueb2.simpledemo.onap.org:3904
+sniro:
+  conductor:
+    enabled: true
+    host: http://sniro-emulator:80
+    uri: /v1/release-orders
+    headers.auth: Basic dGVzdDp0ZXN0cHdk
+  manager:
+    timeout: PT30M
+    host: http://sniro-emulator:80
+    uri.v1: /sniro/api/v2/placement
+    uri.v2: /sniro/api/placement/v2
+    headers.auth: Basic dGVzdDp0ZXN0cHdk
+    headers.patchVersion: 1
+    headers.minorVersion: 1
+    headers.latestVersion: 2
 server:
   port: 8081
   tomcat:
     max-threads: 50
 spring:
   datasource:
-     driver-class-name: org.mariadb.jdbc.Driver
-     url: jdbc:mariadb://mariadb:3306/camundabpmn
-     username: camundauser
-     password: camunda123
-     dbcp2:
-      initial-size: 5
-      max-total: 20
-      validation-query: select 1
-      test-on-borrow: true
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/camundabpmn
+      username: camundauser
+      password: camunda123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: bpmn-pool
+      registerMbeans: true
   security:
     usercredentials:
     -
@@ -322,6 +355,11 @@
       username: mso_admin
       password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
       role: ACTUATOR
+so:
+  vnfm:
+    adapter:
+      url: https://so-vnfm-adapter:9092/so/vnfm-adapter/v1/
+      auth: Basic dm5mbTpwYXNzd29yZDEk
 org:
   onap:
     so:
@@ -335,3 +373,4 @@
           keyStorePassword: 'RLe5ExMWW;Kd6GTSt0WQz;.Y'
           trustStore: classpath:org.onap.so.trust.jks
           trustStorePassword: '6V%8oSU$,%WbYp3IUe;^mWt4'
+
diff --git a/plans/so/integration-etsi-testing/config/override-files/catalog-db-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/catalog-db-adapter/onapheat/override.yaml
new file mode 100644
index 0000000..934e8fb
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/override-files/catalog-db-adapter/onapheat/override.yaml
@@ -0,0 +1,103 @@
+server:
+    port: 8082
+    tomcat:
+        max-threads: 50
+ssl-enable: false
+mso:
+  logPath: logs
+  site-name: onapheat
+  catalog:
+    db:
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+spring:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/catalogdb
+      username: cataloguser
+      password: catalog123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: catdb-pool
+      registerMbeans: true
+  flyway:
+    baseline-on-migrate: false
+    url: jdbc:mariadb://mariadb:3306/catalogdb
+    user: cataloguser
+    password: catalog123
+    outOfOrder: true
+    validateOnMigrate: false
+  jpa:
+    generate-ddl: false
+    show-sql: false
+    hibernate:
+      ddl-auto: validate
+      naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+      enable-lazy-load-no-trans: true
+    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
+  security:
+    usercredentials:
+    -
+      username: bpel
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+#Actuator
+management:
+  context-path: /manage
+cloud_config:
+  identity_services:
+    RAX_KEYSTONE:
+      identity_url: "https://identity.api.rackspacecloud.com/v2.0"
+      mso_id: "RACKSPACE_ACCOUNT_ID"
+      mso_pass: "RACKSPACE_ACCOUNT_APIKEY"
+      admin_tenant: "dummy"
+      member_role: "admin"
+      tenant_metadata: true
+      identity_server_type: "KEYSTONE"
+      identity_authentication_type: "RACKSPACE_APIKEY"
+      project_domain_name: "PROJECT_DOMAIN_NAME"
+      user_domain_name: "USER_DOMAIN_NAME"
+    DEFAULT_KEYSTONE:
+      identity_url: "dummy"
+      mso_id: "dummy"
+      mso_pass: "dummy"
+      admin_tenant: "dummy"
+      member_role: "admin"
+      tenant_metadata: true
+      identity_server_type: "KEYSTONE"
+      identity_authentication_type: "USERNAME_PASSWORD"
+      project_domain_name: "dummy"
+      user_domain_name: "dummy"
+  cloud_sites:
+    Dallas:
+      region_id: "DFW"
+      clli: "DFW"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    Northern Virginia:
+      region_id: "IAD"
+      clli: "IAD"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    Chicago:
+      region_id: "ORD"
+      clli: "ORD"
+      aic_version: "2.5"
+      identity_service_id: "RAX_KEYSTONE"
+    RegionOne:
+      region_id: "RegionOne"
+      clli: "RegionOne"
+      aic_version: "2.5"
+      identity_service_id: "DEFAULT_KEYSTONE"
+    DEFAULT:
+      region_id: "dummyRegionId"
+      clli: "dummyClli"
+      aic_version: "2.5"
+      identity_service_id: "DEFAULT_KEYSTONE"
+
+
diff --git a/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
index bb71512..ee87e25 100644
--- a/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
+++ b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
@@ -18,8 +18,19 @@
   auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
   version: v15
   endpoint:  https://aai-simulator:9993
+spring:
+  security:
+    usercredentials:
+    - username: vnfm
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    - username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
 mso:
   key: 07a7159d3bf51a0e53be7a8f89699be7
+  site-name: localSite
+  logPath: ./logs/vnfm-adapter
 sdc:
   username: mso
   password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
@@ -28,3 +39,7 @@
   toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
 vnfmadapter:
   endpoint: https://so-vnfm-adapter:9092
+etsi-catalog-manager:
+  vnfpkgm:
+    endpoint: http://modeling-etsicatalog:8806/api/vnfpkgm/v1
+
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index 96eea96..ae8d774 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -24,7 +24,7 @@
       - "8082:8082"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${TEST_LAB_DIR}/volumes/so/config/catalog-db-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/catalog-db-adapter/onapheat:/app/config
     environment:
       - APP=catalog-db-adapter
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -43,14 +43,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - mariadb:3306
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" mariadb:3306 -- "/app/start-app.sh"'
 ################################################################################
   request-db-adapter:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/request-db-adapter:${TAG}
@@ -78,14 +72,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - catalog-db-adapter:8082
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" catalog-db-adapter:8082 -- "/app/start-app.sh"'
 ################################################################################
   sdnc-adapter:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdnc-adapter:${TAG}
@@ -114,14 +102,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   sdc-controller:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/sdc-controller:${TAG}
@@ -151,10 +133,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /bin/sh
-      - -c
-      - 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
+    user: root
+    entrypoint: /bin/sh -c 'mkdir -p /distribution-test-zip/unzipped && tar -xvzf /distribution-test-zip/zipped_sdc_csar.tar.gz -C /distribution-test-zip/unzipped && chmod 777 -R /distribution-test-zip/ && /app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   bpmn-infra:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/bpmn-infra:${TAG}
@@ -184,14 +164,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   api-handler-infra:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/api-handler-infra:${TAG}
@@ -220,14 +194,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 #############################################################################
   so-monitoring:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/so-monitoring:${TAG}
@@ -264,14 +232,8 @@
       options:
         max-size: "30m"
         max-file: "5"
-    command:
-      - /app/wait-for.sh
-      - -q
-      - -t
-      - "300"
-      - request-db-adapter:8083
-      - --
-      - "/app/start-app.sh"
+    user: root
+    entrypoint: /bin/sh -c '/app/wait-for.sh -q -t "300" request-db-adapter:8083 -- "/app/start-app.sh"'
 ################################################################################
   sdc-simulator:
     image: simulators/sdc-simulator:latest