diff --git a/grabdish/addAndSourcePropertiesInBashrc.sh b/grabdish/addAndSourcePropertiesInBashrc.sh
deleted file mode 100755
index 9f54e47b8..000000000
--- a/grabdish/addAndSourcePropertiesInBashrc.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-# we put a placeholder msdataworkshopjaegeraddress.txt as we wont have the Jaeger LB address until later/setJaegerAddress.sh step
-touch workingdir/msdataworkshopjaegeraddress.txt
-echo "export MSDATAWORKSHOP_LOCATION=~/microservices-datadriven/grabdish/" >> ~/.bashrc
-echo 'source $MSDATAWORKSHOP_LOCATION/msdataworkshop.properties' >> ~/.bashrc
-source ~/.bashrc
diff --git a/grabdish/addOCIRInfo.sh b/grabdish/addOCIRInfo.sh
deleted file mode 100755
index 232c579df..000000000
--- a/grabdish/addOCIRInfo.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-if [[ $1 == "" ]]
-then
-  echo MSDATAWORKSHOP_OCIR_NAMESPACE not provided
-  echo Required arguments are MSDATAWORKSHOP_OCIR_NAMESPACE and MSDATAWORKSHOP_REPOS_NAME.
-  echo Usage example : ./addOCIRInfo.sh axkcsk2aiatb msdataworkshop.user1/msdataworkshop
-  exit
-fi
-
-if [[ $2 == "" ]]
-then
-  echo MSDATAWORKSHOP_REPOS_NAME not provided
-  echo Required arguments are MSDATAWORKSHOP_OCIR_NAMESPACE and MSDATAWORKSHOP_REPOS_NAME.
-  echo Usage example : ./addOCIRInfo.sh axkcsk2aiatb msdataworkshop.user1/msdataworkshop
-  exit
-fi
-
-export WORKINGDIR=workingdir
-echo WORKINGDIR = $WORKINGDIR
-
-export MSDATAWORKSHOP_OCIR_NAMESPACE=$1
-echo $MSDATAWORKSHOP_OCIR_NAMESPACE | tr -d '"' > $WORKINGDIR/msdataworkshopocirnamespace.txt
-echo MSDATAWORKSHOP_OCIR_NAMESPACE... $MSDATAWORKSHOP_OCIR_NAMESPACE
-
-export MSDATAWORKSHOP_REPOS_NAME=$2
-echo $MSDATAWORKSHOP_REPOS_NAME | tr -d '"' > $WORKINGDIR/msdataworkshopreposname.txt
-echo MSDATAWORKSHOP_REPOS_NAME... $MSDATAWORKSHOP_REPOS_NAME
\ No newline at end of file
diff --git a/grabdish/admin-helidon/Dockerfile b/grabdish/admin-helidon/Dockerfile
new file mode 100644
index 000000000..d08f3798d
--- /dev/null
+++ b/grabdish/admin-helidon/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar
\ No newline at end of file
diff --git a/grabdish/admin-helidon/build.sh b/grabdish/admin-helidon/build.sh
index 35483b1c8..11a6e00d8 100755
--- a/grabdish/admin-helidon/build.sh
+++ b/grabdish/admin-helidon/build.sh
@@ -7,6 +7,8 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=admin-helidon
 IMAGE_VERSION=0.1
 
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
 if [ -z "DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
@@ -14,12 +16,10 @@ fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-mvn install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
-if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
-    exit 1
-fi
 docker push $IMAGE
 if [  $? -eq 0 ]; then
     docker rmi ${IMAGE}
diff --git a/grabdish/admin-helidon/deploy.sh b/grabdish/admin-helidon/deploy.sh
index 1d4557a29..09f670b48 100755
--- a/grabdish/admin-helidon/deploy.sh
+++ b/grabdish/admin-helidon/deploy.sh
@@ -4,6 +4,12 @@
 
 SCRIPT_DIR=$(dirname $0)
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export ORDER_PDB_NAME="$(state_get ORDER_DB_NAME)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create admin-helidon deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
diff --git a/grabdish/admin-helidon/pom.xml b/grabdish/admin-helidon/pom.xml
index a9b12882a..8c00423fa 100755
--- a/grabdish/admin-helidon/pom.xml
+++ b/grabdish/admin-helidon/pom.xml
@@ -13,13 +13,14 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>admin-helidon</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>admin-helidon</name>
-    <description>ATP OSB UCP Helidon Microprofile Microservices Demo</description>
+    <name>${project.artifactId}</name>
+    <description>Helidon Microprofile Microservices Demo</description>
 
     <parent>
-        <groupId>io.helidon</groupId>
-        <artifactId>helidon-project</artifactId>
+        <groupId>io.helidon.applications</groupId>
+        <artifactId>helidon-mp</artifactId>
         <version>2.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -36,27 +37,26 @@
             </resource>
         </resources>
         <plugins>
-
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
-                    <baseImage>openjdk:11</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>0.1</imageTag>
-                    </imageTags>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -103,35 +103,11 @@
             <artifactId>helidon-integrations-cdi-datasource-ucp</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>io.helidon.integrations.cdi</groupId>-->
-            <!--<artifactId>helidon-integrations-cdi-datasource-hikaricp</artifactId>-->
-            <!--<scope>runtime</scope>-->
-        <!--</dependency>-->
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ojdbc10</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
         <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_core</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_cert</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>oraclepki</artifactId>
-            <version>19.3.0.0</version>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8-production</artifactId>
+            <version>19.8.0.0</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.messaging</groupId>
diff --git a/grabdish/admin-helidon/setupForDBLinksInCloud.sh b/grabdish/admin-helidon/setupForDBLinksInCloud.sh
index 2d064b713..67a281108 100755
--- a/grabdish/admin-helidon/setupForDBLinksInCloud.sh
+++ b/grabdish/admin-helidon/setupForDBLinksInCloud.sh
@@ -7,22 +7,28 @@
 #echo list existing buckets...
 #oci os bucket list --compartment-id $OCI_COMPARTMENT_ID
 
-echo create msdataworkshop bucket ...ignore BucketAlreadyExists exception if this is not the first time running the script...
-oci os bucket create --name msdataworkshop --compartment-id $OCI_COMPARTMENT_ID
+#cho create msdataworkshop bucket ...ignore BucketAlreadyExists exception if this is not the first time running the script...
+#oci os bucket create --name msdataworkshop --compartment-id $OCI_COMPARTMENT_ID
 
 #echo list existing buckets again...
 #oci os bucket list --compartment-id $OCI_COMPARTMENT_ID
 
-echo delete cwallet.sso in bucket ...ignore ObjectNotFound exception if this is the first time running the script...
+#echo delete cwallet.sso in bucket ...ignore ObjectNotFound exception if this is the first time running the script...
 # Will be prompted "Are you sure you want to delete this resource? [y/N]"
 
-echo put cwallet.sso in bucket ...select "y" when asked to overwrite
-oci os object put --bucket-name msdataworkshop --file $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/cwallet.sso
+#echo put cwallet.sso in bucket ...select "y" when asked to overwrite
+#oci os object put --bucket-name msdataworkshop --file $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/cwallet.sso
 
-echo create link to cwallet.sso in objectstorage, save, export, and echo value..
-oci os preauth-request create --access-type ObjectRead --bucket-name msdataworkshop --name msdataworkshopwallet --time-expires 2021-12-21 --object-name cwallet.sso | jq --raw-output '.data | .["access-uri"] ' > preauthlink.txt
-export cwalletobjecturi=$(cat preauthlink.txt)
-export cwalletobjecturi=https://objectstorage.${OCI_REGION}.oraclecloud.com${cwalletobjecturi}
+#echo create link to cwallet.sso in objectstorage, save, export, and echo value..
+#oci os preauth-request create --access-type ObjectRead --bucket-name msdataworkshop --name msdataworkshopwallet --time-expires 2021-12-21 --object-name cwallet.sso | jq --raw-output '.data | .["access-uri"] ' > preauthlink.txt
+#export cwalletobjecturi=$(cat preauthlink.txt)
+
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export ORDER_PDB_NAME="$(state_get ORDER_DB_NAME)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+
+
+export cwalletobjecturi=$(state_get CWALLET_SSO_AUTH_URL)
 echo updating admin-helidon-deployment-${CURRENTTIME}.yaml with cwalletobjecturi $cwalletobjecturi
 sed -i "s|%cwalletobjecturi%|${cwalletobjecturi}|g" admin-helidon-deployment-${CURRENTTIME}.yaml
 
@@ -31,7 +37,7 @@ echo cwalletobjecturi is created and added to admin-helidon-deployment-${CURRENT
 echo adding other values in admin-helidon-deployment-${CURRENTTIME}.yaml as parsed from tnsnames.ora s
 
 #echo ____________________________________________________
-export orderdb_tptnsentry=$(grep -i "^${ORDER_PDB_NAME}_tp " $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/tnsnames.ora)
+export orderdb_tptnsentry=$(grep -i "^${ORDER_PDB_NAME}_tp " $GRABDISH_HOME/atp-secrets-setup/wallet/tnsnames.ora)
 #echo $ORDER_PDB_NAME tp entry... $orderdb_tptnsentry
 echo ____________________________________________________
 # for each variable, string off begin (based on identifier)
@@ -73,7 +79,7 @@ echo $orderssl_server_cert_dn
 
 
 #echo ____________________________________________________
-export inventorydb_tptnsentry=$(grep -i "^${INVENTORY_PDB_NAME}_tp " $MSDATAWORKSHOP_LOCATION/atp-secrets-setup/wallet/tnsnames.ora)
+export inventorydb_tptnsentry=$(grep -i "^${INVENTORY_PDB_NAME}_tp " $GRABDISH_HOME/atp-secrets-setup/wallet/tnsnames.ora)
 #echo $INVENTORY_PDB_NAME tp entry... $inventorydb_tptnsentry
 echo ____________________________________________________
 # for each variable, string off begin (based on identifier)
diff --git a/grabdish/artillery/test.sh b/grabdish/artillery/test.sh
old mode 100644
new mode 100755
diff --git a/grabdish/atp-secrets-setup/createAll.sh b/grabdish/atp-secrets-setup/createAll.sh
index e9db4f398..ea074d1d7 100755
--- a/grabdish/atp-secrets-setup/createAll.sh
+++ b/grabdish/atp-secrets-setup/createAll.sh
@@ -10,7 +10,7 @@ then
   exit
 fi
 
-source ../msdataworkshop.properties
+#source ../msdataworkshop.properties
 export SCRIPT_DIR=$(dirname $0)
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated yamls
@@ -38,7 +38,7 @@ export inventorypdb_README=$(cat README | base64 | tr -d '\n\r' | base64 | tr -d
 export inventorypdb_sqlnet_ora=$(cat sqlnet.ora | base64 | tr -d '\n\r' | base64 | tr -d '\n\r')
 export inventorypdb_tnsnames_ora=$(cat tnsnames.ora | base64 | tr -d '\n\r' | base64 | tr -d '\n\r')
 export inventorypdb_truststore_jks=$(cat truststore.jks | base64 | tr -d '\n\r' | base64 | tr -d '\n\r')
-
+rm -rf wallet
 cd ../
 echo "replace values in order yaml files (files are suffixed with ${CURRENTTIME})..."
 eval "cat <<EOF
diff --git a/grabdish/build.sh b/grabdish/build.sh
deleted file mode 100755
index c11b3b526..000000000
--- a/grabdish/build.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-echo ________________________________________
-echo building and pushing frontend-helidon...
-echo ________________________________________
-cd frontend-helidon
-./build.sh
-cd ../
-
-echo maven install soda jar...
-cd lib
-mvn install:install-file -Dfile=orajsoda-1.1.0.jar -DgroupId=com.oracle \
-    -DartifactId=orajsoda -Dversion=1.1.0 -Dpackaging=jar
-cd ../
-
-echo ________________________________________
-echo building and pushing admin-helidon...
-echo ________________________________________
-cd admin-helidon
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing order-helidon...
-echo ________________________________________
-cd order-helidon
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing supplier-helidon-se...
-echo ________________________________________
-cd supplier-helidon-se
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing inventory-helidon...
-echo ________________________________________
-cd inventory-helidon
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing inventory-python...
-echo ________________________________________
-cd inventory-python
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing inventory-nodejs...
-echo ________________________________________
-cd inventory-nodejs
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing inventory-helidon-se...
-echo ________________________________________
-cd inventory-helidon-se
-./build.sh
-cd ../
-
-echo ________________________________________
-echo building and pushing inventory-dotnet...
-echo ________________________________________
-cd inventory-dotnet
-./build.sh
-cd ../
-
-echo ________________________________________
-echo ...finished
-echo ________________________________________
diff --git a/grabdish/createATPPDBs.sh b/grabdish/createATPPDBs.sh
deleted file mode 100755
index 5a21c9272..000000000
--- a/grabdish/createATPPDBs.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-echo ________________________________________
-echo creating ATP PDBs ...
-echo ________________________________________
-
-export WORKINGDIR=workingdir
-echo WORKINGDIR = $WORKINGDIR
-
-export MSDATAWORKSHOP_COMPARTMENT_ID=$(cat $WORKINGDIR/msdataworkshopcompartmentid.txt)
-echo console created compartment ...
-echo MSDATAWORKSHOP_COMPARTMENT_ID... $MSDATAWORKSHOP_COMPARTMENT_ID
-
-if [[ $1 == "" ]]
-then
-  echo Required arguments not provided
-  echo Required arguments are MSDATAWORKSHOP_ADMIN_PW_SECRET_OCID and FRONTEND_AUTH_PW_SECRET_OCID
-  echo Usage example :  ./createATPPDBs.sh ocid1.vaultsecret.oc1.phx.DBADMINSECRETOCIDd3ejhlewv3wieyd5q ocid1.vaultsecret.oc1.phx.FRONTENDAUTHSECRETOCIDd3ejhlewv3wieyd5q
-  exit
-fi
-
-if [[ $2 == "" ]]
-then
-  echo Required arguments not provided
-  echo Required arguments are MSDATAWORKSHOP_ADMIN_PW_SECRET_OCID and FRONTEND_AUTH_PW_SECRET_OCID
-  echo Usage example :  ./createATPPDBs.sh ocid1.vaultsecret.oc1.phx.DBADMINSECRETOCIDd3ejhlewv3wieyd5q ocid1.vaultsecret.oc1.phx.FRONTENDAUTHSECRETOCIDd3ejhlewv3wieyd5q
-  exit
-fi
-
-echo "" > $WORKINGDIR/msdataworkshopvaultsecretocid.txt
-
-if [[ $3 == "true" || $3 == "TRUE" ]]
-then
-  echo DB secret will be retried by microservices directly from OCI Vault
-  echo $1 > $WORKINGDIR/msdataworkshopvaultsecretocid.txt
-fi
-
-PASSWORDENCODED=`oci secrets secret-bundle get --secret-id $1 --query "data.\"secret-bundle-content\".content" --raw-output`
-PASSWORD=`echo $PASSWORDENCODED | base64 --decode`
-umask 177
-cat >pw <<!
-{ "adminPassword": "$PASSWORD" }
-!
-echo create order PDB...
-oci db autonomous-database create --compartment-id $MSDATAWORKSHOP_COMPARTMENT_ID --cpu-core-count 1 --data-storage-size-in-tbs 1 --db-name ORDERDB --display-name ORDERDB --from-json file://pw | jq --raw-output '.data | .["id"] '> $WORKINGDIR/msdataworkshoporderdbid.txt
-echo create inventory PDB...
-oci db autonomous-database create --compartment-id $MSDATAWORKSHOP_COMPARTMENT_ID --cpu-core-count 1 --data-storage-size-in-tbs 1 --db-name INVENTORYDB --display-name INVENTORYDB --from-json file://pw | jq --raw-output '.data | .["id"] '> $WORKINGDIR/msdataworkshopinventorydbid.txt
-
-echo create msdataworkshop namespace
-kubectl create namespace msdataworkshop
-
-echo create db pw secret...
-kubectl create -n msdataworkshop -f - <<!
-{
-   "apiVersion": "v1",
-   "kind": "Secret",
-   "metadata": {
-      "name": "dbuser"
-   },
-   "data": {
-      "dbpassword": "${PASSWORDENCODED}"
-   }
-}
-!
-rm pw
-
-echo create frontendadmin auth secret...
-AUTHPASSWORD=`oci secrets secret-bundle get --secret-id $2 --query "data.\"secret-bundle-content\".content" --raw-output`
-kubectl create -n msdataworkshop -f - <<!
-{
-   "apiVersion": "v1",
-   "kind": "Secret",
-   "metadata": {
-      "name": "frontendadmin"
-   },
-   "data": {
-      "password": "${AUTHPASSWORD}"
-   }
-}
-!
-
diff --git a/grabdish/deploy.sh b/grabdish/deploy.sh
index 3d1384213..c49b4a4c6 100755
--- a/grabdish/deploy.sh
+++ b/grabdish/deploy.sh
@@ -2,42 +2,15 @@
 # Copyright (c) 2021 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
-echo ________________________________________
-echo deploying frontend-helidon...
-echo ________________________________________
-cd frontend-helidon
-./deploy.sh
-cd ../
-
-echo ________________________________________
-echo deploying admin-helidon...
-echo ________________________________________
-cd admin-helidon
-./deploy.sh
-cd ../
-
-echo ________________________________________
-echo deploying order-helidon...
-echo ________________________________________
-cd order-helidon
-./deploy.sh
-cd ../
-
-echo ________________________________________
-echo deploying supplier-helidon-se...
-echo ________________________________________
-cd supplier-helidon-se
-./deploy.sh
-cd ../
-
-echo ________________________________________
-echo deploying inventory-helidon...
-echo ________________________________________
-cd inventory-helidon
-./deploy.sh
-cd ../
-
-# note that this creates only the inventory helidon (MP) deployment
+MS="frontend-helidon admin-helidon order-helidon supplier-helidon-se inventory-helidon"
+for s in $MS; do 
+    echo ________________________________________
+    echo "Deploying $s..."
+    echo ________________________________________
+    cd $GRABDISH_HOME/$s
+    ./deploy.sh
+    cd $GRABDISH_HOME
+done
 
 echo ________________________________________
 echo ...finished
diff --git a/grabdish/destroy.sh b/grabdish/destroy.sh
new file mode 100644
index 000000000..607e28edf
--- /dev/null
+++ b/grabdish/destroy.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Make sure this is run via source or .
+if ! (return 0 2>/dev/null); then
+  echo "ERROR: Usage 'source destroy.sh'"
+  exit
+fi
+
+$GRABDISH_HOME/utils/main-destroy.sh
\ No newline at end of file
diff --git a/grabdish/dockerLogin.sh b/grabdish/dockerLogin.sh
deleted file mode 100755
index d7f8361de..000000000
--- a/grabdish/dockerLogin.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-echo Ensure MSDATAWORKSHOP_OCIR_AUTHKEY argument is in quotes.
-echo Usage example 1: ./dockerLogin.sh foo@bar.com "8nO[BKNU5iwasdf2xeefU;yl"
-echo Usage example 2: ./dockerLogin.sh oracleidentitycloudservice/foo@bar.com "8nO[BKNU5iwasdf2xeefU;yl"
-
-export WORKINGDIR=workingdir
-echo WORKINGDIR = $WORKINGDIR
-
-if [[ $1 == "" ]]
-then
-  echo MSDATAWORKSHOP_OCIR_USER not provided
-  echo Required arguments are MSDATAWORKSHOP_OCIR_USER and MSDATAWORKSHOP_OCIR_AUTHKEY.
-  echo Usage example : ./dockerLogin.sh foo@bar.com "8nO[BKNU5iwasdf2xeefU;yl"
-  exit
-fi
-
-if [[ $2 == "" ]]
-then
-  echo MSDATAWORKSHOP_OCIR_AUTHKEY not provided
-  echo Required arguments are MSDATAWORKSHOP_OCIR_USER and MSDATAWORKSHOP_OCIR_AUTHKEY.
-  echo Usage example : ./dockerLogin.sh foo@bar.com "8nO[BKNU5iwasdf2xeefU;yl"
-  exit
-fi
-
-export MSDATAWORKSHOP_OCIR_USER=$1
-echo $MSDATAWORKSHOP_OCIR_USER | tr -d '"' > $WORKINGDIR/msdataworkshopociruser.txt
-echo MSDATAWORKSHOP_OCIR_USER... $MSDATAWORKSHOP_OCIR_USER
-
-export MSDATAWORKSHOP_OCIR_AUTHKEY=$2
-echo $MSDATAWORKSHOP_OCIR_AUTHKEY | tr -d '"' > $WORKINGDIR/msdataworkshopocirauthkey.txt
-echo MSDATAWORKSHOP_OCIR_AUTHKEY... $MSDATAWORKSHOP_OCIR_AUTHKEY
-
-export MSDATAWORKSHOP_REGION=$(cat $WORKINGDIR/msdataworkshopregion.txt)
-echo MSDATAWORKSHOP_REGION... $MSDATAWORKSHOP_REGION
-
-export MSDATAWORKSHOP_OCIR_NAMESPACE=$(cat $WORKINGDIR/msdataworkshopocirnamespace.txt)
-echo MSDATAWORKSHOP_OCIR_NAMESPACE... $MSDATAWORKSHOP_OCIR_NAMESPACE
-
-export MSDATAWORKSHOP_REPOS_NAME=$(cat $WORKINGDIR/msdataworkshopreposname.txt)
-echo MSDATAWORKSHOP_REPOS_NAME... $MSDATAWORKSHOP_REPOS_NAME
-
-
-#export DOCKER_REGISTRY="<region-key>.ocir.io/<object-storage-namespace>/<firstname.lastname>/<repo-name>"
-# example... export DOCKER_REGISTRY=us-ashburn-1.ocir.io/aqsghou34ag/paul.parkinson/myreponame
-export DOCKER_REGISTRY=$MSDATAWORKSHOP_REGION.ocir.io/$MSDATAWORKSHOP_OCIR_NAMESPACE/$MSDATAWORKSHOP_REPOS_NAME
-echo $DOCKER_REGISTRY | tr -d '"' > $WORKINGDIR/msdataworkshopdockerregistry.txt
-echo DOCKER_REGISTRY... $DOCKER_REGISTRY
-
-# example... docker login REGION-ID.ocir.io -u <tenant name>/<username>
-# example... docker login REGION-ID.ocir.io -u OBJECT-STORAGE-NAMESPACE/USERNAME
-echo docker login $MSDATAWORKSHOP_REGION.ocir.io -u $MSDATAWORKSHOP_OCIR_NAMESPACE/$MSDATAWORKSHOP_OCIR_USER -p $MSDATAWORKSHOP_OCIR_AUTHKEY
-docker login $MSDATAWORKSHOP_REGION.ocir.io -u $MSDATAWORKSHOP_OCIR_NAMESPACE/$MSDATAWORKSHOP_OCIR_USER -p $MSDATAWORKSHOP_OCIR_AUTHKEY
-
diff --git a/grabdish/env.sh b/grabdish/env.sh
new file mode 100644
index 000000000..039606059
--- /dev/null
+++ b/grabdish/env.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Make sure this is run via source or .
+if ! (return 0 2>/dev/null); then
+  echo "ERROR: Usage 'source env.sh'"
+  exit
+fi
+
+# Set GRABDISH_HOME
+export GRABDISH_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cd $GRABDISH_HOME
+echo "GRABDISH_HOME: $GRABDISH_HOME"
+
+# Java Home
+export JAVA_HOME=~/graalvm-ce-java11-20.1.0
+export PATH=$JAVA_HOME/bin:$PATH
+
+# Log directory
+export GRABDISH_LOG=$GRABDISH_HOME/log
+mkdir -p $GRABDISH_LOG
+
+# Source the state functions
+source $GRABDISH_HOME/utils/state-functions.sh
+
+# SHORTCUT ALIASES AND UTILS...
+alias k='kubectl'
+alias kt='kubectl --insecure-skip-tls-verify'
+alias pods='kubectl get po --all-namespaces'
+alias services='kubectl get services --all-namespaces'
+alias configmaps='kubectl get configmaps --all-namespaces'
+alias gateways='kubectl get gateways --all-namespaces'
+alias secrets='kubectl get secrets --all-namespaces'
+alias ingresssecret='kubectl get secrets --all-namespaces | grep istio-ingressgateway-certs'
+alias virtualservices='kubectl get virtualservices --all-namespaces'
+alias deployments='kubectl get deployments --all-namespaces'
+alias msdataworkshop='echo deployments... ; deployments|grep msdataworkshop ; echo pods... ; pods|grep msdataworkshop ; echo services... ; services | grep msdataworkshop ; echo secrets... ; secrets|grep msdataworkshop ; echo "other shortcut commands... most can take partial podname as argument, such as [logpod front] or [deletepod order]...  pods  services secrets deployments " ; ls $MSDATAWORKSHOP_LOCATION/utils/'
+
+export PATH=$PATH:$GRABDISH_HOME/utils/
\ No newline at end of file
diff --git a/grabdish/frontend-helidon/Dockerfile b/grabdish/frontend-helidon/Dockerfile
new file mode 100644
index 000000000..d08f3798d
--- /dev/null
+++ b/grabdish/frontend-helidon/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar
\ No newline at end of file
diff --git a/grabdish/frontend-helidon/build.sh b/grabdish/frontend-helidon/build.sh
index 46fd5714d..26992ff02 100755
--- a/grabdish/frontend-helidon/build.sh
+++ b/grabdish/frontend-helidon/build.sh
@@ -2,28 +2,27 @@
 ## Copyright (c) 2021 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
+# Fail on error
+set -e
 
 SCRIPT_DIR=$(dirname $0)
 
 IMAGE_NAME=frontend-helidon
 IMAGE_VERSION=0.1
 
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
 if [ -z "DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
-# this is not ideal but makes it convenient to access Jaeger UI from app page...
-cp src/main/resources/web/index.html-template src/main/resources/web/index.html
-sed -i "s|%JAEGER_QUERY_ADDRESS%|${JAEGER_QUERY_ADDRESS}|g" src/main/resources/web/index.html
 
-mvn install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
-if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
-    exit 1
-fi
 docker push $IMAGE
 if [  $? -eq 0 ]; then
     docker rmi ${IMAGE}
diff --git a/grabdish/frontend-helidon/deploy.sh b/grabdish/frontend-helidon/deploy.sh
index 944067ea4..08fe3c81c 100755
--- a/grabdish/frontend-helidon/deploy.sh
+++ b/grabdish/frontend-helidon/deploy.sh
@@ -4,6 +4,7 @@
 
 
 SCRIPT_DIR=$(dirname $0)
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
 
 echo create frontend deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
diff --git a/grabdish/frontend-helidon/frontend-helidon-deployment.yaml b/grabdish/frontend-helidon/frontend-helidon-deployment.yaml
index 31d7647bd..d0c16e3db 100755
--- a/grabdish/frontend-helidon/frontend-helidon-deployment.yaml
+++ b/grabdish/frontend-helidon/frontend-helidon-deployment.yaml
@@ -27,10 +27,5 @@ spec:
               secretKeyRef:
                 name: frontendadmin
                 key: password
-          - name: JAEGER_QUERY_ADDRESS
-            valueFrom:
-              configMapKeyRef:
-                name: jaegerqueryaddress
-                key: address
         ports:
         - containerPort: 8080
diff --git a/grabdish/frontend-helidon/pom.xml b/grabdish/frontend-helidon/pom.xml
index a507cbfb4..8055a6cee 100755
--- a/grabdish/frontend-helidon/pom.xml
+++ b/grabdish/frontend-helidon/pom.xml
@@ -24,6 +24,7 @@
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
         <version>2.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -46,21 +47,22 @@
 
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
-                    <baseImage>openjdk:11</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>0.1</imageTag>
-                    </imageTags>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
 
@@ -113,9 +115,6 @@
                                 <resource>
                                     <directory>src/main/docker</directory>
                                     <filtering>true</filtering>
-                                    <includes>
-                                        <include>Dockerfile</include>
-                                    </includes>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/grabdish/frontend-helidon/src/main/resources/web/index.html-template b/grabdish/frontend-helidon/src/main/resources/web/index.html
similarity index 97%
rename from grabdish/frontend-helidon/src/main/resources/web/index.html-template
rename to grabdish/frontend-helidon/src/main/resources/web/index.html
index d24a99b4b..7460ff0ee 100644
--- a/grabdish/frontend-helidon/src/main/resources/web/index.html-template
+++ b/grabdish/frontend-helidon/src/main/resources/web/index.html
@@ -99,7 +99,7 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
               <!-- Each Lab's UI is defined by a section in the switcher here
                  This in turn is controlled by the selected task in the navigation  -->
               <oj-switcher value="[[selectedTask]]">
-                <!-- lab7 -->
+                <!-- 
                 <div slot="lab7">
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab7TestDatasourcesAction]]">Test Data Sources</oj-button>
                 </div>
@@ -115,6 +115,7 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab8UnschedulePropagationAction]]">Unschedule Propagation</oj-button>
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab8DeleteUsersAction]]">Delete Users</oj-button>
                 </div>
