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 ed32b59e53..162b67f643 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
@@ -929,13 +929,19 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_SENTOPTION_125=""
+  CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_START_ORDER=27
+  CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_STOP_ORDER=75
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT=y
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_SENTOPTION_17=""
+  CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_START_ORDER=25
+  CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_STOP_ORDER=75
   CONFIG_SAH_AMX_TR181_DHCPV6S=y
   CONFIG_SAH_AMX_TR181_DHCPV6S_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV6S_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_DHCPV6S_START_ORDER=40
+  CONFIG_SAH_AMX_TR181_DHCPV6S_STOP_ORDER=60
   CONFIG_SAH_AMX_TR181_DNS=y
   CONFIG_SAH_AMX_TR181_DNSSD=y
   CONFIG_SAH_AMX_TR181_DNSSD_ORDER=31
@@ -988,9 +994,10 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_LOGICAL_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_LOGICAL_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN=y
-  CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_ORDER=22
   CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_START_ORDER=22
+  CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_STOP_ORDER=78
   CONFIG_SAH_AMX_TR181_MQTT=y
   CONFIG_SAH_AMX_TR181_MQTTBROKER=y
   CONFIG_SAH_AMX_TR181_MQTTBROKER_ORDER=49
@@ -1013,6 +1020,9 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_POWERSTATUS_ORDER=15
   CONFIG_SAH_AMX_TR181_POWERSTATUS_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_POWERSTATUS_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_PPP=y
+  CONFIG_SAH_AMX_TR181_PPP_START_ORDER=26
+  CONFIG_SAH_AMX_TR181_PPP_STOP_ORDER=74
   CONFIG_SAH_AMX_TR181_QOS=y
   CONFIG_SAH_AMX_TR181_QOS_DEVICE_BASED_CLASSIFICATION=y
   CONFIG_SAH_AMX_TR181_QOS_ORDER=49
@@ -1103,9 +1113,13 @@ Assure expected build configuration (PCF-1413):
   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"
+  CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_START_ORDER=83
+  CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_STOP_ORDER=12
   CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT=y
   CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_START_ORDER=40
+  CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_STOP_ORDER=60
   CONFIG_SAH_SERVICES_AMXRT=y
   CONFIG_SAH_SERVICES_AMXRT_PROCD_INIT_FUNCTIONS=y
   CONFIG_SAH_SERVICES_CTHULHU=y
diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
index f4704e0b2d..4ffb4b5328 100644
--- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t
+++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
@@ -686,13 +686,19 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_SENTOPTION_125=""
+  CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_START_ORDER=27
+  CONFIG_SAH_AMX_TR181_DHCPV4CLIENT_STOP_ORDER=75
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT=y
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_SENTOPTION_17=""
+  CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_START_ORDER=25
+  CONFIG_SAH_AMX_TR181_DHCPV6CLIENT_STOP_ORDER=75
   CONFIG_SAH_AMX_TR181_DHCPV6S=y
   CONFIG_SAH_AMX_TR181_DHCPV6S_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_DHCPV6S_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_DHCPV6S_START_ORDER=40
+  CONFIG_SAH_AMX_TR181_DHCPV6S_STOP_ORDER=60
   CONFIG_SAH_AMX_TR181_DNS=y
   CONFIG_SAH_AMX_TR181_DNSSD=y
   CONFIG_SAH_AMX_TR181_DNSSD_ORDER=31
@@ -745,9 +751,10 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_LOGICAL_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_LOGICAL_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN=y
-  CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_ORDER=22
   CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_START_ORDER=22
+  CONFIG_SAH_AMX_TR181_MCASTD_CORE_PLUGIN_STOP_ORDER=78
   CONFIG_SAH_AMX_TR181_MQTT=y
   CONFIG_SAH_AMX_TR181_MQTTBROKER=y
   CONFIG_SAH_AMX_TR181_MQTTBROKER_ORDER=49
@@ -770,6 +777,9 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_POWERSTATUS_ORDER=15
   CONFIG_SAH_AMX_TR181_POWERSTATUS_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_POWERSTATUS_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_PPP=y
+  CONFIG_SAH_AMX_TR181_PPP_START_ORDER=26
+  CONFIG_SAH_AMX_TR181_PPP_STOP_ORDER=74
   CONFIG_SAH_AMX_TR181_QOS=y
   CONFIG_SAH_AMX_TR181_QOS_DEVICE_BASED_CLASSIFICATION=y
   CONFIG_SAH_AMX_TR181_QOS_ORDER=49
@@ -860,9 +870,13 @@ Assure expected build configuration (PCF-1413):
   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"
+  CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_START_ORDER=83
+  CONFIG_SAH_SERVICES_AMX-HOSTS-MANAGER_STOP_ORDER=12
   CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT=y
   CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_START_ORDER=40
+  CONFIG_SAH_SERVICES_AMX-TR181ROUTERADVERTISEMENT_STOP_ORDER=60
   CONFIG_SAH_SERVICES_AMXRT=y
   CONFIG_SAH_SERVICES_AMXRT_PROCD_INIT_FUNCTIONS=y
   CONFIG_SAH_SERVICES_CTHULHU=y