diff --git a/smp-docker/compose/weblogic-oracle/docker-compose.yml b/smp-docker/compose/weblogic-oracle/docker-compose.yml
index 6f4f6b51f0b46dcda38071c14dc54afd27e9a482..817f4c64fe684addb6bd444df6a83150827aea28 100644
--- a/smp-docker/compose/weblogic-oracle/docker-compose.yml
+++ b/smp-docker/compose/weblogic-oracle/docker-compose.yml
@@ -3,26 +3,28 @@ services:
   database:
     image: smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION}
     container_name: smp_oracle_db
-    hostname: wlsadmin
+    hostname: smp-database.local
     environment:
       - ORACLE_CHARACTERSET=AL32UTF8 # set database encoding
-      - NLS_LANG=.AL32UTF8  # set sqlplus encoding for stating up scripts
+      - NLS_LANG=.AL32UTF8  # set sqlplus encoding for starting up scripts
     volumes:
       - ./properties/db-scripts:/docker-entrypoint-initdb.d/startup  # init script.
       - ./status-folder:/u01/status/
     ports:
       - 1921:1521
     shm_size: '1gb'
+
   weblogic:
     depends_on:
       - database
 #    command: [bash, -c, "for i in `seq 10`; do timeout 1  bash -c '</dev/tcp/database/1521'; if [ $$? -eq 0 ] ; then break;fi;sleep 1;  done;"]
     command: [bash, -c, "for i in `seq 150`; do timeout 1  bash -c 'echo \" $$(ls /u01/status/)\"'; if [ -f '/u01/status/database.status' ] && [ \"$$( cat /u01/status/database.status )\" == 'DATABASE IS READY TO USE!' ] ; then break;fi; echo \"$$i. Wait for database!\"; sleep 10;  done;   /u01/oracle/startAdminServer.sh"]
     image:  smp-weblogic-122:${SMP_VERSION}
-    container_name: wls-smp   
-    hostname: wlsadmin
+    container_name: smp-wls-admin
+    hostname: smp-wls-admin
     environment:
-      JAVA_OPTIONS: "-Dweblogic.webservice.i18n.charset=utf-8"
+      - MANAGED_SERV_NAME=smp-node
+      - JAVA_OPTIONS="-Dweblogic.webservice.i18n.charset=utf-8"
     volumes:
       - ./properties/weblogic:/u01/oracle/properties
       - ./status-folder:/u01/status/
diff --git a/smp-docker/compose/weblogic-oracle/properties/db-scripts/01_create_user.sql b/smp-docker/compose/weblogic-oracle/properties/db-scripts/01_create_user.sql
deleted file mode 100644
index 6cdf900b67efa3426a48405ffdb0bb50e26b19e2..0000000000000000000000000000000000000000
--- a/smp-docker/compose/weblogic-oracle/properties/db-scripts/01_create_user.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-
-CREATE USER smp IDENTIFIED BY "test" DEFAULT TABLESPACE users QUOTA UNLIMITED ON users; 
-GRANT CREATE SESSION TO smp;
-GRANT CREATE TABLE TO smp;
-GRANT CREATE VIEW TO smp;
-GRANT CREATE SEQUENCE TO smp;
-GRANT SELECT ON PENDING_TRANS$ TO smp;
-
diff --git a/smp-docker/compose/weblogic-oracle/properties/weblogic/security.properties b/smp-docker/compose/weblogic-oracle/properties/weblogic/security.properties
deleted file mode 100644
index 80e8e77e701b87183866132d30b9415d2e994c67..0000000000000000000000000000000000000000
--- a/smp-docker/compose/weblogic-oracle/properties/weblogic/security.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-username=weblogic
-password=Weblogic1
-JAVA_OPTIONS=-Dweblogic.StdoutDebugEnabled=false
-
diff --git a/smp-docker/compose/weblogic-oracle/runCompose.sh b/smp-docker/compose/weblogic-oracle/runCompose.sh
index df4be843100029cd5871cf5a8fbbe23b3edf71af..9f14f2ff3ef6263e1fbd1317a48f46fcc8f9dcf6 100755
--- a/smp-docker/compose/weblogic-oracle/runCompose.sh
+++ b/smp-docker/compose/weblogic-oracle/runCompose.sh
@@ -19,9 +19,7 @@ ORA_SERVICE="xe"
 
 SMP_DB_USERNAME=smp;
 SMP_DB_PASSWORD=test;
