diff --git a/jjb/dcae/apod-cdap.yaml b/jjb/dcae/apod-cdap.yaml
index 6dbccca..2a2d65f 100644
--- a/jjb/dcae/apod-cdap.yaml
+++ b/jjb/dcae/apod-cdap.yaml
@@ -3,18 +3,6 @@
 - project:
     name: dcae-apod-cdap
     project-name: 'dcae-apod-cdap'
-    jobs:
-      - '{project-name}-{stream}-two-scm-verify-script'
-
-
-    #   script:         build script to execute
-    #   extra-project:  extra gerrit project to checkout
-    #   extra-refspec:  refspec for the extra project
-    #   extra-branch:   branch to checkout for the extra project
-    #   checkout-dir:   directory to checkout the extra project to
-    #                     DO NOT SET THIS TO anything that translates to
-    #                     $WORKSPACE as it will destroy the initial
-    #                     project checkout
 
     project: 'dcae/apod/cdap'
     stream:
@@ -23,10 +11,22 @@
     mvn-settings: 'dcae-apod-cdap-settings'
     files: '**'
     archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
+    build-node: ubuntu1604-docker-8c-8g
+    mvn-goals: '--version'
+    mvn-goals-versioning: '--version'
     extra-project: 'dcae/apod/buildtools'
     extra-branch: 'master'
     extra-refspec: 'refs/heads/{branch}'
     checkout-dir: 'dcae-apod-buildtools'
-    script:
-        !include-raw-escape: 'include-raw-apod-cdap.sh'
+    jobs:
+      - '{project-name}-{stream}-daily-release-2scm-mvn-script':
+          maven-deploy-properties: |
+              deployAtEnd=true
+          script:
+            !include-raw-escape: 'script-apod-cdap-daily-release.sh'
+      - '{project-name}-{stream}-verify-2scm-mvn-script':
+          script:
+            !include-raw-escape: 'script-apod-cdap-verify.sh'
+      - '{project-name}-{stream}-merge-2scm-mvn-script':
+          script:
+            !include-raw-escape: 'script-apod-cdap-merge.sh'
diff --git a/jjb/dcae/include-raw-apod-cdap.sh b/jjb/dcae/script-apod-cdap-daily-release.sh
old mode 100644
new mode 100755
similarity index 84%
rename from jjb/dcae/include-raw-apod-cdap.sh
rename to jjb/dcae/script-apod-cdap-daily-release.sh
index 0094fd6..23d32eb
--- a/jjb/dcae/include-raw-apod-cdap.sh
+++ b/jjb/dcae/script-apod-cdap-daily-release.sh
@@ -2,8 +2,8 @@
 # Create a debian package and push to remote repo
 #
 set -x
-echo '===================== STARTING SCRIPT TO CREATE DEBIAN FILE ======================='
-# Extract the username, password and path to the nexus repo from the maven settings file
+echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
+# Extract the username and password to the nexus repo from the settings file
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
 OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
@@ -75,13 +75,13 @@
 echo "Contents of output directory"
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
 
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
+echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
 
-echo '===================== ENDING SCRIPT TO CREATE DEBIAN FILE ======================='
+echo '================= ENDING SCRIPT TO CREATE DEBIAN FILE ==================='
diff --git a/jjb/dcae/include-raw-apod-cdap.sh b/jjb/dcae/script-apod-cdap-merge.sh
old mode 100644
new mode 100755
similarity index 84%
copy from jjb/dcae/include-raw-apod-cdap.sh
copy to jjb/dcae/script-apod-cdap-merge.sh
index 0094fd6..23d32eb
--- a/jjb/dcae/include-raw-apod-cdap.sh
+++ b/jjb/dcae/script-apod-cdap-merge.sh
@@ -2,8 +2,8 @@
 # Create a debian package and push to remote repo
 #
 set -x
-echo '===================== STARTING SCRIPT TO CREATE DEBIAN FILE ======================='
-# Extract the username, password and path to the nexus repo from the maven settings file
+echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
+# Extract the username and password to the nexus repo from the settings file
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
 OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
@@ -75,13 +75,13 @@
 echo "Contents of output directory"
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
 
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
+echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
 
-echo '===================== ENDING SCRIPT TO CREATE DEBIAN FILE ======================='
+echo '================= ENDING SCRIPT TO CREATE DEBIAN FILE ==================='
diff --git a/jjb/dcae/include-raw-apod-cdap.sh b/jjb/dcae/script-apod-cdap-verify.sh
old mode 100644
new mode 100755
similarity index 84%
copy from jjb/dcae/include-raw-apod-cdap.sh
copy to jjb/dcae/script-apod-cdap-verify.sh
index 0094fd6..23d32eb
--- a/jjb/dcae/include-raw-apod-cdap.sh
+++ b/jjb/dcae/script-apod-cdap-verify.sh
@@ -2,8 +2,8 @@
 # Create a debian package and push to remote repo
 #
 set -x
-echo '===================== STARTING SCRIPT TO CREATE DEBIAN FILE ======================='
-# Extract the username, password and path to the nexus repo from the maven settings file
+echo '================= STARTING SCRIPT TO CREATE DEBIAN FILE ================='
+# Extract the username and password to the nexus repo from the settings file
 USER=$(xpath -q -e "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE")
 PASS=$(xpath -q -e "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE")
 OPENECOMP_NEXUS_REPO="${NEXUSPROXY}/content/sites/raw"
@@ -75,13 +75,13 @@
 echo "Contents of output directory"
 ls -lR ${OUTPUT_DIR}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus Repo: ${SEND_TO}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE}"
+echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE} ${SEND_TO}
 
-SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae.apod.cdap/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
+SEND_TO="${OPENECOMP_NEXUS_REPO}/org.openecomp.dcae/deb-snapshots/${PACKAGE_GROUP_ID}/${OUTPUT_FILE_DATE_STAMPED}"
 
-echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus Repo: ${SEND_TO}"
+echo "Sending ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} to Nexus: ${SEND_TO}"
 curl -vkn --netrc-file "${NETRC}" --upload-file ${OUTPUT_DIR}/${OUTPUT_FILE_DATE_STAMPED} ${SEND_TO}
 
-echo '===================== ENDING SCRIPT TO CREATE DEBIAN FILE ======================='
+echo '================= ENDING SCRIPT TO CREATE DEBIAN FILE ==================='