diff --git a/Jenkinsfile b/Jenkinsfile
index a676768039..523304f3d7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -163,7 +163,7 @@ spec:
             env
             bash -x ${WORKSPACE}/docker/build_jakartaeetck.sh
           """
-          archiveArtifacts artifacts: "jakartaeetck-bundles/*.zip,glassfish.version", allowEmptyArchive: true
+          archiveArtifacts artifacts: "jakartaeetck-bundles/*.zip,*.version", allowEmptyArchive: true
           stash includes: 'jakartaeetck-bundles/*.zip', name: 'jakartaeetck-bundles'
         }
       }
@@ -182,17 +182,6 @@ spec:
       }
     }
  
-    stage('jakartaeetck-publish-reports') {
-      when {
-        expression {
-          return params.BUILD_TYPE == 'CTS';
-        }
-      }
-      steps {
-        build job: 'jakartaeetck-publish-reports', propagate: false, quietPeriod: 3, wait: false
-      }
-    }
-
     stage('standalone-tck-build') {
       when {
         expression {
@@ -206,7 +195,7 @@ spec:
             env
             bash -x ${WORKSPACE}/docker/build_standalone-tcks.sh ${standalone_tcks}
           """
-          archiveArtifacts artifacts: "standalone-bundles/*.zip,glassfish.version", allowEmptyArchive: true
+          archiveArtifacts artifacts: "standalone-bundles/*.zip,*.version", allowEmptyArchive: true
           stash includes: 'standalone-bundles/*.zip', name: 'standalone-bundles'
         }
       }
@@ -224,16 +213,5 @@ spec:
         }
       }
     }
-
-    stage('standalonetck-publish-reports') {
-      when {
-        expression {
-          return params.BUILD_TYPE == 'STANDALONE-TCK';
-        }
-      }
-      steps {
-        build job: 'standalonetck-publish-reports', propagate: false, quietPeriod: 3, wait: false
-      }
-    }
   }
 }
