diff --git a/configs/fortigate/vdom_scsd/firewall.cfg b/configs/fortigate/vdom_scsd/firewall.cfg
index 7b6baa9..4ba3a74 100644
--- a/configs/fortigate/vdom_scsd/firewall.cfg
+++ b/configs/fortigate/vdom_scsd/firewall.cfg
@@ -2852,7 +2852,7 @@ config firewall address
         set associated-interface "inside"
         set subnet 10.1.40.241 255.255.255.255
     next
-    edit "RAP-Users"
+    edit "RAP_10.67.0.0/16"
         set associated-interface "RAP"
         set allow-routing enable
         set subnet 10.67.0.0 255.255.0.0
@@ -2872,7 +2872,7 @@ config firewall address
         set allow-routing enable
         set subnet 10.46.0.0 255.255.0.0
     next
-    edit "DPS_Internal"
+    edit "DPS_Mgmt"
         set subnet 192.168.46.0 255.255.255.0
     next
     edit "DPS_192.168.146.0/24"
@@ -6149,8 +6149,8 @@ config firewall policy
         set srcintf "RAP"
         set dstintf "inside"
         set action accept
-        set srcaddr "RAP-Users" "RAP-MGMT"
-        set dstaddr "Server_40" "Server_48"
+        set srcaddr "RAP_10.67.0.0/16" "RAP-MGMT"
+        set dstaddr "all"
         set schedule "always"
         set service "ALL"
         set utm-status enable
@@ -6255,8 +6255,8 @@ config firewall policy
         set srcintf "inside"
         set dstintf "RAP"
         set action accept
-        set srcaddr "Server_40" "Server_48" "21JumpSt" "Sys-Net-Admins"
-        set dstaddr "RAP-Users" "RAP-MGMT" "RAP-FW-Inside"
+        set srcaddr "all"
+        set dstaddr "RAP_10.67.0.0/16" "RAP-MGMT" "RAP-FW-Inside"
         set schedule "always"
         set service "ALL"
         set utm-status enable
@@ -6273,7 +6273,7 @@ config firewall policy
         set dstintf "DPS"
         set action accept
         set srcaddr "all"
-        set dstaddr "DPS_10.46.0.0/16" "DPS_Internal" "DPS_192.168.146.0/24"
+        set dstaddr "DPS_10.46.0.0/16" "DPS_Mgmt" "DPS_192.168.146.0/24"
         set schedule "always"
         set service "ALL"
     next
@@ -6282,7 +6282,7 @@ config firewall policy
         set srcintf "DPS"
         set dstintf "inside"
         set action accept
-        set srcaddr "DPS_10.46.0.0/16" "DPS_192.168.146.0/24" "DPS_Internal"
+        set srcaddr "DPS_10.46.0.0/16" "DPS_192.168.146.0/24" "DPS_Mgmt"
         set dstaddr "all"
         set schedule "always"
         set service "ALL"