+                -->
                 <!-- lab9 -->
                 <div slot="lab9">
                   <oj-form-layout>
@@ -155,9 +156,6 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab10ordersetlivenesstofalseAction]]">Set Liveness to False</oj-button>
                   <oj-button disabled="[[inProgress]]" on-oj-action="[[lab10lastContainerStartTimeAction]]">Get Last Container Start Time</oj-button>
                   <br><br>
-                  <form id="jaegerLink" action="%JAEGER_QUERY_ADDRESS%" method="get" target="_blank">
-                    <input class="button button1" type="submit" value="Show Tracing" />
-                  </form>
                 </div>
               </oj-switcher>
             </div>
@@ -202,9 +200,6 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
   <script type="text/javascript" src="https://static.oracle.com/cdn/jet/9.0.0/default/js/bundles-config.js"></script>
   <script>
 
-<!--          var jaegerQuery = 'localhost:80';-->
-<!--          document.getElementById('jaegerLink').action = 'http://' + jaegerQuery;-->
-
     (function () {
       requirejs.config({
         baseUrl: "js",
@@ -273,10 +268,10 @@ <h1 class="oj-sm-only-hide oj-web-applayout-header-title" title="Application Nam
           // Key for the map matches the slot name used in the switcher
           this.menuTasks = new Map();
           this.menuTasks.set('about', { label: 'About', title: 'About the GrabDish Explorer', description: 'The GrabDish Explorer screen allows you to test the results of each lab.  Simply click the tab on the left that corresponds to the lab that you want to test out and follow the on-screen instructions.' });
-          this.menuTasks.set('lab7', { label: 'Datasources', title: 'Datasources', description: 'Verify that the Datasources are all working' });
-          this.menuTasks.set('lab8', { label: 'Setup (and Tear Down) Data and Messaging', title: 'Setup (and Tear Down) Data and Messaging', description: 'This lab sets up data and messaging in the database' });
+//          this.menuTasks.set('lab7', { label: 'Datasources', title: 'Datasources', description: 'Verify that the Datasources are all working' });
+//          this.menuTasks.set('lab8', { label: 'Setup (and Tear Down) Data and Messaging', title: 'Setup (and Tear Down) Data and Messaging', description: 'This lab sets up data and messaging in the database' });
           this.menuTasks.set('lab9', { label: 'Transactional', title: 'Transactional', description: 'JSON and relational data types, AQ transactional event-driven communication, saga, event sourcing, and CQRS' });
-          this.menuTasks.set('lab10', { label: 'OpenAPI, Tracing, Metrics, and Health', title: 'OpenAPI, Tracing, Metrics, and Health', description: 'Use Helidon features to provide OpenAPI, tracing, metrics, and health checks' });
+          this.menuTasks.set('lab10', { label: 'OpenAPI, Metrics, and Health', title: 'OpenAPI, Metrics, and Health', description: 'Use Helidon features to provide OpenAPI, tracing, metrics, and health checks' });
 
           //Drives the navigation list itself
           this.tasks = new ArrayDataProvider(Array.from(this.menuTasks.entries()).map(entry => { entry[1].id = entry[0]; return entry[1]; }), { keyAttributes: 'id' });
diff --git a/grabdish/frontend-helidon/src/main/resources/web/spatial.html b/grabdish/frontend-helidon/src/main/resources/web/spatial.html
index 63abeaf98..6df17b0b1 100644
--- a/grabdish/frontend-helidon/src/main/resources/web/spatial.html
+++ b/grabdish/frontend-helidon/src/main/resources/web/spatial.html
@@ -307,9 +307,6 @@ <h1>Confirm Order</h1>
 <script type="text/javascript" src="https://static.oracle.com/cdn/jet/9.0.0/default/js/bundles-config.js"></script>
 <script>
 
-    <!--          var jaegerQuery = 'localhost:80';-->
-    <!--          document.getElementById('jaegerLink').action = 'http://' + jaegerQuery;-->
-
     (function () {
         requirejs.config({
             baseUrl: "js",
@@ -382,7 +379,7 @@ <h1>Confirm Order</h1>
                 this.menuTasks.set('lab8', { label: 'Setup (and Tear Down) Data and Messaging', title: 'Setup (and Tear Down) Data and Messaging', description: 'This lab sets up data and messaging in the database' });
                 this.menuTasks.set('lab9', { label: 'Transactional', title: 'Transactional', description: 'JSON and relational data types, AQ transactional event-driven communication, saga, event sourcing, and CQRS' });
                 this.menuTasks.set('lab9_1', { label: 'Spatial', title: 'Spatial', description: 'Spatial Data' });
-                this.menuTasks.set('lab10', { label: 'Tracing, Metrics, and Health', title: 'Tracing, Metrics, and Health', description: 'Use Helidon features to provide tracing, metrics, and health checks' });
+                this.menuTasks.set('lab10', { label: 'Metrics, and Health', title: 'Metrics, and Health', description: 'Use Helidon features to provide tracing, metrics, and health checks' });
 
                 //Drives the navigation list itself
                 this.tasks = new ArrayDataProvider(Array.from(this.menuTasks.entries()).map(entry => { entry[1].id = entry[0]; return entry[1]; }), { keyAttributes: 'id' });
diff --git a/grabdish/frontend-helidon/undeploy.sh b/grabdish/frontend-helidon/undeploy.sh
index cb34b24c2..d4557a0a6 100755
--- a/grabdish/frontend-helidon/undeploy.sh
+++ b/grabdish/frontend-helidon/undeploy.sh
@@ -7,4 +7,4 @@ echo delete frontend deployment and service...
 
 kubectl delete deployment frontend-helidon -n msdataworkshop
 
-kubectl delete service frontend -n msdataworkshop
\ No newline at end of file
+# kubectl delete service frontend -n msdataworkshop
\ No newline at end of file
diff --git a/grabdish/images/OCI-OKE-ATP-setup.png b/grabdish/images/OCI-OKE-ATP-setup.png
deleted file mode 100644
index 3541342f2..000000000
Binary files a/grabdish/images/OCI-OKE-ATP-setup.png and /dev/null differ
diff --git a/grabdish/images/appfrontend.png b/grabdish/images/appfrontend.png
deleted file mode 100644
index 63c1076c5..000000000
Binary files a/grabdish/images/appfrontend.png and /dev/null differ
diff --git a/grabdish/images/atpfromhelidonsteps.png b/grabdish/images/atpfromhelidonsteps.png
deleted file mode 100644
index 99191b8f4..000000000
Binary files a/grabdish/images/atpfromhelidonsteps.png and /dev/null differ
diff --git a/grabdish/images/cloudshell.png b/grabdish/images/cloudshell.png
deleted file mode 100644
index e1425821d..000000000
Binary files a/grabdish/images/cloudshell.png and /dev/null differ
diff --git a/grabdish/images/dbadminservice.png b/grabdish/images/dbadminservice.png
deleted file mode 100644
index 4eb29114b..000000000
Binary files a/grabdish/images/dbadminservice.png and /dev/null differ
diff --git a/grabdish/images/demo-arch.png b/grabdish/images/demo-arch.png
deleted file mode 100644
index 25a16906c..000000000
Binary files a/grabdish/images/demo-arch.png and /dev/null differ
diff --git a/grabdish/images/demo-erd.png b/grabdish/images/demo-erd.png
deleted file mode 100644
index d23983f8f..000000000
Binary files a/grabdish/images/demo-erd.png and /dev/null differ
diff --git a/grabdish/images/first-microservice-deployed-static.png b/grabdish/images/first-microservice-deployed-static.png
deleted file mode 100644
index 5ec6e7873..000000000
Binary files a/grabdish/images/first-microservice-deployed-static.png and /dev/null differ
diff --git a/grabdish/images/helidon.png b/grabdish/images/helidon.png
deleted file mode 100644
index 17deadc0d..000000000
Binary files a/grabdish/images/helidon.png and /dev/null differ
diff --git a/grabdish/images/helidontx.png b/grabdish/images/helidontx.png
deleted file mode 100644
index 243a4f031..000000000
Binary files a/grabdish/images/helidontx.png and /dev/null differ
diff --git a/grabdish/images/jaegercollapsed.png b/grabdish/images/jaegercollapsed.png
deleted file mode 100644
index 59547df44..000000000
Binary files a/grabdish/images/jaegercollapsed.png and /dev/null differ
diff --git a/grabdish/images/jaegerexpanded.png b/grabdish/images/jaegerexpanded.png
deleted file mode 100644
index 8cb8feba6..000000000
Binary files a/grabdish/images/jaegerexpanded.png and /dev/null differ
diff --git a/grabdish/images/kiali.png b/grabdish/images/kiali.png
deleted file mode 100644
index baaf4eaec..000000000
Binary files a/grabdish/images/kiali.png and /dev/null differ
diff --git a/grabdish/images/orderinventoryapp-microservices.png b/grabdish/images/orderinventoryapp-microservices.png
deleted file mode 100644
index cee763591..000000000
Binary files a/grabdish/images/orderinventoryapp-microservices.png and /dev/null differ
diff --git a/grabdish/images/readmedocsidebar.png b/grabdish/images/readmedocsidebar.png
deleted file mode 100644
index 4e5ac3916..000000000
Binary files a/grabdish/images/readmedocsidebar.png and /dev/null differ
diff --git a/grabdish/installGraalVMJaegerAndFrontendLB.sh b/grabdish/installGraalVMJaegerAndFrontendLB.sh
deleted file mode 100755
index 34dd40a83..000000000
--- a/grabdish/installGraalVMJaegerAndFrontendLB.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-echo download and extract GraalVM...
-curl -sLO https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz
-gunzip graalvm-ce-java11-linux-amd64-20.1.0.tar.gz
-tar xvf graalvm-ce-java11-linux-amd64-20.1.0.tar
-rm graalvm-ce-java11-linux-amd64-20.1.0.tar
-mv graalvm-ce-java11-20.1.0 ~/
-
-echo ~/graalvm-ce-java11-20.1.0 > $WORKINGDIR/msdataworkshopgraalvmhome.txt
-
-echo install GraalVM native-image...
-~/graalvm-ce-java11-20.1.0/bin/gu install native-image
-
-umask 077
-
-if [ ! -d tls ]; then
-  umask 077
-  echo "Creating ssl certificate secret"
-  mkdir tls
-  openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout tls/tls.key -out tls/tls.crt -subj "/CN=convergeddb/O=convergeddb"
-  kubectl create secret tls ssl-certificate-secret --key tls/tls.key --cert tls/tls.crt -n msdataworkshop
-fi
-
-echo install jaeger...
-kubectl create -f https://tinyurl.com/yc52x6q5 -n msdataworkshop
-
-echo creating frontend loadbalancer service...
-kubectl create -f frontend-helidon/frontend-service.yaml -n msdataworkshop
diff --git a/grabdish/inventory-helidon-se/Dockerfile b/grabdish/inventory-helidon-se/Dockerfile
new file mode 100644
index 000000000..d08f3798d
--- /dev/null
+++ b/grabdish/inventory-helidon-se/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar
\ No newline at end of file
diff --git a/grabdish/inventory-helidon-se/build.sh b/grabdish/inventory-helidon-se/build.sh
index a6f3546ff..890e03c95 100755
--- a/grabdish/inventory-helidon-se/build.sh
+++ b/grabdish/inventory-helidon-se/build.sh
@@ -6,6 +6,8 @@
 export IMAGE_NAME=inventory-helidon-se
 export IMAGE_VERSION=0.1
 
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
 if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
@@ -13,8 +15,9 @@ fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-mvn install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
 docker push "$IMAGE"
 if [  $? -eq 0 ]; then
diff --git a/grabdish/inventory-helidon-se/deploy.sh b/grabdish/inventory-helidon-se/deploy.sh
index b2d4adc25..402793fbb 100755
--- a/grabdish/inventory-helidon-se/deploy.sh
+++ b/grabdish/inventory-helidon-se/deploy.sh
@@ -4,6 +4,11 @@
 
 SCRIPT_DIR=$(dirname "$0")
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create inventory-helidon-se deployment...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
diff --git a/grabdish/inventory-helidon-se/pom.xml b/grabdish/inventory-helidon-se/pom.xml
index b8ddb0a23..10b2ca6b9 100644
--- a/grabdish/inventory-helidon-se/pom.xml
+++ b/grabdish/inventory-helidon-se/pom.xml
@@ -10,33 +10,26 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.helidon.se</groupId>
     <artifactId>inventory-helidon-se</artifactId>
-    <version>0.1</version>
-    <description>
-        common
-    </description>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <description>Helidon SE version of the Inventory Service</description>
 
-    <properties>
-        <!-- system props -->
+    <parent>
+        <groupId>io.helidon.applications</groupId>
+        <artifactId>helidon-se</artifactId>
+        <version>2.2.0</version>
+        <relativePath/>
+    </parent>
+     <properties>
+        <helidon.version>1.4.0</helidon.version>
+        <mainClass>com.helidon.se.Main</mainClass>
+        <libs.classpath.prefix>libs</libs.classpath.prefix>
+        <copied.libs.dir>${project.build.directory}/${libs.classpath.prefix}</copied.libs.dir>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
-        <jar.main.class>com.helidon.se.Main</jar.main.class>
-        <java.version>1.8</java.version>
-        <skipTests>true</skipTests>
-        <!--suppress UnresolvedMavenProperty -->
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <argLine>-Dfile.encoding=UTF-8</argLine>
         <docker.image.prefix>${env.DOCKER_REGISTRY}</docker.image.prefix>
-        <!--suppress UnresolvedMavenProperty -->
-        <docker.image.name>${env.IMAGE_NAME}</docker.image.name>
-        <!--suppress UnresolvedMavenProperty -->
-        <docker.image.version>${env.IMAGE_VERSION}</docker.image.version>
-        <!-- /system props -->
-
-        <compiler-plugin.version>3.8.1</compiler-plugin.version>
-        <jar-plugin.version>3.2.0</jar-plugin.version>
-        <shade-plugin.version>3.2.1</shade-plugin.version>
-
         <logback.version>1.2.3</logback.version>
         <jul-to-slf4j.version>1.7.30</jul-to-slf4j.version>
         <junit.version>4.13.1</junit.version>
@@ -44,101 +37,123 @@
         <lombok.version>1.18.2</lombok.version>
         <ojdbc10.version>19.3.0.0</ojdbc10.version>
         <helidon.version>1.4.3</helidon.version>
-
     </properties>
 
     <build>
         <finalName>${project.artifactId}</finalName>
-        <defaultGoal>install</defaultGoal>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>3.1.1</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.1.0</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>3.1.2</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                                <classpathPrefix>${libs.classpath.prefix}</classpathPrefix>
+                                <mainClass>${mainClass}</mainClass>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${compiler-plugin.version}</version>
+                <groupId>com.spotify</groupId>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
-            <!-- packing jar, adding main class link to jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>${jar-plugin.version}</version>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>${jar.main.class}</mainClass>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${copied.libs.dir}</outputDirectory>
+                            <overWriteReleases>false</overWriteReleases>
+                            <overWriteSnapshots>false</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <includeScope>runtime</includeScope>
+                            <excludeScope>test</excludeScope>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
-            <!-- add all dependencies to jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>${shade-plugin.version}</version>
+                <artifactId>maven-resources-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
+                        <id>copy-dockerfile</id>
+                        <phase>process-resources</phase>
                         <goals>
-                            <goal>shade</goal>
+                            <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <finalName>${project.artifactId}</finalName>
-                            <keepDependenciesWithProvidedScope>true</keepDependenciesWithProvidedScope>
-                            <createDependencyReducedPom>true</createDependencyReducedPom>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
-                            </transformers>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/docker</directory>
+                                    <filtering>true</filtering>
+                                    <includes>
+                                        <include>Dockerfile</include>
+                                    </includes>
+                                </resource>
+                                <resource>
+                                    <filtering>true</filtering>
+                                    <directory>src/main/k8s</directory>
+                                    <includes>
+                                        <include>app.yaml</include>
+                                    </includes>
+                                </resource>
+                            </resources>
                         </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <filters>
-                        <filter>
-                            <artifact>*:*</artifact>
-                            <excludes>
-                                <exclude>META-INF/*.SF</exclude>
-                                <exclude>META-INF/*.DSA</exclude>
-                                <exclude>META-INF/*.RSA</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
-                <configuration>
-                    <imageName>${docker.image.prefix}/${docker.image.name}</imageName>
-                    <baseImage>openjdk:8</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>${docker.image.version}</imageTag>
-                    </imageTags>
-                </configuration>
             </plugin>
         </plugins>
-    </build>
+    </build>    
     <dependencies>
-        <!-- logging -->
-        <dependency>
+         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>${logback.version}</version>
@@ -148,18 +163,12 @@
             <artifactId>jul-to-slf4j</artifactId>
             <version>${jul-to-slf4j.version}</version>
         </dependency>
-        <!-- /logging -->
-
-        <!-- testing -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <!-- /testing -->
-
-        <!-- utils -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -176,21 +185,17 @@
             <artifactId>javax.json.bind-api</artifactId>
             <version>1.0</version>
         </dependency>
-        <!-- /utils -->
-
-        <!-- db -->
         <dependency>
             <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <version>${ojdbc10.version}</version>
+            <artifactId>ojdbc8-production</artifactId>
+            <version>19.8.0.0</version>
+            <type>pom</type>
         </dependency>
-        <!-- Optional depth for AQMessage -->
         <dependency>
             <groupId>com.oracle.database.xml</groupId>
             <artifactId>xdb</artifactId>
             <version>${ojdbc10.version}</version>
         </dependency>
-        <!-- Depth for Oracle JMS -->
         <dependency>
             <groupId>com.oracle.database.messaging</groupId>
             <artifactId>aqapi</artifactId>
@@ -201,9 +206,6 @@
             <artifactId>jta</artifactId>
             <version>1.1</version>
         </dependency>
-        <!-- /db -->
-
-        <!-- http client server -->
         <dependency>
             <groupId>io.helidon.webserver</groupId>
             <artifactId>helidon-webserver</artifactId>
diff --git a/grabdish/inventory-helidon/Dockerfile b/grabdish/inventory-helidon/Dockerfile
new file mode 100644
index 000000000..d08f3798d
--- /dev/null
+++ b/grabdish/inventory-helidon/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar
\ No newline at end of file
diff --git a/grabdish/inventory-helidon/build.sh b/grabdish/inventory-helidon/build.sh
index c0ff4cbdf..dbf59122c 100755
--- a/grabdish/inventory-helidon/build.sh
+++ b/grabdish/inventory-helidon/build.sh
@@ -6,19 +6,19 @@
 IMAGE_NAME=inventory-helidon
 IMAGE_VERSION=0.1
 
-if [ -z "DOCKER_REGISTRY" ]; then
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-mvn install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
-if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
-    exit 1
-fi
 docker push $IMAGE
 if [  $? -eq 0 ]; then
     docker rmi ${IMAGE}
diff --git a/grabdish/inventory-helidon/deploy.sh b/grabdish/inventory-helidon/deploy.sh
index 991d328ca..1e916fbeb 100755
--- a/grabdish/inventory-helidon/deploy.sh
+++ b/grabdish/inventory-helidon/deploy.sh
@@ -4,6 +4,11 @@
 
 SCRIPT_DIR=$(dirname $0)
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create inventory-helidon deployment and service...
 
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
diff --git a/grabdish/inventory-helidon/pom.xml b/grabdish/inventory-helidon/pom.xml
index 07c80a3fc..4f5acf444 100755
--- a/grabdish/inventory-helidon/pom.xml
+++ b/grabdish/inventory-helidon/pom.xml
@@ -17,13 +17,14 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>inventory-helidon</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>inventory-helidon</name>
+    <name>${project.artifactId}</name>
     <description>stateful microservices demo</description>
 
     <parent>
-        <groupId>io.helidon</groupId>
-        <artifactId>helidon-project</artifactId>
+        <groupId>io.helidon.applications</groupId>
+        <artifactId>helidon-mp</artifactId>
         <version>2.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -44,24 +45,24 @@
 
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
-                    <baseImage>openjdk:11</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>0.1</imageTag>
-                    </imageTags>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -180,29 +181,10 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ojdbc10</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_core</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_cert</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>oraclepki</artifactId>
-            <version>19.3.0.0</version>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8-production</artifactId>
+            <version>19.8.0.0</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.messaging</groupId>
diff --git a/grabdish/inventory-nodejs/build.sh b/grabdish/inventory-nodejs/build.sh
index d4a7dedcd..6ce4882ce 100755
--- a/grabdish/inventory-nodejs/build.sh
+++ b/grabdish/inventory-nodejs/build.sh
@@ -8,7 +8,9 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=inventory-nodejs
 IMAGE_VERSION=0.1
 
-if [ -z "DOCKER_REGISTRY" ]; then
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
diff --git a/grabdish/inventory-nodejs/deploy.sh b/grabdish/inventory-nodejs/deploy.sh
index 49d0cc1e0..ff1eaa8a6 100755
--- a/grabdish/inventory-nodejs/deploy.sh
+++ b/grabdish/inventory-nodejs/deploy.sh
@@ -5,6 +5,11 @@
 
 SCRIPT_DIR=$(dirname $0)
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create inventory-nodejs deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
diff --git a/grabdish/inventory-nodejs/inventory/Dockerfile b/grabdish/inventory-nodejs/inventory/Dockerfile
index ef50142c7..0487e0696 100644
--- a/grabdish/inventory-nodejs/inventory/Dockerfile
+++ b/grabdish/inventory-nodejs/inventory/Dockerfile
@@ -1,11 +1,16 @@
 FROM oraclelinux:7-slim
 
 ARG release=19
-ARG update=5
+ARG update=9
 
-RUN  yum -y install oracle-release-el7 oracle-nodejs-release-el7 && \
+RUN  yum -y install oracle-release-el7 && \
+     yum-config-manager --enable ol7_oracle_instantclient && \
+     yum -y install oracle-instantclient${release}.${update}-basiclite && \
+     yum install -y oracle-epel-release-el7
+
+RUN  yum -y install oracle-nodejs-release-el7 && \
      yum-config-manager --disable ol7_developer_EPEL && \
-     yum -y install oracle-instantclient${release}.${update}-basiclite nodejs && \
+     yum -y install nodejs && \
      rm -rf /var/cache/yum
 
 # Create app directory
@@ -21,6 +26,7 @@ RUN npm install oci-common
 RUN npm install oci-secrets
 RUN npm install oci-vault
 RUN npm install oci-identity
+
 # If you are building your code for production
 # RUN npm ci --only=production
 
@@ -28,4 +34,4 @@ RUN npm install oci-identity
 COPY . .
 
 EXPOSE 8080
-CMD [ "node", "app.js" ]
+CMD [ "node", "app.js" ]
\ No newline at end of file
diff --git a/grabdish/inventory-python/Dockerfile b/grabdish/inventory-python/Dockerfile
index 1a9cd39c6..29213fb8d 100644
--- a/grabdish/inventory-python/Dockerfile
+++ b/grabdish/inventory-python/Dockerfile
@@ -1,19 +1,22 @@
 FROM oraclelinux:7-slim
 
 ARG release=19
-ARG update=3
-
-WORKDIR /app
-COPY ./inventory/* /app/
-ADD ./common /app
+ARG update=9
 
 RUN  yum -y install oracle-release-el7 && \
      yum-config-manager --enable ol7_oracle_instantclient && \
      yum -y install oracle-instantclient${release}.${update}-basiclite && \
-     yum install -y oracle-epel-release-el7 && \
-     yum install -y python36 && \
+     yum install -y oracle-epel-release-el7
+
+WORKDIR /app
+COPY inventory/requirements.txt .
+RUN  yum install -y python36 && \
      yum install -y tar && \
      rm -rf /var/cache/yum && \
      python3.6 -m pip install -r requirements.txt
 
-CMD ["gunicorn", "app:app", "--config=config.py"]
+ADD inventory .
+ADD common .
+RUN echo 'done!'
+
+CMD ["gunicorn", "app:app", "--config=config.py"]
\ No newline at end of file
diff --git a/grabdish/inventory-python/build.sh b/grabdish/inventory-python/build.sh
index cd70b6e86..1b0f3293f 100755
--- a/grabdish/inventory-python/build.sh
+++ b/grabdish/inventory-python/build.sh
@@ -8,7 +8,9 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=inventory-python
 IMAGE_VERSION=0.1
 
-if [ -z "DOCKER_REGISTRY" ]; then
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
diff --git a/grabdish/inventory-python/deploy.sh b/grabdish/inventory-python/deploy.sh
index 622e35c2c..d613f4b25 100755
--- a/grabdish/inventory-python/deploy.sh
+++ b/grabdish/inventory-python/deploy.sh
@@ -5,6 +5,11 @@
 
 SCRIPT_DIR=$(dirname $0)
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create inventory-python-deployment deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
diff --git a/grabdish/lib/orajsoda-1.1.0.jar b/grabdish/lib/orajsoda-1.1.0.jar
deleted file mode 100755
index 34e05569e..000000000
Binary files a/grabdish/lib/orajsoda-1.1.0.jar and /dev/null differ
diff --git a/grabdish/msdataworkshop.properties b/grabdish/msdataworkshop.properties
deleted file mode 100755
index bb32e9c23..000000000
--- a/grabdish/msdataworkshop.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-export WORKINGDIR=$MSDATAWORKSHOP_LOCATION/workingdir
-echo  WORKINGDIR=$WORKINGDIR
-
-#############################################
-# THESE VALUES NEEDED FOR WORKSHOP...
-#############################################
-
-# for example export OCI_REGION=us-phoenix-1
-export OCI_REGION=$(cat $WORKINGDIR/msdataworkshopregion.txt)
-echo OCI_REGION... $OCI_REGION
-#export OCI_REGION=<OCI_REGION_IDENTIFIER>
-
-# for example export OCI_COMPARTMENT_ID=ocid1.compartment.oc1..aaaaaaaatvh4oetwxoay4u6lj64mg7n6bvbc63wmesbwyfsvjlpp5zqhi3sa
-export OCI_COMPARTMENT_ID=$(cat $WORKINGDIR/msdataworkshopcompartmentid.txt)
-echo OCI_COMPARTMENT_ID... $OCI_COMPARTMENT_ID
-#export OCI_COMPARTMENT_ID=<OCI_COMPARTMENT_OCID>
-
-# for example export DOCKER_REGISTRY=us-phoenix-1.ocir.io/aqsghou34ag/paul.parkinson/myreponame
-export DOCKER_REGISTRY=$(cat $WORKINGDIR/msdataworkshopdockerregistry.txt)
-echo DOCKER_REGISTRY... $DOCKER_REGISTRY
-#export DOCKER_REGISTRY="<region-key>.ocir.io/<object-storage-namespace>/<firstname.lastname>/<repo-name>"
-
-
-# for example export ORDERPDB_OCID=ocid1.autonomousdatabase.oc1.phx.abyhqljsal723ppfyoyd62esbe745hlkmwidrpz3eop57yyqc4q5t7tyw6ia
-export ORDERPDB_OCID=$(cat $WORKINGDIR/msdataworkshoporderdbid.txt)
-echo ORDERPDB_OCID... $ORDERPDB_OCID
-#export ORDERPDB_OCID=<ORDERPDB_OCID>
-
-# for example export INVENTORYPDB_OCID=ocid1.autonomousdatabase.oc1.phx.abyhqljsykgg4c5ou2yllx6pkt76nxppmt3wbmx2hwztkxkgmpjatz6fsxqq
-export INVENTORYPDB_OCID=$(cat $WORKINGDIR/msdataworkshopinventorydbid.txt)
-echo INVENTORYPDB_OCID... $INVENTORYPDB_OCID
-#export INVENTORYPDB_OCID=<INVENTORYPDB_OCID>
-
-# for example export JAEGER_QUERY_ADDRESS="http://123.123.123.123:80"
-export JAEGER_QUERY_ADDRESS=$(cat $WORKINGDIR/msdataworkshopjaegeraddress.txt)
-echo JAEGER_QUERY_ADDRESS... $JAEGER_QUERY_ADDRESS
-#export JAEGER_QUERY_ADDRESS="<JAEGER_QUERY_ADDRESS>"
-
-export GRAALVM_HOME=$(cat $WORKINGDIR/msdataworkshopgraalvmhome.txt)
-export VAULT_SECRET_OCID=$(cat $WORKINGDIR/msdataworkshopvaultsecretocid.txt)
-
-
-#############################################
-# DO NOT CHANGE FROM FROM HERE BELOW...
-#############################################
-
-export JAVA_HOME=$GRAALVM_HOME 
-export PATH=$JAVA_HOME/bin:$PATH
-export ORDER_PDB_NAME=orderdb
-export INVENTORY_PDB_NAME=inventorydb
-
-# SHORTCUT ALIASES AND UTILS...
-alias k='kubectl'
-alias kt='kubectl --insecure-skip-tls-verify'
-alias pods='kubectl get po --all-namespaces'
-alias services='kubectl get services --all-namespaces'
-alias configmaps='kubectl get configmaps --all-namespaces'
-alias gateways='kubectl get gateways --all-namespaces'
-alias secrets='kubectl get secrets --all-namespaces'
-alias ingresssecret='kubectl get secrets --all-namespaces | grep istio-ingressgateway-certs'
-alias virtualservices='kubectl get virtualservices --all-namespaces'
-alias deployments='kubectl get deployments --all-namespaces'
-alias msdataworkshop='echo deployments... ; deployments|grep msdataworkshop ; echo pods... ; pods|grep msdataworkshop ; echo services... ; services | grep msdataworkshop ; echo secrets... ; secrets|grep msdataworkshop ; echo "other shortcut commands... most can take partial podname as argument, such as [logpod front] or [deletepod order]...  pods  services secrets deployments " ; ls $MSDATAWORKSHOP_LOCATION/utils/'
-
-export PATH=$PATH:$MSDATAWORKSHOP_LOCATION/utils/
diff --git a/grabdish/order-helidon/Dockerfile b/grabdish/order-helidon/Dockerfile
new file mode 100644
index 000000000..d08f3798d
--- /dev/null
+++ b/grabdish/order-helidon/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar
\ No newline at end of file
diff --git a/grabdish/order-helidon/build.sh b/grabdish/order-helidon/build.sh
index 39e107564..e92c99206 100755
--- a/grabdish/order-helidon/build.sh
+++ b/grabdish/order-helidon/build.sh
@@ -8,19 +8,19 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=order-helidon
 IMAGE_VERSION=0.1
 
-if [ -z "DOCKER_REGISTRY" ]; then
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-mvn install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
-if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
-    exit 1
-fi
 docker push $IMAGE
 if [  $? -eq 0 ]; then
     docker rmi ${IMAGE}
diff --git a/grabdish/order-helidon/deploy.sh b/grabdish/order-helidon/deploy.sh
index a2ef870a4..26c51c519 100755
--- a/grabdish/order-helidon/deploy.sh
+++ b/grabdish/order-helidon/deploy.sh
@@ -5,6 +5,11 @@
 
 SCRIPT_DIR=$(dirname $0)
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export ORDER_PDB_NAME="$(state_get ORDER_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 echo create order-helidon deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
diff --git a/grabdish/order-helidon/pom.xml b/grabdish/order-helidon/pom.xml
index 2aa01028e..0c707d914 100755
--- a/grabdish/order-helidon/pom.xml
+++ b/grabdish/order-helidon/pom.xml
@@ -17,13 +17,14 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>order-helidon</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>order-helidon</name>
+    <name>${project.artifactId}</name>
     <description>stateful microservices demo</description>
 
     <parent>
-        <groupId>io.helidon</groupId>
-        <artifactId>helidon-project</artifactId>
+        <groupId>io.helidon.applications</groupId>
+        <artifactId>helidon-mp</artifactId>
         <version>2.2.0</version>
+        <relativePath/>
     </parent>
 
     <properties>
@@ -41,27 +42,26 @@
             </resource>
         </resources>
         <plugins>
-
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
-                    <baseImage>openjdk:11</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>0.1</imageTag>
-                    </imageTags>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
-
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -176,34 +176,10 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ojdbc10</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_core</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_cert</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>oraclepki</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-            <version>2.3.0</version>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8-production</artifactId>
+            <version>19.8.0.0</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.oracle.database.messaging</groupId>
@@ -211,9 +187,15 @@
             <version>19.3.0.0</version>
         </dependency>
         <dependency>
-            <groupId>com.oracle</groupId>
+            <groupId>com.oracle.database.soda</groupId>
             <artifactId>orajsoda</artifactId>
-            <version>1.1.0</version>
+            <version>1.1.7.1</version>
+            <exclusions>
+                <exclusion>
+                <groupId>com.oracle.database.jdbc</groupId>
+                <artifactId>ojdbc8</artifactId>
+                </exclusion>
+            </exclusions> 
         </dependency>
         <dependency>
             <groupId>javax.json.bind</groupId>
diff --git a/grabdish/setCompartmentId.sh b/grabdish/setCompartmentId.sh
deleted file mode 100755
index a6e2be5e2..000000000
--- a/grabdish/setCompartmentId.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-if [[ $1 == "" ]]
-then
-  echo Required argument MSDATAWORKSHOP_COMPARTMENT_ID not provided. The compartmentid can be copied from the OCI Console.
-  echo Usage example : ./setCompartmentId.sh ocid1.compartment.oc1..aaaaaaaaxbvaatfz6dyfqbxhmasxfyui4rjek5dnzgcbivfwvsho77myfnqq us-ashburn-1
-  exit
-fi
-
-if [[ $2 == "" ]]
-then
-  echo Required argument $MSDATAWORKSHOP_REGION not provided. The region id can be copied from the OCI Console.
-  echo Usage example : ./setCompartmentId.sh ocid1.compartment.oc1..aaaaaaaaxbvaatfz6dyfqbxhmasxfyui4rjek5dnzgcbivfwvsho77myfnqq us-ashburn-1
-  exit
-fi
-
-echo ________________________________________
-echo setting compartmentid and region ...
-echo ________________________________________
-
-export WORKINGDIR=workingdir
-echo creating working directory $WORKINGDIR to store values...
-mkdir $WORKINGDIR
-
-export MSDATAWORKSHOP_REGION=$2
-echo $MSDATAWORKSHOP_REGION | tr -d '"' > $WORKINGDIR/msdataworkshopregion.txt
-echo MSDATAWORKSHOP_REGION... $MSDATAWORKSHOP_REGION
-
-export MSDATAWORKSHOP_COMPARTMENT_ID=$1
-echo $MSDATAWORKSHOP_COMPARTMENT_ID | tr -d '"' > $WORKINGDIR/msdataworkshopcompartmentid.txt
-echo MSDATAWORKSHOP_COMPARTMENT_ID... $MSDATAWORKSHOP_COMPARTMENT_ID
diff --git a/grabdish/setJaegerAddress.sh b/grabdish/setJaegerAddress.sh
deleted file mode 100755
index a47efeb4f..000000000
--- a/grabdish/setJaegerAddress.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2021 Oracle and/or its affiliates.
-# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
-
-#It should not be necessary to run this file unless it took an extended period of time for the jaeger query service's loadbalancer to be provisisioned.
-
-export WORKINGDIR=workingdir
-echo WORKINGDIR = $WORKINGDIR
-
-echo setting jaeger address...
-kubectl get services jaeger-query -n msdataworkshop --output jsonpath='{.status.loadBalancer.ingress[0].ip}' > $WORKINGDIR/msdataworkshopjaegeraddress.txt
-
-export MSDATAWORKSHOP_JAEGER_IP=$(cat $WORKINGDIR/msdataworkshopjaegeraddress.txt)
-echo MSDATAWORKSHOP_JAEGER_IP... $MSDATAWORKSHOP_JAEGER_IP
-
-if [[ $MSDATAWORKSHOP_JAEGER_IP == "" ]]
-then
-  echo "MSDATAWORKSHOP_JAEGER_IP does not exist. Loadbalancer provisioning may still be pending. Try running ./setJaegerAddress.sh again or check the OCI console for progress."
-fi
-#443
-export JAEGER_QUERY_ADDRESS=https://$MSDATAWORKSHOP_JAEGER_IP
-echo JAEGER_QUERY_ADDRESS = $JAEGER_QUERY_ADDRESS
-echo $JAEGER_QUERY_ADDRESS > $WORKINGDIR/msdataworkshopjaegeraddress.txt
-echo Creating configmap with JAEGER_QUERY_ADDRESS for use by FrontEnd service
-kubectl create -n msdataworkshop -f - <<!
-{
-   "apiVersion": "v1",
-   "kind": "ConfigMap",
-   "metadata": {
-      "name": "jaegerqueryaddress"
-   },
-   "data": {
-      "address": "${JAEGER_QUERY_ADDRESS}"
-   }
-}
-!
diff --git a/grabdish/setup.sh b/grabdish/setup.sh
new file mode 100644
index 000000000..b1cb351b3
--- /dev/null
+++ b/grabdish/setup.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Make sure this is run via source or .
+if ! (return 0 2>/dev/null); then
+  echo "ERROR: Usage 'source setup.sh'"
+  exit
+fi
+
+if state_done SETUP; then
+  echo "The setup has been completed"
+  return
+fi
+
+SETUP_SCRIPT="$GRABDISH_HOME/utils/main-setup.sh"
+if ps -ef | grep "$SETUP_SCRIPT" | grep -v grep; then
+  echo "The $SETUP_SCRIPT is already running.  If you want to restart it then kill it and then rerun."
+else
+  $SETUP_SCRIPT 2>&1 | tee -ai $GRABDISH_LOG/main-setup.log
+fi
\ No newline at end of file
diff --git a/grabdish/supplier-helidon-se/Dockerfile b/grabdish/supplier-helidon-se/Dockerfile
new file mode 100644
index 000000000..d08f3798d
--- /dev/null
+++ b/grabdish/supplier-helidon-se/Dockerfile
@@ -0,0 +1,9 @@
+FROM openjdk:11-jre-slim
+
+ENTRYPOINT ["java", "-jar", "/usr/share/myservice/myservice.jar"]
+
+# Add Maven dependencies
+ADD target/libs           /usr/share/myservice/libs
+# Add the service itself
+ARG JAR_FILE
+ADD target/${JAR_FILE} /usr/share/myservice/myservice.jar
\ No newline at end of file
diff --git a/grabdish/supplier-helidon-se/build.sh b/grabdish/supplier-helidon-se/build.sh
index fcd85c37e..9004c508f 100755
--- a/grabdish/supplier-helidon-se/build.sh
+++ b/grabdish/supplier-helidon-se/build.sh
@@ -7,19 +7,19 @@ SCRIPT_DIR=$(dirname $0)
 IMAGE_NAME=supplier-helidon-se
 IMAGE_VERSION=0.1
 
-if [ -z "DOCKER_REGISTRY" ]; then
+export DOCKER_REGISTRY=$(state_get DOCKER_REGISTRY)
+
+if [ -z "$DOCKER_REGISTRY" ]; then
     echo "Error: DOCKER_REGISTRY env variable needs to be set!"
     exit 1
 fi
 
 export IMAGE=${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_VERSION}
 
-mvn install
-mvn package docker:build
+# mvn install
+# mvn package docker:build
+mvn package
 
-if [ $DOCKERBUILD_RETCODE -ne 0 ]; then
-    exit 1
-fi
 docker push $IMAGE
 if [  $? -eq 0 ]; then
     docker rmi ${IMAGE}
diff --git a/grabdish/supplier-helidon-se/deploy.sh b/grabdish/supplier-helidon-se/deploy.sh
index ff28a1f6e..cc8d85ed1 100755
--- a/grabdish/supplier-helidon-se/deploy.sh
+++ b/grabdish/supplier-helidon-se/deploy.sh
@@ -7,6 +7,11 @@ echo create supplier-helidon-se deployment and service...
 export CURRENTTIME=$( date '+%F_%H:%M:%S' )
 echo CURRENTTIME is $CURRENTTIME  ...this will be appended to generated deployment yaml
 
+export DOCKER_REGISTRY="$(state_get DOCKER_REGISTRY)"
+export INVENTORY_PDB_NAME="$(state_get INVENTORY_DB_NAME)"
+export OCI_REGION="$(state_get OCI_REGION)"
+export VAULT_SECRET_OCID=""
+
 #eval "cat <<'EOF'
 #$(<$SCRIPT_DIR/supplier-helidon-se-deployment.yaml)
 #EOF" > supplier-helidon-se-deployment-${CURRENTTIME}.yaml
diff --git a/grabdish/supplier-helidon-se/pom.xml b/grabdish/supplier-helidon-se/pom.xml
index 2e70735f3..0bb12ecae 100644
--- a/grabdish/supplier-helidon-se/pom.xml
+++ b/grabdish/supplier-helidon-se/pom.xml
@@ -13,19 +13,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>io.helidon</groupId>
+    <artifactId>supplier-helidon-se</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+
     <parent>
         <groupId>io.helidon.applications</groupId>
-        <artifactId>helidon-se</artifactId>
+        <artifactId>helidon-mp</artifactId>
         <version>2.2.0</version>
         <relativePath/>
     </parent>
 
-    <groupId>io.helidon</groupId>
-    <artifactId>supplier-helidon-se</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-    <name>${project.artifactId}</name>
-
     <properties>
         <helidon.version>1.4.0</helidon.version>
         <mainClass>io.helidon.data.examples.Main</mainClass>
@@ -76,24 +75,24 @@
         <plugins>
             <plugin>
                 <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <artifactId>dockerfile-maven-plugin</artifactId>
+                <version>1.4.13</version>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <imageName>${docker.image.prefix}/${project.artifactId}</imageName>
-                    <baseImage>openjdk:11</baseImage>
-                    <entryPoint>["java", "-jar", "/${project.build.finalName}.jar"]</entryPoint>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                        </resource>
-                    </resources>
-                    <imageTags>
-                        <imageTag>0.1</imageTag>
-                    </imageTags>
+                    <repository>${env.DOCKER_REGISTRY}/${project.artifactId}</repository>
+                    <tag>0.1</tag>
+                    <buildArgs>
+                        <JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
+                    </buildArgs>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -169,29 +168,10 @@
             <artifactId>helidon-health-checks</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ojdbc10</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>ucp</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_core</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>osdt_cert</artifactId>
-            <version>19.3.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.oracle.ojdbc</groupId>
-            <artifactId>oraclepki</artifactId>
-            <version>19.3.0.0</version>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8-production</artifactId>
+            <version>19.8.0.0</version>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>com.oracle.oci.sdk</groupId>
@@ -214,5 +194,4 @@
             <version>1</version>
         </dependency>
     </dependencies>
-
 </project>
\ No newline at end of file
diff --git a/grabdish/terraform/availability_domain.tf b/grabdish/terraform/availability_domain.tf
new file mode 100644
index 000000000..d84e450c1
--- /dev/null
+++ b/grabdish/terraform/availability_domain.tf
@@ -0,0 +1,14 @@
+data "oci_identity_availability_domain" "ad1" {
+  compartment_id = var.ociTenancyOcid
+  ad_number      = 1
+}
+/*
+data "oci_identity_availability_domain" "ad2" {
+  compartment_id = var.ociTenancyOcid
+  ad_number      = 2
+}
+data "oci_identity_availability_domain" "ad3" {
+  compartment_id = var.ociTenancyOcid
+  ad_number      = 3
+}
+*/
\ No newline at end of file
diff --git a/grabdish/terraform/containerengine.tf b/grabdish/terraform/containerengine.tf
new file mode 100644
index 000000000..1d15aecc7
--- /dev/null
+++ b/grabdish/terraform/containerengine.tf
@@ -0,0 +1,110 @@
+resource "oci_containerengine_cluster" "okell_cluster" {
+  #Required
+  compartment_id     = var.ociCompartmentOcid
+  endpoint_config {
+    is_public_ip_enabled = "true"
+    nsg_ids = [
+    ]
+    subnet_id = oci_core_subnet.endpoint_Subnet.id
+  }
+  kubernetes_version = "v1.19.7"
+  name               = "grabdish"
+  vcn_id             = oci_core_vcn.okell_vcn.id
+  #Optional
+  options {
+    service_lb_subnet_ids = [oci_core_subnet.svclb_Subnet.id]
+    #Optional
+    add_ons {
+      #Optional
+      is_kubernetes_dashboard_enabled = "false"
+      is_tiller_enabled               = "false"
+    }
+    admission_controller_options {
+      #Optional
+      is_pod_security_policy_enabled = "false"
+    }
+    kubernetes_network_config {
+      #Optional
+      pods_cidr     = "10.244.0.0/16"
+      services_cidr = "10.96.0.0/16"
+    }
+  }
+}
+resource "oci_containerengine_node_pool" "okell_node_pool" {
+  #Required
+  cluster_id         = oci_containerengine_cluster.okell_cluster.id
+  compartment_id     = var.ociCompartmentOcid
+  kubernetes_version = "v1.19.7"
+  name               = "Pool"
+#  node_shape="VM.Standard2.4"
+#  node_shape         = "VM.Standard.B2.1"
+  node_shape         = "VM.Standard.E2.1"
+#  node_shape         = "VM.Standard2.2"
+  #subnet_ids         = [oci_core_subnet.nodePool_Subnet_1.id]
+  #Optional
+  node_config_details {
+    placement_configs {
+      availability_domain = data.oci_identity_availability_domain.ad1.name
+      subnet_id           = oci_core_subnet.nodePool_Subnet.id
+    }
+/*    placement_configs {
+      availability_domain = data.oci_identity_availability_domain.ad2.name
+      subnet_id           = oci_core_subnet.nodePool_Subnet.id
+    }
+    placement_configs {
+      availability_domain = data.oci_identity_availability_domain.ad3.name
+      subnet_id           = oci_core_subnet.nodePool_Subnet.id
+    }
+*/
+    size = "3"
+  }
+  node_source_details {
+    #Required
+    image_id    = local.oracle_linux_images.0 # Latest
+    source_type = "IMAGE"
+    #Optional
+    #boot_volume_size_in_gbs = "60"
+  }
+  //quantity_per_subnet = 1
+  //ssh_public_key      = var.node_pool_ssh_public_key
+  //ssh_public_key =  var.resUserPublicKey
+}
+data "oci_containerengine_cluster_option" "okell_cluster_option" {
+  cluster_option_id = "all"
+}
+data "oci_containerengine_node_pool_option" "okell_node_pool_option" {
+  node_pool_option_id = "all"
+}
+locals {
+  all_sources = data.oci_containerengine_node_pool_option.okell_node_pool_option.sources
+  oracle_linux_images = [for source in local.all_sources : source.image_id if length(regexall("Oracle-Linux-[0-9]*.[0-9]*-20[0-9]*",source.source_name)) > 0]
+}
+/*
+output "cluster_kubernetes_versions" {
+  value = [data.oci_containerengine_cluster_option.okell_cluster_option.kubernetes_versions]
+}
+output "node_pool_kubernetes_version" {
+  value = [data.oci_containerengine_node_pool_option.okell_node_pool_option.kubernetes_versions]
+}
+data "oci_containerengine_cluster_kube_config" "okell_cluster_kube_config" {
+  #Required
+  cluster_id = oci_containerengine_cluster.okell_cluster.id
+  #Optional
+  token_version = "2.0.0"
+}
+resource "local_file" "okell_cluster_kube_config_file" {
+  content  = data.oci_containerengine_cluster_kube_config.okell_cluster_kube_config.content
+  filename = "${path.module}/okell_cluster_kubeconfig"
+}
+variable "InstanceImageOCID" {
+  type = map(string)
+  default = {
+    // See https://docs.us-phoenix-1.oraclecloud.com/images/
+    // Oracle-provided image "Oracle-Linux-7.5-2018.10.16-0"
+    us-phoenix-1   = "ocid1.image.oc1.phx.aaaaaaaadjnj3da72bztpxinmqpih62c2woscbp6l3wjn36by2cvmdhjub6a"
+    us-ashburn-1   = "ocid1.image.oc1.iad.aaaaaaaawufnve5jxze4xf7orejupw5iq3pms6cuadzjc7klojix6vmk42va"
+    eu-frankfurt-1 = "ocid1.image.oc1.eu-frankfurt-1.aaaaaaaagbrvhganmn7awcr7plaaf5vhabmzhx763z5afiitswjwmzh7upna"
+    uk-london-1    = "ocid1.image.oc1.uk-london-1.aaaaaaaajwtut4l7fo3cvyraate6erdkyf2wdk5vpk6fp6ycng3dv2y3ymvq"
+  }
+}
+*/
\ No newline at end of file
diff --git a/grabdish/terraform/core.tf b/grabdish/terraform/core.tf
new file mode 100644
index 000000000..3affdbe72
--- /dev/null
+++ b/grabdish/terraform/core.tf
@@ -0,0 +1,462 @@
+resource "oci_core_vcn" "okell_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = var.ociCompartmentOcid
+  display_name   = "grabdish"
+  dns_label    = "grabdish"
+}
+resource "oci_core_internet_gateway" "ig" {
+   compartment_id = var.ociCompartmentOcid
+   display_name   = "ClusterInternetGateway"
+   vcn_id         = oci_core_vcn.okell_vcn.id
+}
+/*resource "oci_core_dhcp_options" "grabdish" {
+    #Required
+    compartment_id = var.ociCompartmentOcid
+    options {
+        type = "DomainNameServer"
+        server_type = "VcnLocalPlusInternet"
+    }
+
+    options {
+        type = "SearchDomain"
+        search_domain_names = [ "grabdish.oraclevcn.com" ]
+    }
+
+    vcn_id = oci_core_vcn.okell_vcn.id
+}
+*/
+/*
+resource oci_core_private_ip prip {
+  display_name = "Service VNIC for cluster"
+  freeform_tags = {
+  }
+  hostname_label = "host-10-0-0-2"
+  ip_address     = "10.0.0.2"
+  #vlan_id = <<Optional value not found in discovery>>
+  #vnic_id = oci_core_public_ip.puip.id
+}
+data "oci_core_vnic_attachments" "vnic_attachments" {
+    #Required
+    compartment_id = var.ociCompartmentOcid
+
+    #Optional
+    availability_domain = data.oci_identity_availability_domain.ad1.name
+    #instance_id = oci_core_instance.test_instance.id
+    #vnic_id = oci_core_vnic.test_vnic.id
+}
+resource oci_core_public_ip puip {
+  compartment_id = var.ociCompartmentOcid
+  display_name = "Floating Public IP for cluster"
+  freeform_tags = {
+  }
+  lifetime      = "RESERVED"
+  private_ip_id = oci_core_private_ip.prip.id
+  #public_ip_pool_id = <<Optional value not found in discovery>>
+}
+*/
+resource oci_core_nat_gateway ngw {
+  block_traffic  = "false"
+  compartment_id = var.ociCompartmentOcid
+  display_name = "ngw"
+  freeform_tags = {
+  }
+  #public_ip_id = oci_core_public_ip.puip.id
+  vcn_id       = oci_core_vcn.okell_vcn.id
+}
+resource oci_core_service_gateway sg {
+  compartment_id = var.ociCompartmentOcid
+  display_name = "grabdish"
+  freeform_tags = {
+  }
+  #route_table_id = <<Optional value not found in discovery>>
+  services {
+    service_id = data.oci_core_services.services.services.1.id
+  }
+  vcn_id = oci_core_vcn.okell_vcn.id
+}
+resource oci_core_route_table private {
+  compartment_id = var.ociCompartmentOcid
+  display_name = "private"
+  freeform_tags = {
+  }
+  route_rules {
+    description       = "traffic to the internet"
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_nat_gateway.ngw.id
+  }
+  route_rules {
+    description       = "traffic to OCI services"
+    destination       = data.oci_core_services.services.services.1.cidr_block
+    destination_type  = "SERVICE_CIDR_BLOCK"
+    network_entity_id = oci_core_service_gateway.sg.id
+  }
+  /*
+  route_rules {
+    description       = "traffic to OCI services"
+    destination       = data.oci_core_services.services.services.1.cidr_block
+    destination_type  = "SERVICE_CIDR_BLOCK"
+    network_entity_id = oci_core_service_gateway.sg.id
+  }
+  */
+  vcn_id = oci_core_vcn.okell_vcn.id
+}
+resource oci_core_default_route_table public {
+  display_name = "public"
+  freeform_tags = {
+  }
+  manage_default_resource_id = oci_core_vcn.okell_vcn.default_route_table_id
+  route_rules {
+    description       = "traffic to/from internet"
+    destination       = "0.0.0.0/0"
+    destination_type  = "CIDR_BLOCK"
+    network_entity_id = oci_core_internet_gateway.ig.id
+  }
+}
+resource "oci_core_subnet" "endpoint_Subnet" {
+  #Required
+  #availability_domain = data.oci_identity_availability_domain.ad1.name
+  cidr_block          = "10.0.0.0/28"
+  compartment_id      = var.ociCompartmentOcid
+  vcn_id              = oci_core_vcn.okell_vcn.id
+  # Provider code tries to maintain compatibility with old versions.
+  security_list_ids   = [oci_core_security_list.endpoint.id]
+  display_name        = "SubNet1ForEndpoint"
+  prohibit_public_ip_on_vnic = "false"
+  route_table_id      = oci_core_vcn.okell_vcn.default_route_table_id
+  dns_label           = "endpoint"
+}
+resource "oci_core_subnet" "nodePool_Subnet" {
+  #Required
+  #availability_domain = data.oci_identity_availability_domain.ad1.name
+  cidr_block          = "10.0.10.0/24"
+  compartment_id      = var.ociCompartmentOcid
+  vcn_id              = oci_core_vcn.okell_vcn.id
+  # Provider code tries to maintain compatibility with old versions.
+  security_list_ids = [oci_core_security_list.nodePool.id]
+  display_name      = "SubNet1ForNodePool"
+  prohibit_public_ip_on_vnic = "true"
+  route_table_id    = oci_core_route_table.private.id
+  dns_label           = "nodepool"
+}
+resource "oci_core_subnet" "svclb_Subnet" {
+  #Required
+  #availability_domain = data.oci_identity_availability_domain.ad1.name
+  cidr_block          = "10.0.20.0/24"
+  compartment_id      = var.ociCompartmentOcid
+  vcn_id              = oci_core_vcn.okell_vcn.id
+  # Provider code tries to maintain compatibility with old versions.
+  security_list_ids = [oci_core_default_security_list.svcLB.id]
+  display_name      = "SubNet1ForSvcLB"
+  route_table_id    = oci_core_vcn.okell_vcn.default_route_table_id
+  dhcp_options_id = oci_core_vcn.okell_vcn.default_dhcp_options_id
+  prohibit_public_ip_on_vnic = "false"
+  dns_label           = "svclb"
+}
+resource oci_core_security_list nodePool {
+  compartment_id = var.ociCompartmentOcid
+  display_name = "nodepool"
+  egress_security_rules {
+    description      = "Allow pods on one worker node to communicate with pods on other worker nodes"
+    destination      = "10.0.10.0/24"
+    destination_type = "CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "all"
+    stateless = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Access to Kubernetes API Endpoint"
+    destination      = "10.0.0.0/28"
+    destination_type = "CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    tcp_options {
+      max = "6443"
+      min = "6443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Kubernetes worker to control plane communication"
+    destination      = "10.0.0.0/28"
+    destination_type = "CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    tcp_options {
+      max = "12250"
+      min = "12250"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Path discovery"
+    destination      = "10.0.0.0/28"
+    destination_type = "CIDR_BLOCK"
+    icmp_options {
+      code = "4"
+      type = "3"
+    }
+    protocol  = "1"
+    stateless = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Allow nodes to communicate with OKE to ensure correct start-up and continued functioning (0)"
+    destination      = data.oci_core_services.services.services.0.cidr_block
+    destination_type = "SERVICE_CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    tcp_options {
+      max = "443"
+      min = "443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Allow nodes to communicate with OKE to ensure correct start-up and continued functioning (1)"
+    destination      = data.oci_core_services.services.services.1.cidr_block
+    destination_type = "SERVICE_CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    tcp_options {
+      max = "443"
+      min = "443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "ICMP Access from Kubernetes Control Plane"
+    destination      = "0.0.0.0/0"
+    destination_type = "CIDR_BLOCK"
+    icmp_options {
+      code = "4"
+      type = "3"
+    }
+    protocol  = "1"
+    stateless = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Worker Nodes access to Internet"
+    destination      = "0.0.0.0/0"
+    destination_type = "CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "all"
+    stateless = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  freeform_tags = {
+  }
+  ingress_security_rules {
+    description = "Allow pods on one worker node to communicate with pods on other worker nodes"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "all"
+    source      = "10.0.10.0/24"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    description = "Path discovery"
+    icmp_options {
+      code = "4"
+      type = "3"
+    }
+    protocol    = "1"
+    source      = "10.0.0.0/28"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    description = "TCP access from Kubernetes Control Plane"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "10.0.0.0/28"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    description = "Inbound SSH traffic to worker nodes"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    tcp_options {
+      max = "22"
+      min = "22"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+/*
+  ingress_security_rules {
+    #description = <<Optional value not found in discovery>>
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "10.0.20.0/24"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    tcp_options {
+      max = "31750"
+      min = "31750"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    #description = <<Optional value not found in discovery>>
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "10.0.20.0/24"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    tcp_options {
+      max = "10256"
+      min = "10256"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+*/
+  vcn_id = oci_core_vcn.okell_vcn.id
+}
+
+resource oci_core_security_list endpoint {
+  compartment_id = var.ociCompartmentOcid
+  display_name = "endpoint"
+  egress_security_rules {
+    description      = "Allow Kubernetes Control Plane to communicate with OKE"
+    destination      = data.oci_core_services.services.services.1.cidr_block
+    destination_type = "SERVICE_CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    tcp_options {
+      max = "443"
+      min = "443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Allow Kubernetes Control Plane to communicate with OKE"
+    destination      = data.oci_core_services.services.services.0.cidr_block
+    destination_type = "SERVICE_CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    tcp_options {
+      max = "443"
+      min = "443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "All traffic to worker nodes"
+    destination      = "10.0.10.0/24"
+    destination_type = "CIDR_BLOCK"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol  = "6"
+    stateless = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  egress_security_rules {
+    description      = "Path discovery"
+    destination      = "10.0.10.0/24"
+    destination_type = "CIDR_BLOCK"
+    icmp_options {
+      code = "4"
+      type = "3"
+    }
+    protocol  = "1"
+    stateless = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  freeform_tags = {
+  }
+  ingress_security_rules {
+    description = "External access to Kubernetes API endpoint"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "0.0.0.0/0"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    tcp_options {
+      max = "6443"
+      min = "6443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    description = "Kubernetes worker to Kubernetes API endpoint communication"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "10.0.10.0/24"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    tcp_options {
+      max = "6443"
+      min = "6443"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    description = "Kubernetes worker to control plane communication"
+    #icmp_options = <<Optional value not found in discovery>>
+    protocol    = "6"
+    source      = "10.0.10.0/24"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    tcp_options {
+      max = "12250"
+      min = "12250"
+      #source_port_range = <<Optional value not found in discovery>>
+    }
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  ingress_security_rules {
+    description = "Path discovery"
+    icmp_options {
+      code = "4"
+      type = "3"
+    }
+    protocol    = "1"
+    source      = "10.0.10.0/24"
+    source_type = "CIDR_BLOCK"
+    stateless   = "false"
+    #tcp_options = <<Optional value not found in discovery>>
+    #udp_options = <<Optional value not found in discovery>>
+  }
+  vcn_id = oci_core_vcn.okell_vcn.id
+}
+
+resource oci_core_default_security_list svcLB {
+  display_name = "svcLB"
+  manage_default_resource_id = oci_core_vcn.okell_vcn.default_security_list_id
+}
+data "oci_core_services" "services" {
+}
\ No newline at end of file
diff --git a/grabdish/terraform/database.tf b/grabdish/terraform/database.tf
new file mode 100644
index 000000000..1f07d79cd
--- /dev/null
+++ b/grabdish/terraform/database.tf
@@ -0,0 +1,74 @@
+//================= create ATP Instance =======================================
+variable "autonomous_database_db_workload" { default = "OLTP" }
+variable "autonomous_database_defined_tags_value" { default = "value" }
+variable "autonomous_database_license_model" { default = "BRING_YOUR_OWN_LICENSE" }
+variable "autonomous_database_is_dedicated" { default = false }
+resource "random_string" "autonomous_database_wallet_password" {
+  length  = 16
+  special = true
+}
+resource "random_password" "database_admin_password" {
+  length  = 12
+  upper   = true
+  lower   = true
+  number  = true
+  special = false
+  min_lower = "1"
+  min_upper = "1"
+  min_numeric = "1"
+}
+resource "oci_database_autonomous_database" "autonomous_database_atp" {
+  #Required
+  admin_password           = random_password.database_admin_password.result
+  compartment_id           = var.ociCompartmentOcid
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "${var.orderDbName}"
+  # is_free_tier = true , if there exists sufficient service limit
+  is_free_tier             = false
+  #Optional #db_workload = "${var.autonomous_database_db_workload}"
+  db_workload                                    = var.autonomous_database_db_workload
+  display_name ="ORDERDB"
+  is_auto_scaling_enabled                        = "false"
+  is_preview_version_with_service_terms_accepted = "false"
+}
+resource "oci_database_autonomous_database" "autonomous_database_atp2" {
+  #Required
+  admin_password           = random_password.database_admin_password.result
+  compartment_id           = var.ociCompartmentOcid
+  cpu_core_count           = "1"
+  data_storage_size_in_tbs = "1"
+  db_name                  = "${var.inventoryDbName}" 
+  is_free_tier             = false
+  db_workload                                    = var.autonomous_database_db_workload
+  // Autonomous Database name cannot be longer than 14 characters.
+  display_name = "INVENTORYDB"
+  is_auto_scaling_enabled                        = "false"
+  is_preview_version_with_service_terms_accepted = "false"
+}
+data "oci_database_autonomous_databases" "autonomous_databases_atp" {
+  #Required
+  compartment_id = var.ociCompartmentOcid
+  #Optional
+  display_name =  "ORDERDB"
+  db_workload  = var.autonomous_database_db_workload
+}
+data "oci_database_autonomous_databases" "autonomous_databases_atp2" {
+  #Required
+  compartment_id = var.ociCompartmentOcid
+  #Optional
+  display_name = "INVENTORYDB"
+  db_workload  = var.autonomous_database_db_workload
+}
+//======= Name space details ------------------------------------------------------
+data "oci_objectstorage_namespace" "test_namespace" {
+  #Optional
+  compartment_id = var.ociCompartmentOcid
+}
+//========= Outputs ===========================
+output "ns_objectstorage_namespace" { 
+  value =  [ data.oci_objectstorage_namespace.test_namespace.namespace ]
+}
+output "autonomous_database_admin_password" {
+  value =  [ "Welcome12345" ]
+}
\ No newline at end of file
diff --git a/grabdish/terraform/main_var.tf b/grabdish/terraform/main_var.tf
new file mode 100644
index 000000000..daea09486
--- /dev/null
+++ b/grabdish/terraform/main_var.tf
@@ -0,0 +1,9 @@
+//Copyright (c) 2021 Oracle and/or its affiliates.
+//Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+variable "ociTenancyOcid" {}
+variable "ociUserOcid" {}
+variable "ociCompartmentOcid" {}
+variable "ociRegionIdentifier" {}
+variable "runName" {}
+variable "orderDbName" {}
+variable "inventoryDbName" {}
\ No newline at end of file
diff --git a/grabdish/terraform/provider.tf b/grabdish/terraform/provider.tf
new file mode 100644
index 000000000..57ea31b68
--- /dev/null
+++ b/grabdish/terraform/provider.tf
@@ -0,0 +1,3 @@
+provider "oci" {
+  region           = var.ociRegionIdentifier
+}
\ No newline at end of file
diff --git a/grabdish/terraform/repos.tf b/grabdish/terraform/repos.tf
new file mode 100644
index 000000000..c5d1fadc8
--- /dev/null
+++ b/grabdish/terraform/repos.tf
@@ -0,0 +1,51 @@
+//------- Create repos End  ------------------------------------------
+/*
+resource "oci_artifacts_container_repository" "frontend_helidon_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/frontend-helidon"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "helidonatp_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/admin-helidon"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "order-helidon_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/order-helidon"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "supplier-helidon-se_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/supplier-helidon-se"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "inventory-helidon_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/inventory-helidon"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "inventory-python_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/inventory-python"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "nodejs_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/inventory-nodejs"
+  is_public = true
+}
+resource "oci_artifacts_container_repository" "inventory-helidon-se_container_repository" {
+  #Required
+  compartment_id = "${var.ociCompartmentOcid}"
+  display_name = "${var.runName}/inventory-helidon-se"
+  is_public = true
+}
+*/
\ No newline at end of file
diff --git a/grabdish/undeploy.sh b/grabdish/undeploy.sh
new file mode 100755
index 000000000..91383b578
--- /dev/null
+++ b/grabdish/undeploy.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+MS="frontend-helidon admin-helidon order-helidon supplier-helidon-se inventory-helidon"
+for s in $MS; do 
+    echo ________________________________________
+    echo "Undeploying $s..."
+    echo ________________________________________
+    cd $GRABDISH_HOME/$s
+        ./undeploy.sh
+    cd $GRABDISH_HOME
+done
+
+echo ________________________________________
+echo ...finished
+echo ________________________________________
diff --git a/grabdish/utils/build-all.sh b/grabdish/utils/build-all.sh
new file mode 100755
index 000000000..fb4d42520
--- /dev/null
+++ b/grabdish/utils/build-all.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Provision Repos
+while ! state_done REPOS; do
+  BUILDS="frontend-helidon admin-helidon order-helidon supplier-helidon-se inventory-helidon inventory-python inventory-nodejs inventory-helidon-se inventory-dotnet inventory-go"
+  for b in $BUILDS; do 
+    oci artifacts container repository create --compartment-id "$(state_get COMPARTMENT_OCID)" --display-name "$(state_get RUN_NAME)/$b" --is-public true
+  done
+  state_set_done REPOS
+done
+
+
+# Install Graal
+while ! state_done GRAAL; do
+  if ! test -d ~/graalvm-ce-java11-20.1.0; then
+    curl -sL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-20.1.0/graalvm-ce-java11-linux-amd64-20.1.0.tar.gz | tar xz
+    mv graalvm-ce-java11-20.1.0 ~/
+  fi
+  state_set_done GRAAL
+done
+
+
+# Install GraalVM native-image...
+while ! state_done GRAAL_IMAGE; do
+  ~/graalvm-ce-java11-20.1.0/bin/gu install native-image
+  state_set_done GRAAL_IMAGE
+done
+
+
+# Wait for docker login
+while ! state_done DOCKER_REGISTRY; do
+  echo "Waiting for Docker Registry"
+  sleep 5
+done
+
+
+# Build All Done
+state_set_done BUILD_ALL
\ No newline at end of file
diff --git a/grabdish/utils/db-setup.sh b/grabdish/utils/db-setup.sh
new file mode 100755
index 000000000..6a667984f
--- /dev/null
+++ b/grabdish/utils/db-setup.sh
@@ -0,0 +1,400 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Create Object Store Bucket (Should be replaced by terraform one day)
+while ! state_done OBJECT_STORE_BUCKET; do
+  oci os bucket create --compartment-id "$(state_get COMPARTMENT_OCID)" --name "$(state_get RUN_NAME)"
+  state_set_done OBJECT_STORE_BUCKET
+done
+
+
+# Wait for Order DB OCID
+while ! state_done ORDER_DB_OCID; do
+  echo "`date`: Waiting for ORDER_DB_OCID"
+  sleep 2
+done
+
+
+# Wait for Inventory DB OCID
+while ! state_done INVENTORY_DB_OCID; do
+  echo "`date`: Waiting for INVENTORY_DB_OCID"
+  sleep 2
+done
+
+
+# Get DB Connection Wallet and to Object Store
+while ! state_done WALLET_ZIP_OBJECT; do
+  oci db autonomous-database generate-wallet --autonomous-database-id "$(state_get ORDER_DB_OCID)" --file '-' --password 'Welcome1' --generate-type 'ALL' | oci os object put --bucket-name "$(state_get RUN_NAME)" --name "wallet.zip" --file '-'
+  state_set_done WALLET_ZIP_OBJECT
+done
+
+
+# Create Authenticated Link to Wallet
+while ! state_done WALLET_ZIP_AUTH_URL; do
+  ACCESS_URI=`oci os preauth-request create --object-name 'wallet.zip' --access-type 'ObjectRead' --bucket-name "$(state_get RUN_NAME)" --name 'grabdish' --time-expires $(date '+%Y-%m-%d' --date '+7 days') --query 'data."access-uri"' --raw-output`
+  state_set WALLET_ZIP_AUTH_URL "https://objectstorage.$(state_get REGION).oraclecloud.com${ACCESS_URI}"
+done
+
+
+# Get DB Connection Wallet and to Object Store
+while ! state_done CWALLET_SSO_OBJECT; do
+  cd $GRABDISH_HOME
+  mkdir wallet
+  cd wallet
+  curl -sL "$(state_get WALLET_ZIP_AUTH_URL)" --output wallet.zip ; unzip wallet.zip ; rm wallet.zip
+  cat cwallet.sso | oci os object put --bucket-name "$(state_get RUN_NAME)" --name "cwallet.sso" --file '-'
+  rm -rf wallet
+  state_set_done CWALLET_SSO_OBJECT
+done
+
+
+# Create Authenticated Link to Wallet
+while ! state_done CWALLET_SSO_AUTH_URL; do
+  ACCESS_URI=`oci os preauth-request create --object-name 'cwallet.sso' --access-type 'ObjectRead' --bucket-name "$(state_get RUN_NAME)" --name 'grabdish' --time-expires $(date '+%Y-%m-%d' --date '+7 days') --query 'data."access-uri"' --raw-output`
+  state_set CWALLET_SSO_AUTH_URL "https://objectstorage.$(state_get REGION).oraclecloud.com${ACCESS_URI}"
+done
+
+
+# Create ATP Bindings
+while ! state_done ATP_BINDINGS; do
+  while ! state_done OKE_NAMESPACE; do
+    echo "Waiting for OKE_NAMESPACE"
+    sleep 5
+  done
+  cd $GRABDISH_HOME/atp-secrets-setup
+  ./deleteAll.sh
+  ./createAll.sh "$(state_get WALLET_ZIP_AUTH_URL)"
+  state_set_done ATP_BINDINGS
+done
+
+
+# DB Connection Setup
+export TNS_ADMIN=$GRABDISH_HOME/atp-secrets-setup/wallet
+cat - >$TNS_ADMIN/sqlnet.ora <<!
+WALLET_LOCATION = (SOURCE = (METHOD = file) (METHOD_DATA = (DIRECTORY="$TNS_ADMIN")))
+SSL_SERVER_DN_MATCH=yes
+!
+ORDER_DB_SVC="$(state_get ORDER_DB_NAME)_tp"
+INVENTORY_DB_SVC="$(state_get INVENTORY_DB_NAME)_tp"
+ORDER_USER=ORDERUSER
+INVENTORY_USER=INVENTORYUSER
+ORDER_LINK=ORDERTOINVENTORYLINK
+INVENTORY_LINK=INVENTORYTOORDERLINK
+ORDER_QUEUE=ORDERQUEUE
+INVENTORY_QUEUE=INVENTORYQUEUE
+
+
+# Wait for DB Password
+while ! state_done DB_PASSWORD; do
+  echo "`date`: Waiting for DB_PASSWORD"
+  sleep 2
+done
+
+
+# Get DB Password
+while true; do
+  if DB_PASSWORD=`kubectl get secret dbuser -n msdataworkshop --template={{.data.dbpassword}} | base64 --decode`; then
+    if ! test -z "$DB_PASSWORD"; then
+      break
+    fi
+  fi
+  echo "Error: Failed to get DB password.  Retrying..."
+  sleep 5
+done
+
+
+# Wait for DB Password to be set in Order DB
+while ! state_done ORDER_DB_PASSWORD_SET; do
+  echo "`date`: Waiting for ORDER_DB_PASSWORD_SET"
+  sleep 2
+done
+
+
+# Order DB User, Objects
+while ! state_done ORDER_USER; do
+  U=$ORDER_USER
+  SVC=$ORDER_DB_SVC
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect admin/"$DB_PASSWORD"@$SVC
+CREATE USER $U IDENTIFIED BY "$DB_PASSWORD";
+GRANT pdb_dba TO $U;
+GRANT EXECUTE ON DBMS_CLOUD_ADMIN TO $U;
+GRANT EXECUTE ON DBMS_CLOUD TO $U;
+GRANT CREATE DATABASE LINK TO $U;
+GRANT unlimited tablespace to $U;
+GRANT connect, resource TO $U;
+GRANT aq_user_role TO $U;
+GRANT EXECUTE ON sys.dbms_aqadm TO $U;
+GRANT EXECUTE ON sys.dbms_aq TO $U;
+
+GRANT SODA_APP to $U;
+
+connect $U/"$DB_PASSWORD"@$SVC
+
+BEGIN
+DBMS_AQADM.CREATE_QUEUE_TABLE (
+queue_table          => 'ORDERQUEUETABLE',
+queue_payload_type   => 'SYS.AQ\$_JMS_TEXT_MESSAGE',
+multiple_consumers   => true,
+compatible           => '8.1');
+
+DBMS_AQADM.CREATE_QUEUE (
+queue_name          => '$ORDER_QUEUE',
+queue_table         => 'ORDERQUEUETABLE');
+
+DBMS_AQADM.START_QUEUE (
+queue_name          => '$ORDER_QUEUE');
+END;
+/
+
+BEGIN
+DBMS_AQADM.CREATE_QUEUE_TABLE (
+queue_table          => 'INVENTORYQUEUETABLE',
+queue_payload_type   => 'SYS.AQ\$_JMS_TEXT_MESSAGE',
+compatible           => '8.1');
+
+DBMS_AQADM.CREATE_QUEUE (
+queue_name          => '$INVENTORY_QUEUE',
+queue_table         => 'INVENTORYQUEUETABLE');
+
+DBMS_AQADM.START_QUEUE (
+queue_name          => '$INVENTORY_QUEUE');
+END;
+/
+!
+  state_set_done ORDER_USER
+done
+
+
+# Wait for DB Password to be set in Inventory DB
+while ! state_done INVENTORY_DB_PASSWORD_SET; do
+  echo "`date`: Waiting for INVENTORY_DB_PASSWORD_SET"
+  sleep 2
+done
+
+
+# Inventory DB User, Objects
+while ! state_done INVENTORY_USER; do
+  U=$INVENTORY_USER
+  SVC=$INVENTORY_DB_SVC
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect admin/"$DB_PASSWORD"@$SVC
+CREATE USER $U IDENTIFIED BY "$DB_PASSWORD";
+GRANT pdb_dba TO $U;
+GRANT EXECUTE ON DBMS_CLOUD_ADMIN TO $U;
+GRANT EXECUTE ON DBMS_CLOUD TO $U;
+GRANT CREATE DATABASE LINK TO $U;
+GRANT unlimited tablespace to $U;
+GRANT connect, resource TO $U;
+GRANT aq_user_role TO $U;
+GRANT EXECUTE ON sys.dbms_aqadm TO $U;
+GRANT EXECUTE ON sys.dbms_aq TO $U;
+
+connect $U/"$DB_PASSWORD"@$SVC
+
+BEGIN
+DBMS_AQADM.CREATE_QUEUE_TABLE (
+queue_table          => 'ORDERQUEUETABLE',
+queue_payload_type   => 'SYS.AQ\$_JMS_TEXT_MESSAGE',
+compatible           => '8.1');
+
+DBMS_AQADM.CREATE_QUEUE (
+queue_name          => '$ORDER_QUEUE',
+queue_table         => 'ORDERQUEUETABLE');
+
+DBMS_AQADM.START_QUEUE (
+queue_name          => '$ORDER_QUEUE');
+END;
+/
+
+BEGIN
+DBMS_AQADM.CREATE_QUEUE_TABLE (
+queue_table          => 'INVENTORYQUEUETABLE',
+queue_payload_type   => 'SYS.AQ\$_JMS_TEXT_MESSAGE',
+multiple_consumers   => true,
+compatible           => '8.1');
+
+DBMS_AQADM.CREATE_QUEUE (
+queue_name          => '$INVENTORY_QUEUE',
+queue_table         => 'INVENTORYQUEUETABLE');
+
+DBMS_AQADM.START_QUEUE (
+queue_name          => '$INVENTORY_QUEUE');
+END;
+/
+
+create table inventory (
+  inventoryid varchar(16) PRIMARY KEY NOT NULL, 
+  inventorylocation varchar(32), 
+  inventorycount integer CONSTRAINT positive_inventory CHECK (inventorycount >= 0) );
+
+insert into inventory values ('sushi', '1468 WEBSTER ST,San Francisco,CA', 0);
+insert into inventory values ('pizza', '1469 WEBSTER ST,San Francisco,CA', 0);
+insert into inventory values ('burger', '1470 WEBSTER ST,San Francisco,CA', 0);
+commit;
+!
+  state_set_done INVENTORY_USER
+done
+
+
+# Order DB Link"
+while ! state_done ORDER_DB_LINK; do
+  U=$ORDER_USER
+  SVC=$ORDER_DB_SVC
+  TU=$INVENTORY_USER
+  TSVC=$INVENTORY_DB_SVC
+  TTNS=`grep "^$TSVC " $TNS_ADMIN/tnsnames.ora`
+  LINK=$ORDER_LINK
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect $U/"$DB_PASSWORD"@$SVC
+BEGIN
+  DBMS_CLOUD.GET_OBJECT(
+    object_uri => '$(state_get CWALLET_SSO_AUTH_URL)',
+    directory_name => 'DATA_PUMP_DIR');
+
+  DBMS_CLOUD.CREATE_CREDENTIAL(
+    credential_name => 'CRED',
+    username => '$TU',
+    password => '$DB_PASSWORD');
+
+  DBMS_CLOUD_ADMIN.CREATE_DATABASE_LINK(
+    db_link_name => '$LINK',
+    hostname => '`grep -oP '(?<=host=).*?(?=\))' <<<"$TTNS"`',
+    port => '`grep -oP '(?<=port=).*?(?=\))' <<<"$TTNS"`',
+    service_name => '`grep -oP '(?<=service_name=).*?(?=\))' <<<"$TTNS"`',
+    ssl_server_cert_dn => '`grep -oP '(?<=ssl_server_cert_dn=\").*?(?=\"\))' <<<"$TTNS"`',
+    credential_name => 'CRED',
+    directory_name => 'DATA_PUMP_DIR');
+END;
+/
+!
+  state_set_done ORDER_DB_LINK
+done
+
+# Inventory DB Link
+while ! state_done INVENTORY_DB_LINK; do
+  U=$INVENTORY_USER
+  SVC=$INVENTORY_DB_SVC
+  TU=$ORDER_USER
+  TSVC=$ORDER_DB_SVC
+  TTNS=`grep "^$TSVC " $TNS_ADMIN/tnsnames.ora`
+  LINK=$INVENTORY_LINK
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect $U/"$DB_PASSWORD"@$SVC
+BEGIN
+  DBMS_CLOUD.GET_OBJECT(
+    object_uri => '$(state_get CWALLET_SSO_AUTH_URL)',
+    directory_name => 'DATA_PUMP_DIR');
+
+  DBMS_CLOUD.CREATE_CREDENTIAL(
+    credential_name => 'CRED',
+    username => '$TU',
+    password => '$DB_PASSWORD');
+
+  DBMS_CLOUD_ADMIN.CREATE_DATABASE_LINK(
+    db_link_name => '$LINK',
+    hostname => '`grep -oP '(?<=host=).*?(?=\))' <<<"$TTNS"`',
+    port => '`grep -oP '(?<=port=).*?(?=\))' <<<"$TTNS"`',
+    service_name => '`grep -oP '(?<=service_name=).*?(?=\))' <<<"$TTNS"`',
+    ssl_server_cert_dn => '`grep -oP '(?<=ssl_server_cert_dn=\").*?(?=\"\))' <<<"$TTNS"`',
+    credential_name => 'CRED',
+    directory_name => 'DATA_PUMP_DIR');
+END;
+/
+!
+  state_set_done INVENTORY_DB_LINK
+done
+
+
+# Order Queues and Propagation
+while ! state_done ORDER_PROPAGATION; do
+  U=$ORDER_USER
+  SVC=$ORDER_DB_SVC
+  TU=$INVENTORY_USER
+  TSVC=$INVENTORY_DB_SVC
+  LINK=$ORDER_LINK
+  Q=$ORDER_QUEUE
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect $U/$DB_PASSWORD@$SVC
+BEGIN
+DBMS_AQADM.add_subscriber(
+   queue_name=>'$Q',
+   subscriber=>sys.aq\$_agent(null,'$TU.$Q@$LINK',0),
+   queue_to_queue => true);
+END;
+/
+
+BEGIN
+dbms_aqadm.schedule_propagation
+      (queue_name        => '$U.$Q'
+      ,destination_queue => '$TU.$Q'
+      ,destination       => '$LINK'
+      ,start_time        => sysdate --immediately
+      ,duration          => null    --until stopped
+      ,latency           => 0);     --No gap before propagating
+END;
+/
+!
+  state_set_done ORDER_PROPAGATION
+done
+
+
+# Inventory Queues and Propagation
+while ! state_done INVENTORY_PROPAGATION; do
+  U=$INVENTORY_USER
+  SVC=$INVENTORY_DB_SVC
+  TU=$ORDER_USER
+  TSVC=$ORDER_DB_SVC
+  LINK=$INVENTORY_LINK
+  Q=$INVENTORY_QUEUE
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect $U/$DB_PASSWORD@$SVC
+BEGIN
+DBMS_AQADM.add_subscriber(
+   queue_name=>'$Q',
+   subscriber=>sys.aq\$_agent(null,'$TU.$Q@$LINK',0),
+   queue_to_queue => true);
+END;
+/
+
+BEGIN
+dbms_aqadm.schedule_propagation
+      (queue_name        => '$U.$Q'
+      ,destination_queue => '$TU.$Q'
+      ,destination       => '$LINK'
+      ,start_time        => sysdate --immediately
+      ,duration          => null    --until stopped
+      ,latency           => 0);     --No gap before propagating
+END;
+/
+!
+  state_set_done INVENTORY_PROPAGATION
+done
+
+
+# .net Inventory DB Proc
+while ! state_done DOT_NET_INVENTORY_DB_PROC; do
+  U=$INVENTORY_USER
+  SVC=$INVENTORY_DB_SVC
+  sqlplus /nolog <<!
+WHENEVER SQLERROR EXIT 1
+connect $U/$DB_PASSWORD@$SVC
+@$GRABDISH_HOME/inventory-dotnet/dequeueenqueue.sql
+!
+  state_set_done DOT_NET_INVENTORY_DB_PROC
+done
+
+
+# DB Setup Done
+state_set_done "DB_SETUP"
\ No newline at end of file
diff --git a/grabdish/utils/java-builds.sh b/grabdish/utils/java-builds.sh
new file mode 100755
index 000000000..e2670b512
--- /dev/null
+++ b/grabdish/utils/java-builds.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Wait for docker login
+while ! state_done DOCKER_REGISTRY; do
+  echo "Waiting for Docker Registry"
+  sleep 5
+done
+
+
+# Build all the images (no push) except frontend-helidon (requires Jaeger)
+while ! state_done JAVA_BUILDS; do
+  BUILDS="frontend-helidon admin-helidon order-helidon supplier-helidon-se inventory-helidon inventory-helidon-se"
+  for b in $BUILDS; do 
+    cd $GRABDISH_HOME/$b
+    time ./build.sh
+  done
+  state_set_done JAVA_BUILDS
+done
\ No newline at end of file
diff --git a/grabdish/utils/lb-destroy.sh b/grabdish/utils/lb-destroy.sh
new file mode 100755
index 000000000..09fe142ac
--- /dev/null
+++ b/grabdish/utils/lb-destroy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Delete LBs
+echo "Deleting Load Balancers"
+LBIDS=`oci lb load-balancer list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ',data[*].id)" --raw-output`
+for lb in $LBIDS; do
+  oci lb load-balancer delete --load-balancer-id "$lb" --force
+done
\ No newline at end of file
diff --git a/grabdish/utils/main-destroy.sh b/grabdish/utils/main-destroy.sh
new file mode 100755
index 000000000..52a112292
--- /dev/null
+++ b/grabdish/utils/main-destroy.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Switch to SSH Key auth for the oci cli (workaround to perm issue awaiting fix)
+source $GRABDISH_HOME/utils/oci-cli-cs-key-auth.sh
+
+
+# Remove from .bashrc
+sed -i.bak '/grabdish/d' ~/.bashrc
+
+
+# Run the os-destroy.sh in the background
+if ps -ef | grep "$GRABDISH_HOME/utils/os-destroy.sh" | grep -v grep; then
+  echo "$GRABDISH_HOME/utils/os-destroy.sh is already running"
+else
+  echo "Executing os-destroy.sh in the background"
+  nohup $GRABDISH_HOME/utils/os-destroy.sh &>> $GRABDISH_LOG/os-destroy.log &
+fi
+
+
+# Run the repo-destroy.sh in the background
+if ps -ef | grep "$GRABDISH_HOME/utils/repo-destroy.sh" | grep -v grep; then
+  echo "$GRABDISH_HOME/utils/repo-destroy.sh is already running"
+else
+  echo "Executing repo-destroy.sh in the background"
+  nohup $GRABDISH_HOME/utils/repo-destroy.sh &>> $GRABDISH_LOG/repo-destroy.log &
+fi
+
+
+# Run the lb-destroy.sh in the background
+if ps -ef | grep "$GRABDISH_HOME/utils/lb-destroy.sh" | grep -v grep; then
+  echo "$GRABDISH_HOME/utils/lb-destroy.sh is already running"
+else
+  echo "Executing lb-destroy.sh in the background"
+  nohup $GRABDISH_HOME/utils/lb-destroy.sh &>> $GRABDISH_LOG/lb-destroy.log &
+fi
+
+
+# Terraform Destroy
+echo "Running terraform destroy"
+cd $GRABDISH_HOME/terraform
+export TF_VAR_ociTenancyOcid="$(state_get TENANCY_OCID)"
+export TF_VAR_ociUserOcid="$(state_get USER_OCID)"
+export TF_VAR_ociCompartmentOcid="$(state_get COMPARTMENT_OCID)"
+export TF_VAR_ociRegionIdentifier="$(state_get REGION)"
+export TF_VAR_runName="$(state_get RUN_NAME)"
+export TF_VAR_orderDbName="$(state_get ORDER_DB_NAME)"
+export TF_VAR_inventoryDbName="$(state_get INVENTORY_DB_NAME)"
+terraform destroy -auto-approve
diff --git a/grabdish/utils/main-setup.sh b/grabdish/utils/main-setup.sh
new file mode 100755
index 000000000..774531def
--- /dev/null
+++ b/grabdish/utils/main-setup.sh
@@ -0,0 +1,394 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+# Check home is set
+if test -z "$GRABDISH_HOME"; then
+  echo "ERROR: This script requires GRABDISH_HOME to be set"
+  exit
+fi
+
+
+# Get the User OCID
+while ! state_done USER_OCID; do
+  read -p "Please enter your OCI user's OCID: " USER_OCID
+  # Validate
+  if test ""`oci iam user get --user-id "$USER_OCID" --query 'data."lifecycle-state"' --raw-output 2>$GRABDISH_LOG/user_ocid_err` == 'ACTIVE'; then
+    state_set USER_OCID "$USER_OCID"
+  else
+    echo "That user OCID could not be validated"
+    cat $GRABDISH_LOG/user_ocid_err
+  fi
+done
+
+
+# Get User Name
+while ! state_done USER_NAME; do
+  USER_NAME=`oci iam user get --user-id "$(state_get USER_OCID)" --query "data.name" --raw-output`
+  state_set USER_NAME "$USER_NAME"
+done
+
+
+# Identify Run Type
+while ! state_done RUN_TYPE; do
+  if [[ "$USERNAME" =~ LL[0-9]{1,5}-USER$ ]]; then
+    # Green Button
+    state_set RUN_TYPE "3"
+  else
+    state_set RUN_TYPE "1" 
+  fi
+done
+
+
+if test "$(state_get RUN_TYPE)" == '3'; then
+  state_set RESERVATION_ID `grep -oP '(?<=LL).*?(?=-USER)' <<<"$(state_get USER_NAME)"`
+fi
+
+
+# Get Run Name from directory name
+while ! state_done RUN_NAME; do
+  cd $GRABDISH_HOME
+  cd ../..
+  # Validate that a folder was creared
+  if test "$PWD" == ~; then 
+    echo "ERROR: The workshop is not installed in a separate folder."
+    exit
+  fi
+  RN=`basename "$PWD"`
+  # Validate run name.  Must be between 1 and 12 characters, only letters or numbers, starting with letter
+  if [[ "$RN" =~ [a-zA-Z][a-zA-Z0-9]{0,11}$ ]]; then
+    state_set RUN_NAME "$RN"
+    state_set ORDER_DB_NAME "${RN}o"
+    state_set INVENTORY_DB_NAME "${RN}i"
+  else
+    echo "Invalid folder name $RN"
+    exit
+  fi
+  cd $GRABDISH_HOME
+done
+
+
+# Get the tenancy OCID
+while ! state_done TENANCY_OCID; do
+  state_set TENANCY_OCID "$OCI_TENANCY" # Set in cloud shell env
+done
+
+
+# Double check and then set the region
+while ! state_done REGION; do
+  HOME_REGION=`oci iam region-subscription list --query 'data[?"is-home-region"]."region-name" | join('\'' '\'', @)' --raw-output`
+  state_set REGION "$OCI_REGION" # Set in cloud shell env
+  state_set HOME_REGION "$HOME_REGION"
+done
+
+
+# Create the compartment
+while ! state_done COMPARTMENT_OCID; do
+  echo "Resources will be created in a new compartment named $(state_get RUN_NAME)"
+  COMPARTMENT_OCID=`oci iam compartment create --compartment-id "$(state_get TENANCY_OCID)" --name "$(state_get RUN_NAME)" --description "GribDish Workshop" --query 'data.id' --raw-output`
+  while ! test `oci iam compartment get --compartment-id "$COMPARTMENT_OCID" --query 'data."lifecycle-state"' --raw-output`"" == 'ACTIVE'; do
+    echo "Waiting for the compartment to become ACTIVE"
+    sleep 2
+  done
+  state_set COMPARTMENT_OCID "$COMPARTMENT_OCID"
+done
+
+
+# Switch to SSH Key auth for the oci cli (workaround to perm issue awaiting fix)
+source $GRABDISH_HOME/utils/oci-cli-cs-key-auth.sh
+
+
+# Run the terraform.sh in the background
+if ! state_get PROVISIONING; then
+  if ps -ef | grep "$GRABDISH_HOME/utils/terraform.sh" | grep -v grep; then
+    echo "$GRABDISH_HOME/utils/terraform.sh is already running"
+  else
+    echo "Executing terraform.sh in the background"
+    nohup $GRABDISH_HOME/utils/terraform.sh &>> $GRABDISH_LOG/terraform.log &
+  fi
+fi
+
+
+# Get Namespace
+while ! state_done NAMESPACE; do
+  NAMESPACE=`oci os ns get --compartment-id "$(state_get COMPARTMENT_OCID)" --query "data" --raw-output`
+  state_set NAMESPACE "$NAMESPACE"
+done
+
+
+# login to docker
+while ! state_done DOCKER_REGISTRY; do
+  export OCI_CLI_PROFILE=$(state_get HOME_REGION)
+  if ! TOKEN=`oci iam auth-token create  --user-id "$(state_get USER_OCID)" --description 'grabdish docker login' --query 'data.token' --raw-output 2>$GRABDISH_LOG/docker_registry_err`; then
+    if grep UserCapacityExceeded $GRABDISH_LOG/docker_registry_err >/dev/null; then 
+      # The key already exists
+      echo 'ERROR: Failed to create auth token.  Please delete an old token from the OCI Console (Profile -> User Settings -> Auth Tokens).'
+      read -p "Hit return when you are ready to retry?"
+    else
+      echo "ERROR: Creating auth token had failed:"
+      cat $GRABDISH_LOG/docker_registry_err
+      exit
+    fi
+  else
+    sleep 5 # Allow time for the auth token to come into effect
+    RETRIES=0
+    while test $RETRIES -le 10; do
+      if echo "$TOKEN" | docker login -u "$(state_get NAMESPACE)/$(state_get USER_NAME)" --password-stdin "$(state_get REGION).ocir.io"; then
+        state_set DOCKER_REGISTRY "$(state_get REGION).ocir.io/$(state_get NAMESPACE)/$(state_get RUN_NAME)"
+        break
+      else
+        echo "Docker login failed.  Retrying"
+        RETRIES=$((RETRIES+1))
+        sleep 5
+      fi
+    done
+  fi
+  unset OCI_CLI_PROFILE
+done
+
+
+# Run the build-all.sh in the background
+if ! state_get BUILD_ALL; then
+  if ps -ef | grep "$GRABDISH_HOME/utils/build-all.sh" | grep -v grep; then
+    echo "$GRABDISH_HOME/utils/build-all.sh is already running"
+  else
+    echo "Executing build-all.sh in the background"
+    nohup $GRABDISH_HOME/utils/build-all.sh &>> $GRABDISH_LOG/build-all.log &
+  fi
+fi
+
+
+## Run the java-builds.sh in the background
+if ! state_get JAVA_BUILDS; then
+  if ps -ef | grep "$GRABDISH_HOME/utils/java-builds.sh" | grep -v grep; then
+    echo "$GRABDISH_HOME/utils/java-builds.sh is already running"
+  else
+    echo "Executing java-builds.sh in the background"
+    nohup $GRABDISH_HOME/utils/java-builds.sh &>> $GRABDISH_LOG/java-builds.log &
+  fi
+fi
+
+
+# Run the non-java-builds.sh in the background
+if ! state_get NON_JAVA_BUILDS; then
+  if ps -ef | grep "$GRABDISH_HOME/utils/non-java-builds.sh" | grep -v grep; then
+    echo "$GRABDISH_HOME/utils/non-java-builds.sh is already running"
+  else
+    echo "Executing non-java-builds.sh in the background"
+    nohup $GRABDISH_HOME/utils/non-java-builds.sh &>> $GRABDISH_LOG/non-java-builds.log &
+  fi
+fi
+
+
+# run oke-setup.sh in background
+if ! state_get OKE_SETUP; then
+  if ps -ef | grep "$GRABDISH_HOME/utils/oke-setup.sh" | grep -v grep; then
+    echo "$GRABDISH_HOME/utils/oke-setup.sh is already running"
+  else
+    echo "Executing oke-setup.sh in the background"
+    nohup $GRABDISH_HOME/utils/oke-setup.sh &>>$GRABDISH_LOG/oke-setup.log &
+  fi
+fi
+
+
+# run db-setup.sh in background
+if ! state_get DB_SETUP; then
+  if ps -ef | grep "$GRABDISH_HOME/utils/db-setup.sh" | grep -v grep; then
+    echo "$GRABDISH_HOME/utils/db-setup.sh is already running"
+  else
+    echo "Executing db-setup.sh in the background"
+    nohup $GRABDISH_HOME/utils/db-setup.sh &>>$GRABDISH_LOG/db-setup.log &
+  fi
+fi
+
+
+# Wait for provisioning
+if ! state_done PROVISIONING; then
+  echo "`date`: Waiting for terraform provisioning"
+  while ! state_done PROVISIONING; do
+    LOGLINE=`tail -1 $GRABDISH_LOG/terraform.log`
+    echo -ne r"\033[2K\r${LOGLINE:0:120}"
+    sleep 2
+  done
+  echo
+fi
+
+
+# Get Order DB OCID
+while ! state_done ORDER_DB_OCID; do
+  ORDER_DB_OCID=`oci db autonomous-database list --compartment-id "$(cat state/COMPARTMENT_OCID)" --query 'join('"' '"',data[?"display-name"=='"'ORDERDB'"'].id)' --raw-output`
+  if [[ "$ORDER_DB_OCID" =~ ocid1.autonomousdatabase* ]]; then
+    state_set ORDER_DB_OCID "$ORDER_DB_OCID"
+  else
+    echo "ERROR: Incorrect Order DB OCID: $ORDER_DB_OCID"
+    exit
+  fi
+done
+
+
+# Get Inventory DB OCID
+while ! state_done INVENTORY_DB_OCID; do
+  INVENTORY_DB_OCID=`oci db autonomous-database list --compartment-id "$(cat state/COMPARTMENT_OCID)" --query 'join('"' '"',data[?"display-name"=='"'INVENTORYDB'"'].id)' --raw-output`
+  if [[ "$INVENTORY_DB_OCID" =~ ocid1.autonomousdatabase* ]]; then
+    state_set INVENTORY_DB_OCID "$INVENTORY_DB_OCID"
+  else
+    echo "ERROR: Incorrect Inventory DB OCID: $INVENTORY_DB_OCID"
+    exit
+  fi
+done
+
+
+# Wait for kubectl Setup
+if ! state_done OKE_NAMESPACE; then
+  echo "`date`: Waiting for kubectl configuration and msdataworkshop namespace"
+  while ! state_done OKE_NAMESPACE; do
+    LOGLINE=`tail -1 $GRABDISH_LOG/state.log`
+    echo -ne r"\033[2K\r${LOGLINE:0:120}"
+    sleep 2
+  done
+  echo
+fi
+
+
+# Collect DB password and create secret
+while ! state_done DB_PASSWORD; do
+  echo
+  echo 'Database passwords must be 12 to 30 characters and contain at least one uppercase letter,'
+  echo 'one lowercase letter, and one number. The password cannot contain the double quote (")'
+  echo 'character or the word "admin".'
+  echo
+
+  while true; do
+    read -s -r -p "Enter the password to be used for the order and inventory databases: " PW
+      if [[ ${#PW} -ge 12 && ${#PW} -le 30 && "$PW" =~ [A-Z] && "$PW" =~ [a-z] && "$PW" =~ [0-9] && "$PW" != *admin* && "$PW" != *'"'* ]]; then
+      echo
+      break
+    else
+      echo "Invalid Password, please retry"
+    fi
+  done
+
+  #Set password in OKE secret
+  BASE64_DB_PASSWORD=`echo -n "$PW" | base64`
+  
+  while true; do
+    if kubectl create -n msdataworkshop -f -; then
+      state_set_done DB_PASSWORD
+      break
+    else
+      echo 'Error: Creating DB Password Secret Failed.  Retrying...'
+      sleep 10
+    fi <<!
+{
+   "apiVersion": "v1",
+   "kind": "Secret",
+   "metadata": {
+      "name": "dbuser"
+   },
+   "data": {
+      "dbpassword": "${BASE64_DB_PASSWORD}"
+   }
+}
+!
+  done
+done
+
+
+# Collect UI password and create secret
+while ! state_done UI_PASSWORD; do
+  echo
+  echo 'UI passwords must be 8 to 30 characters'
+  echo
+
+  while true; do
+    read -s -r -p "Enter the password to be used for accessing the UI: " PW
+      if [[ ${#PW} -ge 8 && ${#PW} -le 30 ]]; then
+      echo
+      break
+    else
+      echo "Invalid Password, please retry"
+    fi
+  done
+
+  #Set password in OKE secret
+  BASE64_UI_PASSWORD=`echo -n "$PW" | base64`
+
+  while true; do
+    if kubectl create -n msdataworkshop -f -; then
+      state_set_done UI_PASSWORD
+      break
+    else
+      echo 'Error: Creating UI Password Secret Failed.  Retrying...'
+      sleep 10
+    fi <<!
+{
+   "apiVersion": "v1",
+   "kind": "Secret",
+   "metadata": {
+      "name": "frontendadmin"
+   },
+   "data": {
+      "password": "${BASE64_UI_PASSWORD}"
+   }
+}
+!
+  done
+done
+
+
+# Set admin password in order database
+while ! state_done ORDER_DB_PASSWORD_SET; do
+  # get password from vault secret
+  DB_PASSWORD=`kubectl get secret dbuser -n msdataworkshop --template={{.data.dbpassword}} | base64 --decode`
+  umask 177
+  echo '{"adminPassword": "'"$DB_PASSWORD"'"}' > temp_params
+  umask 22
+  oci db autonomous-database update --autonomous-database-id "$(state_get ORDER_DB_OCID)" --from-json "file://temp_params" >/dev/null
+  rm temp_params
+  state_set_done ORDER_DB_PASSWORD_SET
+done
+
+
+# Set admin password in inventory database
+while ! state_done INVENTORY_DB_PASSWORD_SET; do
+  # get password from vault secret
+  DB_PASSWORD=`kubectl get secret dbuser -n msdataworkshop --template={{.data.dbpassword}} | base64 --decode`
+  umask 177
+  echo '{"adminPassword": "'"$DB_PASSWORD"'"}' > temp_params
+  umask 22 
+
+  oci db autonomous-database update --autonomous-database-id "$(state_get INVENTORY_DB_OCID)" --from-json "file://temp_params" >/dev/null
+  rm temp_params
+  state_set_done INVENTORY_DB_PASSWORD_SET
+done
+
+
+ps -ef | grep "$GRABDISH_HOME/utils" | grep -v grep
+
+
+# Verify Setup
+# bgs="BUILD_ALL JAVA_BUILDS NON_JAVA_BUILDS OKE_SETUP DB_SETUP PROVISIONING"
+bgs="BUILD_ALL JAVA_BUILDS OKE_SETUP DB_SETUP PROVISIONING"
+while ! state_done SETUP_VERIFIED; do
+  NOT_DONE=0
+  bg_not_done=
+  for bg in $bgs; do
+    if state_done $bg; then
+      echo "$bg completed"
+    else
+      echo "$bg has not completed"
+      NOT_DONE=$((NOT_DONE+1))
+      bg_not_done="$bg_not_done $bg"
+    fi
+  done
+  if test "$NOT_DONE" -gt 0; then
+    echo "Log files are located in $GRABDISH_LOG"
+    bgs=$bg_not_done
+    sleep 10
+  else
+    state_set_done SETUP_VERIFIED
+  fi
+done
\ No newline at end of file
diff --git a/grabdish/utils/non-java-builds.sh b/grabdish/utils/non-java-builds.sh
new file mode 100755
index 000000000..f2f70a148
--- /dev/null
+++ b/grabdish/utils/non-java-builds.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Wait for docker login
+while ! state_done DOCKER_REGISTRY; do
+  echo "Waiting for Docker Registry"
+  sleep 5
+done
+
+
+# Wait for docker login
+while ! state_done REPOS; do
+  echo "Waiting for Docker Registry"
+  sleep 5
+done
+
+
+# Build all the images (no push) except frontend-helidon (requires Jaeger)
+while ! state_done NON_JAVA_BUILDS; do
+  BUILDS="inventory-python inventory-nodejs inventory-dotnet inventory-go"
+  for b in $BUILDS; do 
+    cd $GRABDISH_HOME/$b
+    time ./build.sh
+  done
+  state_set_done NON_JAVA_BUILDS
+done
\ No newline at end of file
diff --git a/grabdish/utils/oci-cli-cs-key-auth.sh b/grabdish/utils/oci-cli-cs-key-auth.sh
new file mode 100644
index 000000000..6ea1f1a13
--- /dev/null
+++ b/grabdish/utils/oci-cli-cs-key-auth.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Make sure this is run via source or .
+if ! (return 0 2>/dev/null); then
+  echo "ERROR: Usage: 'source utils/oci-cli-cs-key-auth.sh"
+  exit
+fi
+
+# Create Keys
+if ! test -f ~/.oci/oci_api_key.pem; then
+  echo "When asked for a passphrase, hit return (empty passphrase).  DO NOT ENTER A PASSPHRASE!"
+  oci setup keys --overwrite --passphrase "" 
+fi
+
+# Push Public Key to OCI
+while ! state_done PUSH_OCI_CLI_KEY; do
+  export OCI_CLI_PROFILE=$(state_get HOME_REGION)
+  if ! oci iam user api-key upload --user-id $(state_get USER_OCID) --key-file ~/.oci/oci_api_key_public.pem &>$GRABDISH_LOG/err; then
+    if grep KeyAlreadyExists $GRABDISH_LOG/err >/dev/null; then 
+      # The key already exists
+      state_set_done PUSH_OCI_CLI_KEY
+    else
+      echo 'ERROR: Failed to upload key.  Please delete old keys to make way for the new key and I will try again in 10 seconds'
+      sleep 10
+    fi
+  else
+    state_set_done PUSH_OCI_CLI_KEY
+  fi
+  unset OCI_CLI_PROFILE
+done
+
+# Get fingerprint
+FINGERPRINT=`openssl rsa -pubout -outform DER -in ~/.oci/oci_api_key.pem 2>/dev/null | openssl md5 -c | awk '{print $2}'`
+
+# Create config file
+umask 177
+cat >~/.oci/config <<!
+[DEFAULT]
+user=$(state_get USER_OCID)
+fingerprint=$FINGERPRINT
+key_file=~/.oci/oci_api_key.pem
+tenancy=${OCI_TENANCY}
+region=${OCI_REGION}
+[$(state_get HOME_REGION)]
+user=$(state_get USER_OCID)
+fingerprint=$FINGERPRINT
+key_file=~/.oci/oci_api_key.pem
+tenancy=${OCI_TENANCY}
+region=$(state_get HOME_REGION)
+!
+umask 22
+
+# unset OCI_CLI variables
+unset OCI_CLI_PROFILE
+unset OCI_CLI_CONFIG_FILE
+unset OCI_AUTH
+unset OCI_CLI_CLOUD_SHELL
+unset OCI_CLI_AUTH
+unset OCI_CONFIG_PROFILE
+unset OCI_CONFIG_FILE
+unset OCI_AUTH_TYPE
+unset OCI_DELEGATION_TOKEN_FILE
\ No newline at end of file
diff --git a/grabdish/utils/oke-setup.sh b/grabdish/utils/oke-setup.sh
new file mode 100755
index 000000000..728f8a939
--- /dev/null
+++ b/grabdish/utils/oke-setup.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Create SSL Certs
+while ! state_done SSL; do
+  mkdir -p $GRABDISH_HOME/tls
+  openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout $GRABDISH_HOME/tls/tls.key -out $GRABDISH_HOME/tls/tls.crt -subj "/CN=grabdish/O=grabdish"
+  state_set_done SSL
+done
+
+
+# Wait for provisioning
+while ! state_done PROVISIONING; do
+  echo "`date`: Waiting for terraform provisioning"
+  sleep 10
+done
+
+
+# Get OKE OCID
+while ! state_done OKE_OCID; do
+  OKE_OCID=`oci ce cluster list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ',data[*].id)" --raw-output`
+  state_set OKE_OCID "$OKE_OCID"
+  # Wait for OKE to warm up
+done
+
+
+# Setup Cluster Access
+while ! state_done KUBECTL; do
+  oci ce cluster create-kubeconfig --cluster-id "$(state_get OKE_OCID)"
+  state_set_done KUBECTL
+done
+
+
+# Wait for OKE nodes to become redy
+while true; do
+  READY_NODES=`kubectl get nodes | grep Ready | wc -l` || echo 'Ignoring any Error'
+  if test "$READY_NODES" -eq 3; then
+    echo "3 OKE nodes are ready"
+    break
+  fi
+  echo "Waiting for OKE nodes to become ready"
+  sleep 10
+done
+
+
+# Create OKE Namespace
+while ! state_done OKE_NAMESPACE; do
+  if kubectl create ns msdataworkshop; then
+    state_set_done OKE_NAMESPACE
+  else
+    echo "Failed to create namespace.  Retrying..."
+    sleep 10
+  fi
+done
+
+
+# Create SSL Secret
+while ! state_done SSL_SECRET; do
+  if kubectl create secret tls ssl-certificate-secret --key $GRABDISH_HOME/tls/tls.key --cert $GRABDISH_HOME/tls/tls.crt -n msdataworkshop; then
+    state_set_done SSL_SECRET
+  else
+    echo "SSL Secret creation failed.  Retrying..."
+    sleep 10
+  fi
+done
+
+
+# Provision Load Balancer
+while ! state_done LB; do
+  if kubectl create -f $GRABDISH_HOME/frontend-helidon/frontend-service.yaml -n msdataworkshop; then
+    state_set_done LB
+  else
+    echo "Load Balancer creation failed.  Retrying..."
+    sleep 10
+  fi
+done
+
+
+# Install Jaeger
+while ! state_done JAEGER; do
+  if kubectl create -f https://tinyurl.com/yc52x6q5 -n msdataworkshop 2>$GRABDISH_LOG/jaeger_err; then
+    state_set_done JAEGER
+  else
+    echo "Jaeger installation failed.  Retrying..."
+    cat $GRABDISH_LOG/jaeger_err
+    sleep 10
+  fi
+done
+
+
+state_set_done OKE_SETUP
\ No newline at end of file
diff --git a/grabdish/utils/os-destroy.sh b/grabdish/utils/os-destroy.sh
new file mode 100755
index 000000000..c9cc9d13d
--- /dev/null
+++ b/grabdish/utils/os-destroy.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+# Delete Object Store
+echo "Deleting Object Store"
+# Per-auth
+PARIDS=`oci os preauth-request list --bucket-name "$(state_get RUN_NAME)" --query "join(' ',data[*].id)" --raw-output`
+for id in $PARIDS; do
+    oci os preauth-request delete --par-id "$id" --bucket-name "$(state_get RUN_NAME)" --force
+done
+ 
+# Object
+if state_done WALLET_ZIP_OBJECT; then
+  oci os object delete --object-name "wallet.zip" --bucket-name "$(state_get RUN_NAME)" --force
+  state_reset WALLET_ZIP_OBJECT
+fi
+
+# Object
+if state_done CWALLET_SSO_OBJECT; then
+  oci os object delete --object-name "cwallet.sso" --bucket-name "$(state_get RUN_NAME)" --force
+  state_reset CWALLET_SSO_OBJECT
+fi
+
+# Bucket
+if state_done OBJECT_STORE_BUCKET; then
+   oci os bucket delete --force --bucket-name "$(state_get RUN_NAME)" --force
+ state_reset OBJECT_STORE_BUCKET
+fi
diff --git a/grabdish/utils/repo-destroy.sh b/grabdish/utils/repo-destroy.sh
new file mode 100755
index 000000000..0fa446c95
--- /dev/null
+++ b/grabdish/utils/repo-destroy.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Delete Images
+echo "Deleting Images"
+IIDS=`oci artifacts container image list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ',data.items[*].id)" --raw-output`
+for i in $IIDS; do
+  oci artifacts container image delete --image-id "$i" --force
+done
+
+# Delete Repos
+echo "Deleting Repositories"
+REPO_IDS=`oci artifacts container repository list --compartment-id "$(state_get COMPARTMENT_OCID)" --query "join(' ', data.items[*].id)" --raw-output`
+for r in $REPO_IDS; do 
+  oci artifacts container repository delete --repository-id "$r" --force
+done
+
diff --git a/grabdish/utils/state-functions.sh b/grabdish/utils/state-functions.sh
new file mode 100644
index 000000000..470667013
--- /dev/null
+++ b/grabdish/utils/state-functions.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Make sure this is run via source or .
+if ! (return 0 2>/dev/null); then
+  echo "ERROR: Usage: 'source state-functions.sh"
+  exit
+fi
+
+if test -z "$GRABDISH_HOME"; then
+  echo "ERROR: The grabdish home folder was not set"
+else
+  mkdir -p $GRABDISH_HOME/state
+fi
+
+# Test if the state is done (file exists) 
+function state_done() {
+  test -f $GRABDISH_HOME/state/"$1"
+}
+
+# Set the state to done
+function state_set_done() {
+  touch $GRABDISH_HOME/state/"$1"
+  echo "`date`: $1" >>$GRABDISH_LOG/state.log
+  echo "$1 completed"
+}
+
+# Set the state to done and it's value
+function state_set() {
+  echo "$2" > $GRABDISH_HOME/state/"$1"
+  echo "`date`: $1: $2" >>$GRABDISH_LOG/state.log
+  echo "$1: $2" 
+}
+
+# Reset the state - not done and no value
+function state_reset() {
+  rm -f $GRABDISH_HOME/state/"$1"
+}
+
+# Get state value
+function state_get() {
+    if ! state_done "$1"; then
+        return 1
+    fi
+    cat $GRABDISH_HOME/state/"$1"
+}
+
+# Export the functions so that they are available to subshells
+export -f state_done
+export -f state_set_done
+export -f state_set
+export -f state_reset
+export -f state_get
\ No newline at end of file
diff --git a/grabdish/utils/terraform.sh b/grabdish/utils/terraform.sh
new file mode 100755
index 000000000..e15465fa6
--- /dev/null
+++ b/grabdish/utils/terraform.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Provision Cluster, DBs, etc with terraform (and wait)
+if ! state_done PROVISIONING; then
+  cd $GRABDISH_HOME/terraform
+  export TF_VAR_ociTenancyOcid="$(state_get TENANCY_OCID)"
+  export TF_VAR_ociUserOcid="$(state_get USER_OCID)"
+  export TF_VAR_ociCompartmentOcid="$(state_get COMPARTMENT_OCID)"
+  export TF_VAR_ociRegionIdentifier="$(state_get REGION)"
+  export TF_VAR_runName="$(state_get RUN_NAME)"
+  export TF_VAR_orderDbName="$(state_get ORDER_DB_NAME)"
+  export TF_VAR_inventoryDbName="$(state_get INVENTORY_DB_NAME)"
+   if ! terraform init; then
+    echo 'ERROR: terraform init failed!'
+    exit
+  fi
+  if ! terraform apply -auto-approve; then
+    echo 'ERROR: terraform apply failed!'
+    exit
+  fi
+  cd $GRABDISH_HOME
+  state_set_done PROVISIONING
+fi
+
+
diff --git a/grabdish/utils/vault-setup.sh b/grabdish/utils/vault-setup.sh
new file mode 100755
index 000000000..cf7252de8
--- /dev/null
+++ b/grabdish/utils/vault-setup.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+
+# Fail on error
+set -e
+
+
+# Vault
+while ! state_done VAULT_OCID; do
+  # Create a vault
+  VAULT_OCID=`oci kms management vault create --compartment-id $(state_get COMPARTMENT_OCID) --display-name 'grabdish' --vault-type DEFAULT --query 'data.id' --raw-output`
+  while test ""`oci kms management vault get --vault-id "$VAULT_OCID" --query 'data."lifecycle-state"' --raw-output` != 'ACTIVE'; do
+    sleep 2
+  done
+  state_set VAULT_OCID "$VAULT_OCID"
+done
+
+
+# Vault Key
+while ! state_done VAULT_KEY_OCID; do
+  # Create a vault
+  while ! MGMT_ENDPOINT=`oci kms management vault get --vault-id $(state_get VAULT_OCID) --query 'data."management-endpoint"' --raw-output`; do
+    echo "Waiting for vault"
+    sleep 5
+  done
+  VAULT_KEY_OCID=`oci kms management key create --compartment-id $(state_get COMPARTMENT_OCID) --display-name "default" --key-shape '{"algorithm":"AES","length":"32"}' --endpoint "$MGMT_ENDPOINT" --query 'data.id' --raw-output`
+  state_set VAULT_KEY_OCID "$VAULT_KEY_OCID"
+done
+
+
+# Vault Dynamic Group
+while ! state_done VAULT_DG_OCID; do
+  RULE="All {instance.compartment.id = '$(state_get COMPARTMENT_OCID)'}"
+  DG_OCID=`oci iam dynamic-group create --name "$(state_get RUN_NAME)" --description "grabdish" --matching-rule "$RULE" --query 'data.id' --raw-output`
+  state_set VAULT_DG_OCID "$DG_OCID"
+done
+
+
+# Vault Key
+while ! state_done VAULT_POLICY_OCID; do
+  POLICY='["'"Allow dynamic-group $(state_get RUN_NAME) to manage secret-family in compartment id $(state_get COMPARTMENT_OCID) where target.vault.id = '$(state_get VAULT_OCID)'"'"]'
+  POLICY_OCID=`oci iam policy create --compartment-id $(state_get COMPARTMENT_OCID) --name "$(state_get RUN_NAME)" --description "grabdish" --statements "$POLICY" --query 'data.id' --raw-output`
+  state_set VAULT_POLICY_OCID "$POLICY_OCID"
+done
+
+state_set_done VAULT_SETUP
\ No newline at end of file