diff --git a/jobs/HRB_Mobile_UAT_apk_CodePush/config.xml b/jobs/HRB_Mobile_UAT_apk_CodePush/config.xml
index 57af19bf5e9e80a5070f5b88e2fc2d74a4a91afa..5404014acb48063ca661a49e404412b9be9b4d77 100644
--- a/jobs/HRB_Mobile_UAT_apk_CodePush/config.xml
+++ b/jobs/HRB_Mobile_UAT_apk_CodePush/config.xml
@@ -5,14 +5,6 @@
 </description>
   <keepDependencies>false</keepDependencies>
   <properties>
-    <jenkins.model.BuildDiscarderProperty>
-      <strategy class="hudson.tasks.LogRotator">
-        <daysToKeep>-1</daysToKeep>
-        <numToKeep>5</numToKeep>
-        <artifactDaysToKeep>-1</artifactDaysToKeep>
-        <artifactNumToKeep>-1</artifactNumToKeep>
-      </strategy>
-    </jenkins.model.BuildDiscarderProperty>
     <com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty plugin="gitlab-plugin@1.5.12">
       <gitLabConnection>ylhealth</gitLabConnection>
     </com.dabsquared.gitlabjenkins.connection.GitLabConnectionProperty>
@@ -46,6 +38,14 @@ hotfix/1.14.1GA</description>
         </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.11.0">
     <configVersion>2</configVersion>
@@ -64,7 +64,7 @@ hotfix/1.14.1GA</description>
     <submoduleCfg class="list"/>
     <extensions/>
   </scm>
-  <assignedNode>Mac_Node</assignedNode>
+  <assignedNode>MAC_BUILD_Machine</assignedNode>
   <canRoam>false</canRoam>
   <disabled>false</disabled>
   <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
@@ -84,9 +84,9 @@ hotfix/1.14.1GA</description>
       <externalDelete></externalDelete>
       <disableDeferredWipeout>false</disableDeferredWipeout>
     </hudson.plugins.ws__cleanup.PreBuildCleanup>
-    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.10"/>
     <hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.6.2">
       <colorMapName>xterm</colorMapName>
     </hudson.plugins.ansicolor.AnsiColorBuildWrapper>
+    <hudson.plugins.timestamper.TimestamperBuildWrapper plugin="timestamper@1.10"/>
   </buildWrappers>
 </project>
\ No newline at end of file