diff --git a/config.xml b/config.xml
index 5807fb219d89853fc2d23a30bd6af728d690c4b3..3835b7688cb37656701941d69574724317abf681 100644
--- a/config.xml
+++ b/config.xml
@@ -759,10 +759,10 @@
         <string>Deploy_DHP_HRA_Prod</string>
         <string>Deploy_DHP_HRB_Prod</string>
         <string>Deploy_Expert_CHM_Production</string>
-        <string>Deploy_TW_AWS_CHMB_Prod</string>
-        <string>Deploy_TW_AWS_Form_Prod</string>
-        <string>Deploy_TW_AWS_HRA_Prod</string>
-        <string>Deploy_TW_AWS_HRB_oAuth</string>
+        <string>Deploy_Expert_CHMB_Production</string>
+        <string>Deploy_Expert_HRA_Production</string>
+        <string>Deploy_Expert_HRB_OAuth_Production</string>
+        <string>Deploy_Expert_Questionnaire_Production</string>
         <string>Deploy_TW_AWS_HRB_Prod</string>
         <string>Deploy_TW_AWS_HRB_Resource</string>
       </jobNames>
diff --git a/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml b/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml
deleted file mode 100644
index 53a45cba10659fee8d7af3015398cb554521b7e5..0000000000000000000000000000000000000000
--- a/jobs/Deploy_TW_AWS_HRB_oAuth/config.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version='1.1' encoding='UTF-8'?>
-<maven2-moduleset plugin="maven-plugin@3.2">
-  <actions/>
-  <description></description>
-  <keepDependencies>false</keepDependencies>
-  <properties>
-    <hudson.security.AuthorizationMatrixProperty>
-      <inheritanceStrategy class="org.jenkinsci.plugins.matrixauth.inheritance.NonInheritingStrategy"/>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Create:ExpertAdmin</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Create:scott</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Delete:ExpertAdmin</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Delete:scott</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.ManageDomains:ExpertAdmin</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.ManageDomains:scott</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Update:ExpertAdmin</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.Update:scott</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.View:ExpertAdmin</permission>
-      <permission>com.cloudbees.plugins.credentials.CredentialsProvider.View:scott</permission>
-      <permission>hudson.model.Item.Build:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Build:scott</permission>
-      <permission>hudson.model.Item.Cancel:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Cancel:scott</permission>
-      <permission>hudson.model.Item.Configure:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Configure:scott</permission>
-      <permission>hudson.model.Item.Delete:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Delete:scott</permission>
-      <permission>hudson.model.Item.Discover:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Discover:scott</permission>
-      <permission>hudson.model.Item.Move:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Move:scott</permission>
-      <permission>hudson.model.Item.Read:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Read:scott</permission>
-      <permission>hudson.model.Item.Workspace:ExpertAdmin</permission>
-      <permission>hudson.model.Item.Workspace:scott</permission>
-      <permission>hudson.model.Run.Delete:ExpertAdmin</permission>
-      <permission>hudson.model.Run.Delete:scott</permission>
-      <permission>hudson.model.Run.Replay:ExpertAdmin</permission>
-      <permission>hudson.model.Run.Replay:scott</permission>
-      <permission>hudson.model.Run.Update:ExpertAdmin</permission>
-      <permission>hudson.model.Run.Update:scott</permission>
-      <permission>hudson.scm.SCM.Tag:ExpertAdmin</permission>
-      <permission>hudson.scm.SCM.Tag:scott</permission>
-    </hudson.security.AuthorizationMatrixProperty>
-    <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
-      <gitLabConnection>ylhealth</gitLabConnection>
-    </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
-    <hudson.model.ParametersDefinitionProperty>
-      <parameterDefinitions>
-        <hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition plugin="global-variable-string-parameter@1.2">
-          <name>AWS_CHM_EXPERT_AP</name>
-          <description></description>
-          <defaultValue>13.231.136.128</defaultValue>
-          <trim>false</trim>
-        </hudson.plugins.global__variable__string__parameter.GlobalVariableStringParameterDefinition>
-      </parameterDefinitions>
-    </hudson.model.ParametersDefinitionProperty>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>1</daysToKeep>
-        <numToKeep>5</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
-  </properties>
-  <scm class="hudson.plugins.git.GitSCM" plugin="git@3.10.0">
-    <configVersion>2</configVersion>
-    <userRemoteConfigs>
-      <hudson.plugins.git.UserRemoteConfig>
-        <url>https://cm.ylhealth.org/gitlab/ym/HRB_Authorization_Server.git</url>
-        <credentialsId>3485e854-8389-40e8-8c86-b94e94e91904</credentialsId>
-      </hudson.plugins.git.UserRemoteConfig>
-    </userRemoteConfigs>
-    <branches>
-      <hudson.plugins.git.BranchSpec>
-        <name>expert_develop</name>
-      </hudson.plugins.git.BranchSpec>
-    </branches>
-    <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
-    <submoduleCfg class="list"/>
-    <extensions/>
-  </scm>
-  <assignedNode>AWS_BUILD_Machine</assignedNode>
-  <canRoam>false</canRoam>
-  <disabled>false</disabled>
-  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
-  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
-  <triggers/>
-  <concurrentBuild>false</concurrentBuild>
-  <rootModule>
-    <groupId>org.ylhealth.ym.hrb.oauth</groupId>
-    <artifactId>authservice</artifactId>
-  </rootModule>
-  <goals>clean package -Poptimize -Dmaven.test.skip=true -DskipTests=true</goals>
-  <defaultGoals>spring-boot:run</defaultGoals>
-  <aggregatorStyleBuild>true</aggregatorStyleBuild>
-  <incrementalBuild>false</incrementalBuild>
-  <ignoreUpstremChanges>false</ignoreUpstremChanges>
-  <ignoreUnsuccessfulUpstreams>false</ignoreUnsuccessfulUpstreams>
-  <archivingDisabled>true</archivingDisabled>
-  <siteArchivingDisabled>false</siteArchivingDisabled>
-  <fingerprintingDisabled>false</fingerprintingDisabled>
-  <resolveDependencies>false</resolveDependencies>
-  <processPlugins>false</processPlugins>
-  <mavenValidationLevel>-1</mavenValidationLevel>
-  <runHeadless>false</runHeadless>
-  <disableTriggerDownstreamProjects>false</disableTriggerDownstreamProjects>
-  <blockTriggerWhenBuilding>true</blockTriggerWhenBuilding>
-  <settings class="jenkins.mvn.DefaultSettingsProvider"/>
-  <globalSettings class="jenkins.mvn.DefaultGlobalSettingsProvider"/>
-  <reporters>
-    <hudson.maven.reporters.MavenMailer>
-      <recipients>$PreSale_Group $QA_Group</recipients>
-      <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
-      <sendToIndividuals>false</sendToIndividuals>
-      <perModuleEmail>true</perModuleEmail>
-    </hudson.maven.reporters.MavenMailer>
-  </reporters>
-  <publishers>
-    <jenkins.plugins.slack.SlackNotifier plugin="slack@2.24">
-      <baseUrl></baseUrl>
-      <teamDomain></teamDomain>
-      <authToken></authToken>
-      <tokenCredentialId></tokenCredentialId>
-      <botUser>false</botUser>
-      <room></room>
-      <startNotification>false</startNotification>
-      <notifySuccess>false</notifySuccess>
-      <notifyAborted>true</notifyAborted>
-      <notifyNotBuilt>true</notifyNotBuilt>
-      <notifyUnstable>true</notifyUnstable>
-      <notifyRegression>false</notifyRegression>
-      <notifyFailure>true</notifyFailure>
-      <notifyEveryFailure>false</notifyEveryFailure>
-      <notifyBackToNormal>true</notifyBackToNormal>
-      <notifyRepeatedFailure>false</notifyRepeatedFailure>
-      <includeTestSummary>false</includeTestSummary>
-      <includeFailedTests>false</includeFailedTests>
-      <commitInfoChoice>NONE</commitInfoChoice>
-      <includeCustomMessage>false</includeCustomMessage>
-      <customMessage></customMessage>
-      <customMessageSuccess></customMessageSuccess>
-      <customMessageAborted></customMessageAborted>
-      <customMessageNotBuilt></customMessageNotBuilt>
-      <customMessageUnstable></customMessageUnstable>
-      <customMessageFailure></customMessageFailure>
-    </jenkins.plugins.slack.SlackNotifier>
-  </publishers>
-  <buildWrappers>
-    <hudson.plugins.ws__cleanup.PreBuildCleanup plugin="ws-cleanup@0.37">
-      <deleteDirs>false</deleteDirs>
-      <cleanupParameter></cleanupParameter>
-      <externalDelete></externalDelete>
-      <disableDeferredWipeout>false</disableDeferredWipeout>
-    </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.9"/>
-  </buildWrappers>
-  <prebuilders>
-    <hudson.tasks.Shell>
-      <command>VAR=$(git rev-parse --short HEAD)_$(date +&quot;%Y%m%d_%H%M&quot;)
-version=$(echo $GIT_BRANCH | cut -d&apos;/&apos; -f 3)
-# sed -i &quot;s/&lt;title.*/&lt;title ng-bind=&apos;page_title&apos;&gt;CRM v${version}_${VAR}&lt;\/title\/&gt;/&quot; src/main/resources/static/index.html
-# sed -i &quot;s/&lt;title.*/&lt;title ng-bind=&apos;page_title&apos;&gt;CRM v${version}_${VAR}&lt;\/title\/&gt;/&quot; src/main/resources/static/indexMinify.html
-</command>
-    </hudson.tasks.Shell>
-  </prebuilders>
-  <postbuilders>
-    <hudson.tasks.Shell>
-      <command>PROD_FILE=authservice-pack.zip
-KEY_FILE=../../jenkins
-TARGET_HOST=jenkins@${AWS_CHM_EXPERT_AP}
-SSH_PROXY=&quot;ProxyCommand ssh -i ${KEY_FILE} proxy@10.57.117.130 nc %h %p&quot;
-
-ssh -i ${KEY_FILE} -o &quot;${SSH_PROXY}&quot; ${TARGET_HOST} &quot;rm -f ${PROD_FILE}&quot;
-scp -i ${KEY_FILE} -o &quot;${SSH_PROXY}&quot; target/${PROD_FILE} ${TARGET_HOST}:~/</command>
-    </hudson.tasks.Shell>
-  </postbuilders>
-  <runPostStepsIfResult>
-    <name>SUCCESS</name>
-    <ordinal>0</ordinal>
-    <color>BLUE</color>
-    <completeBuild>true</completeBuild>
-  </runPostStepsIfResult>
-</maven2-moduleset>
\ No newline at end of file