diff --git a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/cloud-esr-system-info.json b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/cloud-esr-system-info.json
index 4368003..47bd57b 100644
--- a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/cloud-esr-system-info.json
+++ b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/cloud-esr-system-info.json
@@ -5,8 +5,8 @@
     "vendor": "RedHat",
     "version": "1",
     "service-url": "https://csit.etsicloud.com:5000/v3/",
-    "user-name": "bW1vcnJpcasdw==",
-    "password": "N0xLcHM1VDRSCCSECSVBESDU0",
+    "user-name": "",
+    "password": "",
     "system-type": "VIM",
     "port": "example-port-val-93234",
     "cloud-domain": "CCP_Domain_34466",
diff --git a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json
index f19da91..d204a77 100644
--- a/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json
+++ b/plans/so/integration-etsi-testing/config/aai-simulator-populate-data/esr-system-info.json
@@ -4,8 +4,8 @@
     "type": "simulator",
     "vendor": "EST",
     "version": "V1.0",
-    "service-url": "http://vnfm-simulator:9093/vnflcm/v1",
-    "user-name": "vnfmadapter",
-    "password": "123456",
+    "service-url": "https://so-vnfm-simulator:9093/vnflcm/v1",
+    "user-name": "",
+    "password": "",
     "system-type": "VNFM"
 }
diff --git a/plans/so/integration-etsi-testing/config/env b/plans/so/integration-etsi-testing/config/env
index 583be0a..957bdbc 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.4.3-STAGING-latest
+TAG=1.5.2
 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
new file mode 100644
index 0000000..b5479a9
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/override-files/api-handler-infra/onapheat/override.yaml
@@ -0,0 +1,133 @@
+server:
+    port: 8080
+    tomcat:
+        max-threads: 50
+ssl-enable: false
+
+mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  logPath: logs
+  site-name: onapheat
+  adapters:
+    requestDb:
+      endpoint: http://request-db-adapter:8083
+      auth: Basic YnBlbDpwYXNzd29yZDEk
+  catalog:
+    db:
+      spring:
+        endpoint: http://catalog-db-adapter:8082
+  db:
+    auth: Basic YnBlbDpwYXNzd29yZDEk
+  config:
+    path: /src/main/resources/
+  infra:
+    default:
+      alacarte:
+        orchestrationUri: /mso/async/services/ALaCarteOrchestrator
+        recipeTimeout: 180
+        testApi: VNF_API
+      service:
+        macro:
+          default:
+            testApi: GR_API
+  camundaURL: http://bpmn-infra:8081
+  camundaAuth: AE2E9BE6EF9249085AF98689C4EE087736A5500629A72F35068FFB88813A023581DD6E765071F1C04075B36EA4213A
+  async:
+    core-pool-size: 50
+    max-pool-size: 50
+    queue-capacity: 500
+  sdc:
+    client:
+      auth: F3473596C526938329DF877495B494DC374D1C4198ED3AD305EA3ADCBBDA1862
+    activate:
+      instanceid: test
+      userid: cs0008
+    endpoint: http://c1.vm1.mso.simpledemo.onap.org:28090
+  tenant:
+    isolation:
+      retry:
+        count: 3
+  aai:
+    endpoint: https://aai.api.simpledemo.onap.org:8443
+    auth: 2630606608347B7124C244AB0FE34F6F
+  extApi:
+    endpoint: http://nbi.onap:8080/nbi/api/v3
+  so:
+    operational-environment:
+      dmaap:
+        username: testuser
+        password: VjR5NDcxSzA=
+        host: http://c1.vm1.mso.simpledemo.onap.org:28090
+        auth: 51EA5414022D7BE536E7516C4D1A6361416921849B72C0D6FC1C7F262FD9F2BBC2AD124190A332D9845A188AD80955567A4F975C84C221EEA8243BFD92FFE6896CDD1EA16ADD34E1E3D47D4A
+      publisher:
+        topic: com.att.ecomp.mso.operationalEnvironmentEvent
+  health:
+    auth: Basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
+    endpoints:
+      - subsystem: apih
+        uri: http://bpmn-infra:8081
+      - subsystem: catalogdb
+        uri: http://catalog-db-adapter:8082
+
+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
+  jpa:
+      show-sql: true
+      hibernate:
+        dialect: org.hibernate.dialect.MySQL5Dialect
+        ddl-auto: validate
+        naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy
+        enable-lazy-load-no-trans: true
+  jersey:
+    type: filter
+
+  security:
+    usercredentials:
+    -
+      username: sitecontrol
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: SiteControl-Client
+    -
+      username: gui
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: GUI-Client
+    -
+      username: infraportal
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: InfraPortal-Client
+    -
+      username: InfraPortalClient
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: InfraPortal-Client
+    -
+      username: bpel
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: BPEL-Client
+    -
+      username: mso_admin
+      password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+      role: ACTUATOR
+
+request:
+  datasource:
+    hikari:
+      jdbcUrl: jdbc:mariadb://mariadb:3306/requestdb
+      username: requestuser
+      password: request123
+      driver-class-name: org.mariadb.jdbc.Driver
+      pool-name: reqdb-pool
+      registerMbeans: true
+org:
+  onap:
+    so:
+      cloud-owner: CloudOwner
+      adapters:
+        network:
+          encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
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 66e3b20..f2494fb 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
@@ -261,7 +261,7 @@
 so:
   vnfm:
     adapter:
