diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index d319b1bfd6..7f8cac1e55 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -279,10 +279,16 @@
   when: inventory_hostname.startswith(('buildvm-armv7-01.arm', 'buildvm-armv7-02', 'buildvm-armv7-03'))
 
 #
-# Add haveged so that virtual maachines have enough randomness to boot in our lifetimes
+# Add rngd so that virtual maachines have enough randomness to boot in our lifetimes
 #
-- name: Install haveged for entropy
-  package: name=haveged state=absent
+- name: Install rng-tools for entropy
+  package: name=rng-tools state=present
   tags:
   - koji_builder
-  - koji_builder/haveged
+  - koji_builder/rngd
+
+- name: Start rngd
+  service: name=rngd state=started enabled=yes
+  tags:
+  - koji_builder
+  - koji_builder/rngd