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 acabdcb0a1..c11a1a9d40 100644
--- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
+++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t
@@ -844,6 +844,9 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_FAULTMONITOR_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_FAULTMONITOR_START_ORDER=15
   CONFIG_SAH_AMX_FAULTMONITOR_STOP_ORDER=89
+  CONFIG_SAH_AMX_FCGI=y
+  CONFIG_SAH_AMX_FCGI_START_ORDER=85
+  CONFIG_SAH_AMX_FCGI_STOP_ORDER=10
   CONFIG_SAH_AMX_GMAP_CLIENT=y
   CONFIG_SAH_AMX_GMAP_CLIENT_ORDER=82
   CONFIG_SAH_AMX_GMAP_SERVER=y
@@ -904,10 +907,10 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_CONMON=y
   CONFIG_SAH_AMX_TR181_CONMON_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_CONMON_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_CONMON_START_ORDER=98
+  CONFIG_SAH_AMX_TR181_CONMON_STOP_ORDER=78
   CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY=y
   CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY_ORDER=25
-  CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY_RUN_AS_GROUP="tr181_app"
-  CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_DEVICE=y
   CONFIG_SAH_AMX_TR181_DEVICEINFO=y
   CONFIG_SAH_AMX_TR181_DEVICEINFO_NUMBER_OF_EXTRA_MAC_ADDRESSES="7"
@@ -1092,7 +1095,6 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_SERVICES_CTHULHU_INIT_STOP=60
   CONFIG_SAH_SERVICES_GMAP-SELF=y
   CONFIG_SAH_SERVICES_PWHM=y
-  CONFIG_SAH_SERVICES_PWHM_PROCD_SUPPORT=y
   CONFIG_SAH_SERVICES_RLYEH=y
   CONFIG_SAH_SERVICES_RLYEH_ORDER=90
   CONFIG_SAH_SERVICES_SENSING=y
diff --git a/.gitlab/tests/cram/wnc-freedom/005-build-config.t b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
index 77fcbcf487..1ea9779781 100644
--- a/.gitlab/tests/cram/wnc-freedom/005-build-config.t
+++ b/.gitlab/tests/cram/wnc-freedom/005-build-config.t
@@ -601,6 +601,9 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_FAULTMONITOR_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_FAULTMONITOR_START_ORDER=15
   CONFIG_SAH_AMX_FAULTMONITOR_STOP_ORDER=89
+  CONFIG_SAH_AMX_FCGI=y
+  CONFIG_SAH_AMX_FCGI_START_ORDER=85
+  CONFIG_SAH_AMX_FCGI_STOP_ORDER=10
   CONFIG_SAH_AMX_GMAP_CLIENT=y
   CONFIG_SAH_AMX_GMAP_CLIENT_ORDER=82
   CONFIG_SAH_AMX_GMAP_SERVER=y
@@ -661,10 +664,10 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_AMX_TR181_CONMON=y
   CONFIG_SAH_AMX_TR181_CONMON_RUN_AS_GROUP="tr181_app"
   CONFIG_SAH_AMX_TR181_CONMON_RUN_AS_USER="tr181_app"
+  CONFIG_SAH_AMX_TR181_CONMON_START_ORDER=98
+  CONFIG_SAH_AMX_TR181_CONMON_STOP_ORDER=78
   CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY=y
   CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY_ORDER=25
-  CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY_RUN_AS_GROUP="tr181_app"
-  CONFIG_SAH_AMX_TR181_CONNTRACK_QUERY_RUN_AS_USER="tr181_app"
   CONFIG_SAH_AMX_TR181_DEVICE=y
   CONFIG_SAH_AMX_TR181_DEVICEINFO=y
   CONFIG_SAH_AMX_TR181_DEVICEINFO_NUMBER_OF_EXTRA_MAC_ADDRESSES="7"
@@ -849,7 +852,6 @@ Assure expected build configuration (PCF-1413):
   CONFIG_SAH_SERVICES_CTHULHU_INIT_STOP=60
   CONFIG_SAH_SERVICES_GMAP-SELF=y
   CONFIG_SAH_SERVICES_PWHM=y
-  CONFIG_SAH_SERVICES_PWHM_PROCD_SUPPORT=y
   CONFIG_SAH_SERVICES_RLYEH=y
   CONFIG_SAH_SERVICES_RLYEH_ORDER=90
   CONFIG_SAH_SERVICES_SENSING=y
diff --git a/profiles/lcm.yml b/profiles/lcm.yml
index b6acad42da..3bcb74a530 100644
--- a/profiles/lcm.yml
+++ b/profiles/lcm.yml
@@ -4,7 +4,7 @@ description: Packages and features for LCM
 feeds:
   - name: feed_lcm
     uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed_lcm.git
-    revision: main@63f7145e871831898f1b0eda4d337495162b8292
+    revision: main@e0cf4d9f808ff1b535b96cbd3c5d74dffaab975f
 
 packages:
   - cthulhu