-      url: http://vnfm-adapter:9092/so/vnfm-adapter/v1/
+      url: https://so-vnfm-adapter:9092/so/vnfm-adapter/v1/
       auth: Basic dm5mbTpwYXNzd29yZDEk
 
 appc:
@@ -326,3 +326,12 @@
   onap:
     so:
       cloud-owner: CloudOwner
+rest:
+  http:
+    client:
+      configuration:
+        ssl:
+          keyStore: classpath:org.onap.so.p12
+          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/so-vnfm-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
new file mode 100644
index 0000000..bb71512
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/override-files/so-vnfm-adapter/onapheat/override.yaml
@@ -0,0 +1,30 @@
+server:
+    port: 9092
+    tomcat:
+        max-threads: 4
+    ssl:
+        key-alias: so@so.onap.org
+        key--store-password: 'ywsqCy:EEo#j}HJHM7z^Rk[L'
+        key-store: classpath:so-vnfm-adapter.p12
+        key-store-type: PKCS12
+        client-auth: need
+
+http:
+  client:
+    ssl:
+      trust-store: classpath:org.onap.so.trust.jks
+      trust-store-password: ',sx#.C*W)]wVgJC6ccFHI#:H'
+aai:
+  auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
+  version: v15
+  endpoint:  https://aai-simulator:9993
+mso:
+  key: 07a7159d3bf51a0e53be7a8f89699be7
+sdc:
+  username: mso
+  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
+  key: 566B754875657232314F5548556D3665
+  endpoint: http://sdc-simulator:9991/
+  toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
+vnfmadapter:
+  endpoint: https://so-vnfm-adapter:9092
diff --git a/plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml
deleted file mode 100644
index e2f8cc1..0000000
--- a/plans/so/integration-etsi-testing/config/override-files/vnfm-adapter/onapheat/override.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-server:
-    port: 9092
-    tomcat:
-        max-threads: 4
-ssl-enable: false
-aai:
-    auth: 221187EFA3AD4E33600DE0488F287099934CE65C3D0697BCECC00BB58E784E07CD74A24581DC31DBC086FF63DF116378776E9BE3D1325885
-    version: v15
-    endpoint:  https://aai-simulator:9993
-mso:
-      key: 07a7159d3bf51a0e53be7a8f89699be7
-sdc:
-  username: mso
-  password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
-  key: 566B754875657232314F5548556D3665
-  endpoint: http://sdc-simulator:9991/
-  toscametapath: Artifacts/Deployment/OTHER/TOSCA.meta
-vnfmadapter:
-  endpoint: http://vnfm-adapter:9092
\ No newline at end of file
diff --git a/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml b/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
new file mode 100644
index 0000000..89e3969
--- /dev/null
+++ b/plans/so/integration-etsi-testing/config/override-files/vnfm-simulator/onapheat/override.yaml
@@ -0,0 +1,56 @@
+spring:
+ h2:
+  console:
+  enabled: true
+  path: console
+ datasource:
+  url: jdbc:h2:mem:testdb;DB_CLOSE_ON_EXIT=FALSE
+  username: admin
+  password: admin
+ http:
+  converters:
+   preferred-json-mapper: gson
+ security:
+  usercredentials:
+   - username: vnfm
+     password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
+     role: BPEL-Client
+
+server:
+  port: 9093
+  tomcat:
+    max-threads: 50
+  ssl:
+    client-auth: need
+    key-alias: so@so.onap.org
+    key--store-password: '7Em3&j4.19xYiMelhD5?xbQ.'
+    key-store: classpath:so-vnfm-simulator.p12
+    key-store-type: PKCS12
+  request:
+    grant:
+      auth: twowaytls
+  dns:
+    name: so-vnfm-simulator
+
+vnfds:
+  vnfdlist:
+  -  vnfdid: 1
+     vnfclist:
+     - vnfcid: VNFC1
+       resourceTemplateId: vnfd1_vnfc1
+       vduId: vnfd1_vduForVnfc1
+       type: COMPUTE
+     - vnfcid: VNFC2
+       resourceTemplateId: vnfd1_vnfc2
+       vduId: vnfd1_vduForVnfc2
+       type: COMPUTE
+  -  vnfdid: 2
+     vnfclist:
+     - vnfcid: VNFC3
+       resourceTemplateId: vnfd2_vnfc3
+       vduId: vnfd2_vduForVnfc3
+       type: COMPUTE
+     - vnfcid: VNFC4
+       resourceTemplateId: vnfd2_vnfc4
+       vduId: vnfd2_vduForVnfc4
+       type: COMPUTE
diff --git a/plans/so/integration-etsi-testing/docker-compose.yml b/plans/so/integration-etsi-testing/docker-compose.yml
index ae20b0d..0dc1de0 100644
--- a/plans/so/integration-etsi-testing/docker-compose.yml
+++ b/plans/so/integration-etsi-testing/docker-compose.yml
@@ -199,7 +199,7 @@
       - "8080:8080"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${TEST_LAB_DIR}/volumes/so/config/api-handler-infra/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/api-handler-infra/onapheat:/app/config
     environment:
       - APP=api-handler-infra
       - JVM_ARGS=-Xms64m -Xmx512m
