diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
index 3759c6f0ce..e8d096891b 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
@@ -892,6 +892,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_BRIDGING=y
   CONFIG_SAH_AMX_TR181_BRIDGING_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_BRIDGING_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_BRIDGING_START_ORDER=22
+  CONFIG_SAH_AMX_TR181_BRIDGING_STOP_ORDER=76
   CONFIG_SAH_AMX_TR181_BULKDATA=y
   CONFIG_SAH_AMX_TR181_BULKDATA_START_ORDER=90
   CONFIG_SAH_AMX_TR181_BULKDATA_STOP_ORDER=88
@@ -973,6 +975,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_IP=y
   CONFIG_SAH_AMX_TR181_IP_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_IP_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_IP_START_ORDER=21
+  CONFIG_SAH_AMX_TR181_IP_STOP_ORDER=10
   CONFIG_SAH_AMX_TR181_LED=y
   CONFIG_SAH_AMX_TR181_LED_ORDER=15
   CONFIG_SAH_AMX_TR181_LED_RUN_AS_GROUP="tr181_app"
@@ -1013,6 +1017,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_ROUTING=y
   CONFIG_SAH_AMX_TR181_ROUTING_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_ROUTING_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_ROUTING_START_ORDER=30
+  CONFIG_SAH_AMX_TR181_ROUTING_STOP_ORDER=10
   CONFIG_SAH_AMX_TR181_SECURITY=y
   CONFIG_SAH_AMX_TR181_SECURITY_ORDER=61
   CONFIG_SAH_AMX_TR181_SFP=y
@@ -1049,6 +1055,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_DYNAMIC_DNS_START_ORDER=25
   CONFIG_SAH_DYNAMIC_DNS_STOP_ORDER=10
   CONFIG_SAH_IP_DIAGNOSTICS=y
+  CONFIG_SAH_IP_DIAGNOSTICS_START_ORDER=25
+  CONFIG_SAH_IP_DIAGNOSTICS_STOP_ORDER=10
   CONFIG_SAH_LIB_AMXB_UBUS=y
   CONFIG_SAH_LIB_AMXB_UBUS_ORDER="05-"
   CONFIG_SAH_LIB_AMXRT=y
@@ -1088,6 +1096,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER=y
   CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_START_ORDER=40
+  CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_STOP_ORDER=60
   CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER=y
   CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_RUN_AS_USER="tr181_app"
diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
index 1a6b1ad3fc..97e2f6ee34 100644
--- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t
+++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
@@ -649,6 +649,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_BRIDGING=y
   CONFIG_SAH_AMX_TR181_BRIDGING_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_BRIDGING_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_BRIDGING_START_ORDER=22
+  CONFIG_SAH_AMX_TR181_BRIDGING_STOP_ORDER=76
   CONFIG_SAH_AMX_TR181_BULKDATA=y
   CONFIG_SAH_AMX_TR181_BULKDATA_START_ORDER=90
   CONFIG_SAH_AMX_TR181_BULKDATA_STOP_ORDER=88
@@ -730,6 +732,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_IP=y
   CONFIG_SAH_AMX_TR181_IP_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_IP_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_IP_START_ORDER=21
+  CONFIG_SAH_AMX_TR181_IP_STOP_ORDER=10
   CONFIG_SAH_AMX_TR181_LED=y
   CONFIG_SAH_AMX_TR181_LED_ORDER=15
   CONFIG_SAH_AMX_TR181_LED_RUN_AS_GROUP="tr181_app"
@@ -770,6 +774,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_ROUTING=y
   CONFIG_SAH_AMX_TR181_ROUTING_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_ROUTING_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_ROUTING_START_ORDER=30
+  CONFIG_SAH_AMX_TR181_ROUTING_STOP_ORDER=10
   CONFIG_SAH_AMX_TR181_SECURITY=y
   CONFIG_SAH_AMX_TR181_SECURITY_ORDER=61
   CONFIG_SAH_AMX_TR181_SFP=y
@@ -806,6 +812,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_DYNAMIC_DNS_START_ORDER=25
   CONFIG_SAH_DYNAMIC_DNS_STOP_ORDER=10
   CONFIG_SAH_IP_DIAGNOSTICS=y
+  CONFIG_SAH_IP_DIAGNOSTICS_START_ORDER=25
+  CONFIG_SAH_IP_DIAGNOSTICS_STOP_ORDER=10
   CONFIG_SAH_LIB_AMXB_UBUS=y
   CONFIG_SAH_LIB_AMXB_UBUS_ORDER="05-"
   CONFIG_SAH_LIB_AMXRT=y
@@ -845,6 +853,8 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER=y
   CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_START_ORDER=40
+  CONFIG_SAH_SERVICES_AMX-DHCPV4-MANAGER_STOP_ORDER=60
   CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER=y
   CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_RUN_AS_USER="tr181_app"
diff --git a/profiles/prpl_core.yml b/profiles/prpl_core.yml
index f172db4a43..b8f002a56b 100644
--- a/profiles/prpl_core.yml
+++ b/profiles/prpl_core.yml
@@ -11,7 +11,7 @@ feeds:
 
   - name: feed_prplos
     uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplos.git
-    revision: main@bdeea281826fe129501b70e281cc77f1bab9cd38
+    revision: main@3e928d18a4d035faae3fecd775d5bc4e4e465f4a
 
 additional_packages:
   - feed: packages