diff --git a/meta-fii/meta-mori/conf/machine/mori.conf b/meta-fii/meta-mori/conf/machine/mori.conf
index b55c9a8..f48eed2 100644
--- a/meta-fii/meta-mori/conf/machine/mori.conf
+++ b/meta-fii/meta-mori/conf/machine/mori.conf
@@ -44,7 +44,6 @@
 IMAGE_FEATURES:remove = "obmc-leds"
 IMAGE_FEATURES:remove = "obmc-logging-mgmt"
 IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt"
-IMAGE_FEATURES:remove = "obmc-rng"
 IMAGE_FEATURES:remove = "obmc-net-ipmi"
 IMAGE_FEATURES:remove = "obmc-sensors"
 IMAGE_FEATURES:remove = "obmc-software"
diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index b5d2650..b414bd2 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -23,7 +23,6 @@
 # - obmc-leds                         - OpenBMC LED support
 # - obmc-logging-mgmt                 - OpenBMC logging management
 # - obmc-remote-logging-mgmt          - OpenBMC remote logging management
-# - obmc-rng                          - OpenBMC random number generator
 # - obmc-sensors                      - OpenBMC sensor support
 # - obmc-settings-mgmt                - OpenBMC settings management
 # - obmc-software                     - OpenBMC software management
@@ -56,7 +55,6 @@
 FEATURE_PACKAGES_obmc-leds ?= "packagegroup-obmc-apps-leds"
 FEATURE_PACKAGES_obmc-logging-mgmt ?= "packagegroup-obmc-apps-logging"
 FEATURE_PACKAGES_obmc-remote-logging-mgmt ?= "packagegroup-obmc-apps-remote-logging"
-FEATURE_PACKAGES_obmc-rng ?= "packagegroup-obmc-apps-rng"
 FEATURE_PACKAGES_obmc-net-ipmi ?= "phosphor-ipmi-net"
 FEATURE_PACKAGES_obmc-sensors ?= "packagegroup-obmc-apps-sensors"
 FEATURE_PACKAGES_obmc-software ?= "packagegroup-obmc-apps-software"
diff --git a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
index b2b2dea..546bd62 100644
--- a/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
+++ b/meta-phosphor/recipes-phosphor/images/obmc-phosphor-image.bb
@@ -30,7 +30,6 @@
         obmc-leds \
         obmc-logging-mgmt \
         obmc-remote-logging-mgmt \
-        obmc-rng \
         obmc-net-ipmi \
         obmc-sensors \
         obmc-software \
diff --git a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index ea44786..75b8ea9 100644
--- a/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -138,11 +138,6 @@
         phosphor-rsyslog-config \
         "
 
-SUMMARY:${PN}-rng = "Random Number Generator support"
-RDEPENDS:${PN}-rng = " \
-        rng-tools \
-        "
-
 SUMMARY:${PN}-sensors = "Sensor applications"
 RDEPENDS:${PN}-sensors = " \
         ${VIRTUAL-RUNTIME_obmc-sensors-hwmon} \
diff --git a/meta-quanta/meta-gbs/conf/machine/gbs.conf b/meta-quanta/meta-gbs/conf/machine/gbs.conf
index 5830d45..a663537 100644
--- a/meta-quanta/meta-gbs/conf/machine/gbs.conf
+++ b/meta-quanta/meta-gbs/conf/machine/gbs.conf
@@ -43,7 +43,6 @@
 IMAGE_FEATURES:remove = "obmc-leds"
 IMAGE_FEATURES:remove = "obmc-logging-mgmt"
 IMAGE_FEATURES:remove = "obmc-remote-logging-mgmt"
-IMAGE_FEATURES:remove = "obmc-rng"
 IMAGE_FEATURES:remove = "obmc-net-ipmi"
 IMAGE_FEATURES:remove = "obmc-sensors"
 IMAGE_FEATURES:remove = "obmc-software"