@@ -245,18 +245,18 @@
       - catalog-db-adapter
       - request-db-adapter
 ################################################################################
-  vnfm-adapter:
+  so-vnfm-adapter:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-adapter:${TAG}
     ports:
       - "9092:9092"
     volumes:
       - ${TEST_LAB_DIR}/volumes/so/ca-certificates/onapheat:/app/ca-certificates
-      - ${CONFIG_DIR_PATH}/override-files/vnfm-adapter/onapheat:/app/config
+      - ${CONFIG_DIR_PATH}/override-files/so-vnfm-adapter/onapheat:/app/config
     environment:
-    - APP=vnfm-adapter
+    - APP=so-vnfm-adapter
     - JVM_ARGS=-Xms64m -Xmx512m
     hostname:
-      vnfm-adapter-test
+      so-vnfm-adapter
     depends_on:
       - request-db-adapter
     logging:
@@ -284,7 +284,7 @@
       sdc-simulator
     depends_on:
       - mariadb
-      - vnfm-adapter
+      - so-vnfm-adapter
     logging:
       driver: "json-file"
       options:
@@ -302,25 +302,27 @@
       aai-simulator
     depends_on:
       - mariadb
-      - vnfm-adapter
+      - so-vnfm-adapter
     logging:
       driver: "json-file"
       options:
         max-size: "30m"
         max-file: "5"
 ################################################################################
-  vnfm-simulator:
+  so-vnfm-simulator:
     image: ${NEXUS_DOCKER_REPO_MSO}/onap/so/vnfm-simulator:${TAG}
     ports:
       - "9093:9093"
+    volumes:
+      - ${CONFIG_DIR_PATH}/override-files/vnfm-simulator/onapheat:/app/config
     environment:
       - APP=VNFM-SIMULATOR
       - JVM_ARGS=-Xms64m -Xmx512m
     hostname:
-      vnfm-simulator
+      so-vnfm-simulator
     depends_on:
       - mariadb
-      - vnfm-adapter
+      - so-vnfm-adapter
     logging:
       driver: "json-file"
       options:
@@ -340,7 +342,7 @@
       - CATALOG_DB=catalogdb
     depends_on:
       - mariadb
-      - vnfm-adapter
+      - so-vnfm-adapter
     command:
       - "/config/apply-workarounds.sh"
 #################################################################################
@@ -355,7 +357,7 @@
       sdnc-simulator
     depends_on:
       - mariadb
-      - vnfm-adapter
+      - so-vnfm-adapter
     logging:
       driver: "json-file"
       options:
@@ -376,6 +378,6 @@
       - TIMEOUT_IN_SECONDS=300 #5 mins
     depends_on:
       - aai-simulator
-    command: 
+    command:
         - "/config/populate-aai-simulator.sh"
 ################################################################################