diff --git a/inventory/group_vars/qadevel b/inventory/group_vars/qadevel
index 64b9d921c4..390f91d8fd 100644
--- a/inventory/group_vars/qadevel
+++ b/inventory/group_vars/qadevel
@@ -18,3 +18,17 @@ virt_install_command: /usr/sbin/virt-install -n {{ inventory_hostname }} -r {{ m
                   gateway={{ gw }} dns={{ dns }} console=tty0 console=ttyS0
                   hostname={{ inventory_hostname }}"
                  --network=bridge=br0 --autostart --noautoconsole
+
+buildmaster_db_host: localhost
+buildmaster_template: ci.master.cfg.j2
+buildmaster_endpoint: buildmaster
+buildslave_ssh_pubkey: ''
+buildslave_port: 9989
+buildmaster_dir: /home/buildmaster/master
+buildslave_dir: /home/buildslave/slave
+buildslave_poll_interval: 1800
+master_dir: /home/buildmaster/master
+master_user: buildmaster
+external_hostname: qadevel.qa.fedoraproject.org
+deployment_type: qadevel
+tcp_ports: [ 80, 443, "{{ buildslave_port }}" ]
diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml
new file mode 100644
index 0000000000..3c9f937597
--- /dev/null
+++ b/playbooks/groups/qadevel.yml
@@ -0,0 +1,70 @@
+---
+# create a new qadevel server
+# NOTE: make sure there is room/space for this server on the vmhost
+# NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars
+
+- name: make taskotron-ci staging
+  hosts: qadevel
+  user: root
+  gather_facts: False
+  accelerate: "{{ accelerated }}"
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "{{ private }}/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  tasks:
+  - include: "{{ tasks }}/virt_instance_create.yml"
+
+  handlers:
+  - include: "{{ handlers }}/restart_services.yml"
+
+- name: make the box be real
+  hosts: qadevel
+  user: root
+  gather_facts: True
+  accelerate: "{{ accelerated }}"
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "{{ private }}/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+   - { role: base, tags:['base'] }
+   - { role: rkhunter, tags:['rkhunter'] }
+   - { role: nagios_client, tags:['nagios_client'] }
+   - hosts
+   - { role: fas_client, tags:['fas_client'] }
+   - { role: collectd/base, tags:['collectd_base'] }
+   - { role: yum-cron, tags:['yumcron'] }
+   - { role: sudo, tags:['sudo'] }
+
+  tasks:
+  # this is how you include other task lists
+  - include: "{{ tasks }}/yumrepos.yml"
+  - include: "{{ tasks }}/2fa_client.yml"
+  - include: "{{ tasks }}/motd.yml"
+  - include: "{{ tasks }}/apache.yml"
+
+  handlers:
+   - include: "{{ handlers }}/restart_services.yml"
+
+- name: configure taskotron-ci master
+  hosts: qadevel
+  user: root
+  gather_facts: True
+  accelerate: "{{ accelerated }}"
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "{{ private }}/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+   - { role: taskotron/buildmaster, tags: ['buildmaster'] }
+   - { role: taskotron/buildmaster-configure, tags: ['buildmasterconfig'] }
+
+  handlers:
+   - include: "{{ handlers }}/restart_services.yml"
diff --git a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2 b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
index 379a6be09f..e2ec5ac8a6 100644
--- a/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
+++ b/roles/taskotron/buildmaster-configure/templates/ci.master.cfg.j2
@@ -16,10 +16,10 @@ c = BuildmasterConfig = {}
 from buildbot.buildslave import BuildSlave
 c['slaves'] = [
                 {% for buildslave in buildslaves %}
-                {% if deployment_type == 'stg' %}
+                {% if deployment_type == 'qadevel-stg' %}
                 BuildSlave("{{ buildslave }}", "{{ qadevel_stg_buildslave_password }}"),
                 {% endif %}
-                {% if deployment_type == 'prod' %}
+                {% if deployment_type == 'qadevel-prod' %}
                 BuildSlave("{{ buildslave }}", "{{ qadevel_prod_buildslave_password }}"),
                 {% endif %}
                 {% endfor %}