diff --git a/conf/layer.conf b/conf/layer.conf
index fefac3b..0595ae3 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -19,3 +19,6 @@ IMAGE_CLASSES:append = " rdkv-community-configs"
 
 # TODO: temporary; remove when RDKVREFPLT-5105 is resolved.
 LOCALCONF_VERSION = "1"
+
+# TODO: remove when these are fixed CMFSUPPORT-3989, CMFSUPPORT-3990, RDKEAPPRT-609
+FACTORY_APPS_JSON_FILE ?= "${LAYERDIR}/factory-app-manifest.json"
diff --git a/factory-app-manifest.json b/factory-app-manifest.json
new file mode 100644
index 0000000..1f3881c
--- /dev/null
+++ b/factory-app-manifest.json
@@ -0,0 +1,27 @@
+[
+  {
+    "packagename": "com.rdkcentral.base",
+    "srcuri": "file://com.rdkcentral.base+0.1.0.bolt",
+    "sha256sum": "d2386dd012e422e737ed2cc66201726bb9e680bc753ed29c46547d3fa0225c1b",
+    "installpath": "/etc/rdk/factoryapps"
+  },
+  {
+    "packagename": "com.rdkcentral.wpe-rdk",
+    "srcuri": "file://com.rdkcentral.wpe-rdk+0.1.0.bolt",
+    "sha256sum": "8016d174a029eaa9549a64aa888e3189e8219ad62671222ca7460c1ae150c392",
+    "installpath": "/etc/rdk/factoryapps"
+  },
+  {
+    "packagename": "com.rdkcentral.refui",
+    "srcuri": "file://com.rdkcentral.refui+0.0.4.bolt",
+    "sha256sum": "f94c9f7bdb30d5df368623aa87543e143a68e70043bf29128f5913d5bbb367fd",
+    "installpath": "/etc/rdk/factoryapps"
+  },
+  {
+    "packagename": "com.rdkcentral.ralf.crt",
+    "srcuri": "file://com.rdkcentral.ralf.crt",
+    "sha256sum": "a71aa6cda766093120a6fb5b855debdddb71ae2ab537f116491994d8fb51429e",
+    "installpath": "/etc/rdk/certs"
+  }
+]
+
diff --git a/recipes-images/rdk-fullstack-image.bb b/recipes-images/rdk-fullstack-image.bb
index 5cbc787..90239e9 100644
--- a/recipes-images/rdk-fullstack-image.bb
+++ b/recipes-images/rdk-fullstack-image.bb
@@ -11,11 +11,6 @@ IMAGE_INSTALL = " \
 
 inherit core-image custom-rootfs-creation extrausers
 
-EXTRA_USERS_PARAMS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'amazon_non_root_support', '''\
-    groupadd -g 1001 amazon;\
-    useradd -u 1001 -g amazon -M -r -s /bin/sh amazon;\
-''', '', d)}"
-
 IMAGE_ROOTFS_SIZE ?= "8192"
 IMAGE_ROOTFS_EXTRA_SPACE:append = "${@bb.utils.contains("DISTRO_FEATURES", "systemd", " + 4096", "" ,d)}"