diff --git a/docker/build_jakartaeetck.sh b/docker/build_jakartaeetck.sh
index fbc7aa91a5..8bfc99e61b 100755
--- a/docker/build_jakartaeetck.sh
+++ b/docker/build_jakartaeetck.sh
@@ -99,6 +99,18 @@ mkdir -p $BASEDIR/internal/docs/javaee/
 cp $BASEDIR/internal/docs/dtd/*.dtd $BASEDIR/internal/docs/javaee/
 ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=j2ee -Ddeliverable.version=8.0 -Dskip.createbom="true" -Dskip.build="true" -Dbasedir=$BASEDIR/release/tools j2ee
 
+ant -f $BASEDIR/release/tools/build.xml -Ddeliverabledir=j2ee -Ddeliverable.version=8.0 -Dskip.createbom="true" -Dskip.build="true" -Dbasedir=$BASEDIR/release/tools smoke
+
 mkdir -p ${WORKSPACE}/jakartaeetck-bundles
 cd ${WORKSPACE}/jakartaeetck-bundles
-cp ${WORKSPACE}/release/JAVAEE_BUILD/latest/javaeetck*.zip ${WORKSPACE}/jakartaeetck-bundles/javaeetck.zip
+cp ${WORKSPACE}/release/JAVAEE_BUILD/latest/*.zip ${WORKSPACE}/jakartaeetck-bundles/
+
+#Generate Version file
+rm -f ${WORKSPACE}/jakartaeetck-bundles/javaeetck.version
+touch ${WORKSPACE}/jakartaeetck-bundles/javaeetck.version
+GIT_HASH=`git rev-parse HEAD`
+GIT_BRANCH=`git branch | awk '{print $2}'`
+BUILD_DATE=`date`
+echo "Git Revision: ${GIT_HASH}" >> ${WORKSPACE}/jakartaeetck-bundles/javaeetck.version
+echo "Git Branch: ${GIT_BRANCH}" >> ${WORKSPACE}/jakartaeetck-bundles/javaeetck.version
+echo "Build Date: ${BUILD_DATE}" >> ${WORKSPACE}/jakartaeetck-bundles/javaeetck.version
diff --git a/docker/build_standalone-tcks.sh b/docker/build_standalone-tcks.sh
index 9b7c47151b..fc1f5c9d6f 100755
--- a/docker/build_standalone-tcks.sh
+++ b/docker/build_standalone-tcks.sh
@@ -72,6 +72,14 @@ fi
 DOC_SPECIFIC_PROPS=""
 JAXWS_SPECIFIC_PROPS=""
 
+#Generate Version file
+GIT_HASH=`git rev-parse HEAD`
+GIT_BRANCH=`git branch | awk '{print $2}'`
+BUILD_DATE=`date`
+echo "Git Revision: ${GIT_HASH}" >> ${WORKSPACE}/version.info
+echo "Git Branch: ${GIT_BRANCH}" >> ${WORKSPACE}/version.info
+echo "Build Date: ${BUILD_DATE}" >> ${WORKSPACE}/version.info
+
 
 if [ ! -z "$TCK_BUNDLE_BASE_URL" ]; then
   mkdir -p ${WORKSPACE}/standalone-bundles/
@@ -233,5 +241,8 @@ for tck in ${TCK_LIST[@]}; do
     strippedEntry=`echo "$entry" | cut -d_ -f1`
     echo "copying ${WORKSPACE}/release/${UPPER_TCK}_BUILD/latest/$entry to ${WORKSPACE}/standalone-bundles/${strippedEntry}_latest.zip"
     cp ${WORKSPACE}/release/${UPPER_TCK}_BUILD/latest/$entry ${WORKSPACE}/standalone-bundles/${strippedEntry}_latest.zip
+    cp ${WORKSPACE}/version.info ${WORKSPACE}/standalone-bundles/${strippedEntry}.version
   done
 done
+
+
diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh
index c171e3d12a..a83d13590a 100755
--- a/docker/run_jakartaeetck.sh
+++ b/docker/run_jakartaeetck.sh
@@ -321,7 +321,7 @@ ${CTS_HOME}/ri/glassfish5/glassfish/bin/asadmin --user admin --passwordfile ${AD
 ### restartRI.sh ends here #####
 
 ### Registry server initialization starts here
-if [ "jaxr" == ${test_suite} ];then
+if [ "jaxr" == ${test_suite} || "smoke" == ${test_suite} ];then
   if [ -f $JWSDP_HOME/bin/startup.sh ]; then
     $JWSDP_HOME/bin/startup.sh
     sleep 10
@@ -330,7 +330,7 @@ if [ "jaxr" == ${test_suite} ];then
 fi
 ### Registry server initialization ends here
 
-if [ "securityapi" == ${test_suite} ]; then
+if [ "securityapi" == ${test_suite} || "smoke" == ${test_suite} ]; then
   cd $TS_HOME/bin;
   ant init.ldap
   echo "LDAP initilized for securityapi"
@@ -341,9 +341,13 @@ cd $TS_HOME/bin;
 echo "ant start.auto.deployment.server > /tmp/deploy.out 2>&1 & "
 ant start.auto.deployment.server > /tmp/deploy.out 2>&1 &
 ### ctsStartStandardDeploymentServer.sh ends here #####
- 
+
 cd $TS_HOME/bin
-ant -f xml/impl/glassfish/s1as.xml run.cts -Dant.opts="${CTS_ANT_OPTS} ${ANT_OPTS}" -Dtest.areas="${test_suite}"
+if [ "smoke" == ${test_suite} ]; then
+  ant -f xml/impl/glassfish/smoke.xml -Dreport.dir=${JT_REPORT_DIR}/smoke -Dant.opts="${CTS_ANT_OPTS} ${ANT_OPTS}" smoke
+else
+  ant -f xml/impl/glassfish/s1as.xml run.cts -Dant.opts="${CTS_ANT_OPTS} ${ANT_OPTS}" -Dtest.areas="${test_suite}"
+fi 
 
 # Check if there are any failures in the test. If so, re-run those tests.
 FAILED_COUNT=0