-
-# clear volume and containers - to run  restart from strach 
-
+SMP_DB_SCRIPTS=./properties/db-scripts
 
 # READ arguments
 while getopts i:v: option
@@ -47,7 +45,8 @@ echo "Working Directory: ${WORKING_DIR}"
 echo "*************************************************************************"
 cd "$WORKING_DIR"
 
-
+echo "Create folder (if not exist) for database scripts ${SMP_DB_SCRIPTS}"
+[ -d  ${SMP_DB_SCRIPTS}  ] || mkdir -p "${SMP_DB_SCRIPTS}"
 
 
 function createDatabaseSchemaForUser() {
@@ -77,14 +76,11 @@ function clearOldContainers {
   docker volume rm "${PREFIX}_shared-status-folder"
 }
 
-
-
-
-createDatabaseSchemaForUser $SMP_DB_USERNAME $SMP_DB_PASSWORD ./properties/db-scripts/01_create_user.sql
+createDatabaseSchemaForUser $SMP_DB_USERNAME $SMP_DB_PASSWORD "${SMP_DB_SCRIPTS}/01_create_user.sql"
 
 # create  database init script from 
-echo "CONNECT smp/test@//localhost:1521/${ORA_SERVICE};" > ./properties/db-scripts/02_oracle10g.sql
-cat  "${SMP_INIT_DATABASE}" >> ./properties/db-scripts/02_oracle10g.sql
+echo "CONNECT ${SMP_DB_USERNAME}/${SMP_DB_PASSWORD}@//localhost:1521/${ORA_SERVICE};" > "${SMP_DB_SCRIPTS}/02_oracle10g.sql"
+cat  "${SMP_INIT_DATABASE}" >> "${SMP_DB_SCRIPTS}/02_oracle10g.sql"
 
 
 
@@ -95,8 +91,8 @@ if [ ! -f "${SMP_INIT_DATABASE_DATA}" ]
   exit 1;
 else
   # copy artefact to docker build folder
-  echo "CONNECT smp/test@//localhost:1521/${ORA_SERVICE};" > ./properties/db-scripts/03_oracle10g-data.sql
-  cat  "${SMP_INIT_DATABASE_DATA}" >> ./properties/db-scripts/03_oracle10g-data.sql
+  echo "CONNECT ${SMP_DB_USERNAME}/${SMP_DB_PASSWORD}@//localhost:1521/${ORA_SERVICE};" > "${SMP_DB_SCRIPTS}/03_oracle10g-data.sql"
+  cat  "${SMP_INIT_DATABASE_DATA}" >>  "${SMP_DB_SCRIPTS}/03_oracle10g-data.sql"
 fi
 
 
diff --git a/smp-docker/images/build-docker-images.sh b/smp-docker/images/build-docker-images.sh
index 6f0a43b2ea860f299349e2cbf6d7b9c6fedc3741..8ad17dc1a98d7ea536615017e73979153ffaef1d 100755
--- a/smp-docker/images/build-docker-images.sh
+++ b/smp-docker/images/build-docker-images.sh
@@ -177,21 +177,21 @@ buildImages() {
   # build docker image for oracle database
   # -----------------------------------------------------------------------------
   # oracle 1.2.0.2-xe (https://github.com/oracle/docker-images/tree/master/OracleDatabase/SingleInstance/dockerfiles/11.2.0.2)
-  docker build -f ./oracle/oracle-db-${ORA_VERSION}/${ORACLE_DOCKERFILE} -t "smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION}" --build-arg DB_EDITION=${ORA_EDITION} ./oracle/oracle-db-${ORA_VERSION}/
+  #docker build -f ./oracle/oracle-db-${ORA_VERSION}/${ORACLE_DOCKERFILE} -t "smp-oradb-${ORA_VERSION}-${ORA_EDITION}:${SMP_VERSION}" --build-arg DB_EDITION=${ORA_EDITION} ./oracle/oracle-db-${ORA_VERSION}/
 
   # -----------------------------------------------------------------------------
   # build docker image for oracle database
   # -----------------------------------------------------------------------------
   # create docker OS image with java (https://github.com/oracle/docker-images/tree/master/OracleJava/java-8)
-  docker build -t oracle/serverjre:8 ./oracle/OracleJava/java-8/
+  #docker build -t oracle/serverjre:8 ./oracle/OracleJava/java-8/
 
   # create weblogic basic (https://github.com/oracle/docker-images/tree/master/OracleWebLogic/dockerfiles/12.2.1.3)
-  docker build -f ./oracle/weblogic-12.2.1.4/Dockerfile.developer -t oracle/weblogic:12.2.1.4-developer ./oracle/weblogic-12.2.1.4/
+  #docker build -f ./oracle/weblogic-12.2.1.4/Dockerfile.developer -t oracle/weblogic:12.2.1.4-developer ./oracle/weblogic-12.2.1.4/
 
   # build SMP deployment.
   docker build -t "smp-weblogic-122:${SMP_VERSION}" ./weblogic-12.2-smp/ --build-arg SMP_VERSION="$SMP_VERSION"
   # build tomcat mysql image  deployment.
-  docker build -t "smp-sml-tomcat-mysql:${SMP_VERSION}" ./tomcat-mysql-smp-sml/ --build-arg SMP_VERSION=${SMP_VERSION}
+  #docker build -t "smp-sml-tomcat-mysql:${SMP_VERSION}" ./tomcat-mysql-smp-sml/ --build-arg SMP_VERSION=${SMP_VERSION}
 }
 
 function pushImageToDockerhub() {
diff --git a/smp-docker/images/weblogic-12.2-smp/Dockerfile b/smp-docker/images/weblogic-12.2-smp/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..6286fc1b948074f54e0af87afcad3fe2482090fe
--- /dev/null
+++ b/smp-docker/images/weblogic-12.2-smp/Dockerfile
@@ -0,0 +1,99 @@
+# LICENSE UPL 1.0
+#
+# Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
+#
+# ORACLE DOCKERFILES PROJECT
+# --------------------------
+# This Dockerfile extends the Oracle WebLogic image built under 12213-doma-home-in-image.
+#
+# It will deploy any package defined in APP_PKG_FILE.
+# into the DOMAIN_HOME with name defined in APP_NAME
+#
+# HOW TO BUILD THIS IMAGE
+# -----------------------
+# Run:
+#      $ docker build -t weblogic-smp .
+# 
+# create from base image FROM oracle/weblogic:12.2.1.4-developer
+# Please build oracle/weblogic:12.2.1.4-developer (smp-docker/images/oracle/weblogic-12.2.1.4) first
+# ---------------
+FROM oracle/weblogic:12.2.1.4-developer
+
+# Define variable
+ARG SMP_VERSION
+ARG WL_ADMIN_HOST="${WL_ADMIN_HOST:-localhost}"
+ARG CUSTOM_DOMAIN_NAME="${CUSTOM_DOMAIN_NAME:-domain1}"
+ARG CUSTOM_ADMIN_PORT="${CUSTOM_ADMIN_PORT:-7001}"
+ARG CUSTOM_ADMIN_HTTPS_PORT="${CUSTOM_ADMIN_HTTPS_PORT:-7002}"
+ARG CUSTOM_MANAGED_SERVER_PORT="${CUSTOM_MANAGED_SERVER_PORT:-8001}"
+ARG CUSTOM_DEBUG_PORT="${CUSTOM_DEBUG_PORT:-8453}"
+ARG CUSTOM_ADMIN_NAME="${CUSTOM_ADMIN_NAME:-admin-server}"
+ARG CUSTOM_ADMIN_HOST="${CUSTOM_ADMIN_HOST:-wlsadmin}"
+ARG CUSTOM_CLUSTER_NAME="${CUSTOM_CLUSTER_NAME:-DockerCluster}"
+ARG WL_SERVER_TLS_KEYSTORE_PASS="${WL_SERVER_TLS_KEYSTORE_PASS:-test123}"
+
+ENV APP_VERSION=$SMP_VERSION \
+    LC_ALL=en_US.UTF-8 \
+    LANG="en_US.UTF-8" \
+    LANGUAGE="en_US"  \
+    ORACLE_HOME=/u01/oracle \
+    PROPERTIES_FILE_DIR="${ORACLE_HOME}/properties" \
+    DOMAIN_NAME="${CUSTOM_DOMAIN_NAME}" \
+    DOMAIN_HOME="${ORACLE_HOME}/user_projects/domains/${CUSTOM_DOMAIN_NAME}" \
+    ADMIN_PORT="${CUSTOM_ADMIN_PORT}" \
+    ADMIN_HTTPS_PORT="${CUSTOM_ADMIN_HTTPS_PORT}" \
+    ADMIN_NAME="${CUSTOM_ADMIN_NAME}" \
+    ADMIN_HOST="${CUSTOM_ADMIN_HOST}" \
+    CLUSTER_NAME="${CUSTOM_CLUSTER_NAME}" \
+    MANAGED_SERVER_PORT="${CUSTOM_MANAGED_SERVER_PORT}" \
+    MANAGED_SERV_NAME="${MANAGED_SERV_NAME}" \
+     # set following build arguments also the environment arguments
+    WL_DEBUG_PORT="${WL_DEBUG_PORT}"  \
+    WL_ADMIN_NAME="${WL_ADMIN_NAME}"  \
+    WL_ADMIN_PORT="${WL_ADMIN_PORT}"  \
+    WL_ADMIN_HOST="${WL_ADMIN_HOST}"  \
+    WL_CLUSTER_NAME="${WL_CLUSTER_NAME}" \
+    ENABLE_JACOCO="${ENABLE_JACOCO}" \
+    # set path variable for script execution
+    PATH=$PATH:/u01/oracle/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:${DOMAIN_HOME}:${DOMAIN_HOME}/bin:/u01/oracle
+
+
+# Add files required to build this image
+COPY container-scripts/* ${ORACLE_HOME}/
+COPY container-scripts/init-scripts ${ORACLE_HOME}/init-scripts
+COPY artefacts/smp.war ${ORACLE_HOME}/
+COPY properties/docker-build/domain*.properties ${PROPERTIES_FILE_DIR}/
+#Create directory where domain will be written to
+USER root
+RUN chmod +xw ${ORACLE_HOME}/*.sh && \
+    chmod +xw ${ORACLE_HOME}/init-scripts/*.sh && \
+    chmod +xw ${ORACLE_HOME}/init-scripts/*.py && \
+    mkdir -p ${PROPERTIES_FILE_DIR} && \
+    chown -R oracle:oracle ${PROPERTIES_FILE_DIR} && \
+    mkdir -p $DOMAIN_HOME && \
+    chown -R oracle:oracle $DOMAIN_HOME && \
+    chmod -R a+xwr $DOMAIN_HOME
+
+
+# Configuration of WLS Domain
+#RUN /u01/oracle/createWLSDomain.sh && \
+#     echo ". $DOMAIN_HOME/bin/setDomainEnv.sh" >> /u01/oracle/.bashrc && \
+#     chmod -R a+x $DOMAIN_HOME/bin/*.sh  && \
+#     rm ${PROPERTIES_FILE_DIR}/*.properties
+
+# Expose ports for admin, managed server, and debug
+EXPOSE $ADMIN_PORT $CUSTOM_ADMIN_HTTPS_PORT $MANAGED_SERVER_PORT $DEBUG_PORT
+
+WORKDIR $DOMAIN_HOME
+
+
+
+#RUN /u01/oracle/deploySMPToDomain.sh && \
+#     wlst -loadProperties /u01/oracle/datasource.properties.oracle /u01/oracle/ds-deploy.py \
+     # set enforce-valid-basic-auth-credentials false to allow basic authentication for rest services
+#     && sed -i -e "s/<\/security-configuration>/  <enforce-valid-basic-auth-credentials>false<\/enforce-valid-basic-auth-credentials>\n<\/security-configuration>/g" "/u01/oracle/user_projects/domains/domain1/config/config.xml"
+    
+
+
+# Define default command to start bash.
+CMD ["startManagedServer.sh"]
diff --git a/smp-docker/images/weblogic-12.2-smp/README.md b/smp-docker/images/weblogic-12.2-smp/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..63dee32885e0c533bd2557238adea83e7b5b71ea
--- /dev/null
+++ b/smp-docker/images/weblogic-12.2-smp/README.md
@@ -0,0 +1,45 @@
+Example of Image with WLS Domain
+================================
+This Dockerfile extends the Oracle WebLogic image built under 12213-domain-home-in-image and deploy the sample application to the cluster.
+
+This sample deploys a simple, one-page web application contained in a ZIP archive. This archive needs to be built (one time only) before building the Docker image.
+
+    $ ./build-archive.sh
+
+# How to build and run
+To deploy an application to a domain where the domain home is inside the image you extend the image `12213-domain-home-in-image` and using WLST offline you deploy the sample application.  First make sure you have built sample WebLogic domain image inside **12213-domain-home-in-image**. Now to build this sample, run:
+
+        $ docker build --build-arg APPLICATION_NAME=sample --build-arg APPLICATION_PKG=archive.zip -t 12213-domain-with-app .
+
+# How to run the domain
+Follow the instructions in the sample `OracleWebLogic/samples/12213-domain-home-in-image` to define your domain properties in the domain.properties and domain-security.properties files.
+
+To start the containerized Administration Server, run:
+
+        $ docker run -d --name wlsadmin --hostname wlsadmin -p 7001:7001 \
+          -v <HOST DIRECTORY TO PROPERTIES FILE>/properties/docker-run:/u01/oracle/properties \
+         12213-domain-with-app 
+
+To start a containerized Managed Server (MS1) to self-register with the Administration Server above, run:
+
+        $ docker run -d --name MS1 --link wlsadmin:wlsadmin -p 8001:8001 \
+          -v <HOST DIRECTORY TO PROPERTIES FILE>/properties/docker-run:/u01/oracle/properties \
+          -e MANAGED_SERV_NAME=managed-server1 12213-domain-with-app startManagedServer.sh
+
+To start a second Managed Server (MS2), run:
+
+        $ docker run -d --name MS2 --link wlsadmin:wlsadmin -p 8002:8001 \
+          -v <HOST DIRECTORY TO PROPERTIES FILE>/properties/docker-run:/u01/oracle/properties \
+          -e MANAGED_SERV_NAME=managed-server2 12213-domain-with-app startManagedServer.sh
+
+
+Run the WLS Administration Console:
+
+In your browser, enter `https://localhost:7001/console`.
+
+Run the sample application:
+
+To access the sample application, in your browser enter `http://localhost:7001/sample`.
+
+# Copyright
+Copyright (c) 2019 Oracle and/or its affiliates. All rights reserved.
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/create-wls-domain.py b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/create-wls-domain.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/create-wls-domain.py
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/create-wls-domain.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/createWLSDomain.sh b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/createWLSDomain.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/createWLSDomain.sh
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/createWLSDomain.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/datasource.properties.oracle b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/datasource.properties.oracle
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/datasource.properties.oracle
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/datasource.properties.oracle
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/deploySMPToDomain.sh b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/deploySMPToDomain.sh
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/deploySMPToDomain.sh
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/ds-deploy.py b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/ds-deploy.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/ds-deploy.py
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/ds-deploy.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/functions/keystore.functions b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/functions/keystore.functions
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/functions/keystore.functions
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/functions/keystore.functions
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/shutdown-servers.py b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/shutdown-servers.py
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/shutdown-servers.py
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/shutdown-servers.py
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/smp-app-deploy.py b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/smp-app-deploy.py
similarity index 96%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/smp-app-deploy.py
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/smp-app-deploy.py
index 778ed668524964fbb2296297dfa0f10d36fdbcbd..5a77263a7d01b5325cab9c31b767fa096860da57 100644
--- a/smp-docker/images/weblogic-12.2-smp/container-scripts/smp-app-deploy.py
+++ b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/smp-app-deploy.py
@@ -13,7 +13,7 @@ import os
 # Deployment Information
 domainhome = os.environ.get('DOMAIN_HOME', '/u01/oracle/user_projects/domains/base_domain')
 admin_name = os.environ.get('ADMIN_NAME', 'AdminServer')
-appVersion    = os.environ.get('APP_VERSION', '4.0.0')
+appVersion    = os.environ.get('APP_VERSION', '4.2')
 appfilename    = os.environ.get('APP_FILE_NAME', 'smp')
 appname    = os.environ.get('APP_NAME', appfilename+'#'+appVersion)
 appfile    = os.environ.get('APP_FILE', 'smp.war')
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/wlst b/smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/wlst
similarity index 100%
rename from smp-docker/images/weblogic-12.2-smp/container-scripts/wlst
rename to smp-docker/images/weblogic-12.2-smp/container-scripts/init-scripts/wlst
diff --git a/smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh b/smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh
index 3960f760070b559973ac695ffc64ab1822f19e92..9fb0bf62b0621fbd6704387ef23ecfa8b2af06ac 100755
--- a/smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh
+++ b/smp-docker/images/weblogic-12.2-smp/container-scripts/startAdminServer.sh
@@ -7,6 +7,21 @@
 #Define DOMAIN_HOME
 echo "Domain Home is: " $DOMAIN_HOME
 
+
+function deploy_smp() {
+  echo "Deploy SMP"
+    /u01/oracle/createWLSDomain.sh
+    echo ". $DOMAIN_HOME/bin/setDomainEnv.sh" >> /u01/oracle/.bashrc
+    chmod -R a+x $DOMAIN_HOME/bin/*.sh
+    rm ${PROPERTIES_FILE_DIR}/*.properties
+
+    /u01/oracle/deploySMPToDomain.sh
+     wlst -loadProperties /u01/oracle/datasource.properties.oracle /u01/oracle/ds-deploy.py \
+    # set enforce-valid-basic-auth-credentials false to allow basic authentication for rest services
+     sed -i -e "s/<\/security-configuration>/  <enforce-valid-basic-auth-credentials>false<\/enforce-valid-basic-auth-credentials>\n<\/security-configuration>/g" "/u01/oracle/user_projects/domains/domain1/config/config.xml"
+
+}
+
 # If AdminServer.log does not exists, container is starting for 1st time
 # So it should start NM and also associate with AdminServer
 # Otherwise, only start NM (container restarted)
@@ -100,6 +115,15 @@ echo "username=${USER}" >> ${AS_SECURITY}/boot.properties
 echo "password=${PASS}" >> ${AS_SECURITY}/boot.properties
 ${DOMAIN_HOME}/bin/setDomainEnv.sh
 
+
+# initialize docker image
+cd ~ || exit 13
+if [ ! -f ".initialized" ]; then
+  deploy_smp
+  touch ~/.initialized
+fi
+
+
 #echo 'Running Admin Server in background'
 ${DOMAIN_HOME}/bin/startWebLogic.sh &
 
diff --git a/smp-webapp/src/test/resources/webapp_integration_test_data.sql b/smp-webapp/src/test/resources/webapp_integration_test_data.sql
index 69dffb3513d99c700803269af63cf90d080ba7f9..165ae31d0ab1dbc3ad585b69545cdad6a0692d96 100644
--- a/smp-webapp/src/test/resources/webapp_integration_test_data.sql
+++ b/smp-webapp/src/test/resources/webapp_integration_test_data.sql
@@ -23,7 +23,7 @@ insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VAL
 insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('bdmsl.integration.enabled', 'false',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
 insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('smp.http.forwarded.headers.enabled', 'true',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
 insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('smp.automation.authentication.external.tls.clientCert.enabled', 'true',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
-insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('identifiersBehaviour.scheme.mandatory', 'false',CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
+insert into SMP_CONFIGURATION (PROPERTY, VALUE, CREATED_ON, LAST_UPDATED_ON) VALUES ('identifiersBehaviour.scheme.mandatory', 'false', CURRENT_TIMESTAMP(), CURRENT_TIMESTAMP());
 
 
 insert into SMP_USER (ID, USERNAME, PASSWORD, ACCESS_TOKEN_ID, ACCESS_TOKEN, ROLE, ACTIVE, CREATED_ON, LAST_UPDATED_ON) values (1, 'smp_admin', '$2a$06$AXSSUDJlpzzq/gPZb7eIBeb8Mi0.PTKqDjzujZH.bWPwj5.ePEInW','pat_smp_admin', '$2a$10$bP44Ij/mE6U6OUo/QrKCvOb7ouSClKnyE0Ak6t58BLob9OTI534IO', 'SMP_ADMIN', 1,CURRENT_TIMESTAMP(),CURRENT_TIMESTAMP());