diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 222539485c..8509dae7c3 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -1,6 +1,11 @@
 #
 # This is a base koji_builder role.
 #
+- name: set hostname
+  hostname: name="{{inventory_hostname}}"
+  tags:
+  - koji_builder
+
 - name: set root passwd
   user: name=root password={{ builder_rootpw }} state=present
   tags:
@@ -57,41 +62,12 @@
   tags:
   - koji_builder
 
-- name: add pkgs
-  yum: state=present pkg={{ item }}
-  with_items:
-    - yum-utils
-    - koji-builder
-    - koji-containerbuild-builder
-    - strace
-    - mock
-    - kernel-firmware
-    - ntp
-    - ntpdate
-    - rsyslog
-    - audit
-    - oz
-    - imagefactory
-    - imagefactory-plugins-TinMan
-    - imagefactory-plugins-Docker
-    - imagefactory-plugins-vSphere
-    - imagefactory-plugins-ovfcommon
-    - imagefactory-plugins
-    - imagefactory-plugins-OVA
-    - imagefactory-plugins-EC2
-    - imagefactory-plugins-RHEVM
-    - python-psphere
-    - VMDKstream
-    - pykickstart
-  tags:
-  - koji_builder
-  when: ansible_distribution_major_version|int < 22
-
 - name: add pkgs
   dnf: state=present pkg={{ item }}
   with_items:
     - yum-utils
     - koji-builder
+    - python-osbs
     - koji-containerbuild-builder
     - strace
     - mock
@@ -117,7 +93,6 @@
     - pykickstart
   tags:
   - koji_builder
-  when: ansible_distribution_major_version|int > 21
 
 - name: build /etc/kojid/kojid.conf from group vars
   template: src=kojid.conf dest=/etc/kojid/kojid.conf