diff --git a/80-rhel/config_files/common/inst.rngd.service b/80-rhel/config_files/common/inst.rngd.service
deleted file mode 100644
index 7b51033..0000000
--- a/80-rhel/config_files/common/inst.rngd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hardware RNG Entropy Gatherer Daemon
-ConditionVirtualization=!container
-ConditionKernelCommandLine=|inst.rngd
-ConditionKernelCommandLine=!inst.rngd=0
-
-# The "-f" option is required for the systemd service rngd to work with Type=simple
-[Service]
-Type=simple
-EnvironmentFile=/etc/sysconfig/rngd
-ExecStart=/usr/sbin/rngd -f $RNGD_ARGS
diff --git a/80-rhel/runtime-postinstall.tmpl b/80-rhel/runtime-postinstall.tmpl
index 5aa9518..0e573ec 100644
--- a/80-rhel/runtime-postinstall.tmpl
+++ b/80-rhel/runtime-postinstall.tmpl
@@ -28,6 +28,10 @@ symlink /lib/systemd/system/anaconda.target etc/systemd/system/default.target
 mkdir etc/systemd/system/local-fs.target.wants/
 symlink /lib/systemd/system/tmp.mount etc/systemd/system/local-fs.target.wants/tmp.mount
 
+## Start rngd
+mkdir etc/systemd/system/basic.target.wants/
+symlink /lib/systemd/system/rngd.service etc/systemd/system/basic.target.wants/rngd.service
+
 ## Disable unwanted systemd services
 systemctl disable systemd-readahead-collect.service \
                   systemd-readahead-replay.service \
@@ -42,7 +46,6 @@ systemctl mask fedora-configure.service fedora-loadmodules.service \
                fedora-wait-storage.service media.mount \
                systemd-tmpfiles-clean.service systemd-tmpfiles-clean.timer \
                ldconfig.service
-remove usr/lib/systemd/system/rngd.service
 
 ## remove because it cannot be disabled
 remove usr/lib/systemd/system-generators/lvm2-activation-generator
@@ -80,11 +83,6 @@ install ${configdir}/pam.sshd etc/pam.d/sshd
 install ${configdir}/pam.sshd etc/pam.d/login
 install ${configdir}/pam.sshd etc/pam.d/remote
 
-## set up inst.rngd support
-install ${configdir}/inst.rngd.service etc/systemd/system/inst.rngd.service
-mkdir etc/systemd/system/basic.target.wants/
-symlink /etc/systemd/system/inst.rngd.service etc/systemd/system/basic.target.wants/inst.rngd.service
-
 ## set up "install" user account
 append etc/passwd "install:x:0:0:root:/root:/usr/libexec/anaconda/run-anaconda"
 append etc/shadow "install::14438:0:99999:7:::"