diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 97983c8c03..3ef9c53b71 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -21,7 +21,6 @@
   roles:
   - base
   - hosts
-  - apache
   - { role: nfs/client, mnt_dir: '/mnt/fedora_koji',  nfs_src_dir: "{{ koji_hub_nfs }}", when: createrepo }
   - { role: fas_client, when: not inventory_hostname.startswith('bkernel') }
   - { role: sudo, when: not inventory_hostname.startswith('bkernel') }
diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index af76818858..b3ab098b14 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -232,3 +232,23 @@
   when: is_rhel is defined and ansible_architecture == 'x86_64' and ansible_distribution_major_version|int == '6'
   tags:
   - koji_builder
+
+- name: Add the Apache group
+  group: name=apache 
+         gid=48
+         system=yes
+         state=present
+  tags:
+  - koji_builder
+
+- name: Create the apache user
+  user: name=apache
+        uid=48 
+        createhome=no
+        group=apache
+        home=/usr/share/httpd
+        shell=/sbin/nologin
+        system=yes
+        state=present
+  tags:
+  - koji_builder