diff --git a/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml b/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml
index 58d85546..4bbdc1cf 100644
--- a/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml
+++ b/ansible/roles/system-init-TSG-X-P1403/tasks/main.yml
@@ -95,28 +95,6 @@
     name: irqbalance
     enabled: yes
 
-# poweroff guard
-- name: "templates poweroff-guard.service.j2"
-  template:
-    src: "{{role_path}}/templates/poweroff-guard.service.j2"
-    dest: /usr/lib/systemd/system/poweroff-guard.service
-  tags: template
-
-- name: "templates start-poweroff-guard.service.j2"
-  template:
-    src: "{{role_path}}/templates/start-poweroff-guard.service.j2"
-    dest: /usr/lib/systemd/system/start-poweroff-guard.service
-  tags: template
-
-- name: 'poweroff-guard service start'
-  systemd:
-    name: poweroff-guard
-    enabled: yes
-
-- name: 'start-poweroff-guard service start'
-  systemd:
-    name: start-poweroff-guard
-    enabled: yes
 #Set CPU frequency scaling
 - name: "copy cpupower.j2 to /etc/sysconfig/cpupower"
   copy:
diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403 b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
index 11a7e0b0..37089d7a 100644
--- a/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
+++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.default.yml.TSGXNXR620G40R01P1403
@@ -79,5 +79,5 @@ cpu_layouts:
   - match:
       model_name: "5318Y"
       sockets: 2
-    sapp_affinity: [4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91]
-    mrzcpd_affinity: [92,93,94,95]
\ No newline at end of file
+    sapp_affinity: [5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92]
+    mrzcpd_affinity: [1,2,3,4]
\ No newline at end of file