diff --git a/playbooks/groups/undercloud.yml b/playbooks/groups/undercloud.yml
new file mode 100644
index 0000000000..d709159c14
--- /dev/null
+++ b/playbooks/groups/undercloud.yml
@@ -0,0 +1,61 @@
+---
+# create a new taskotron dev 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
+
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ci-cc-rdu01.fedoraproject.org"
+
+- name: make the box be real
+  hosts: ci
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "/srv/private/ansible/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'] }
+   - { role: hosts, tags: ['hosts']}
+   - { role: fas_client, tags: ['fas_client'] }
+   - { role: collectd/base, tags: ['collectd_base'] }
+   - { role: dnf-automatic, tags: ['dnfautomatic'] }
+   - { role: sudo, tags: ['sudo'] }
+   - { role: openvpn/client,
+       when: deployment_type == "prod", tags: ['openvpn_client'] }
+   - postgresql_server
+   - apache
+
+  pre_tasks:
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
+  
+
+  tasks:
+  # this is how you include other task lists
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
+
+  handlers:
+   - import_tasks: "{{ handlers_path }}/restart_services.yml"
+
+- name: configure resultsdb production
+  hosts: ci
+  user: root
+  gather_facts: True
+
+  vars_files:
+   - /srv/web/infra/ansible/vars/global.yml
+   - "/srv/private/ansible/vars.yml"
+   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+
+  roles:
+   - { role: taskotron/resultsdb-backend, tags: ['resultsdb-be'] }
+   - { role: taskotron/resultsdb-frontend, tags: ['resultsdb-fe'] }
+   - { role: taskotron/execdb, tags: ['execdb'] }
+   - { role: ci_resultsdb, tags: ['ci_resultsdb'] }
+
+  handlers:
+   - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/undercloud/files/openstack-overcloud-deploy.sh b/roles/undercloud/files/openstack-overcloud-deploy.sh
new file mode 100755
index 0000000000..f25ae9a598
--- /dev/null
+++ b/roles/undercloud/files/openstack-overcloud-deploy.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+openstack overcloud deploy --templates \
+  -e /home/stack/templates/node-info.yaml\
+  -e /home/stack/templates/overcloud_images.yaml \
+  -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml \
+  -r /home/stack/templates/roles_data.yaml \
+  --ntp-server cloud-noc01.cloud.fedoraproject.org \
+  --config-download \
+  -e /usr/share/openstack-tripleo-heat-templates/environments/config-download-environment.yaml \
+  --overcloud-ssh-user heat-admin \
+  --overcloud-ssh-key ~/.ssh/id_rsa
+
+#  -e /home/stack/templates/network-environment.yaml \
diff --git a/roles/undercloud/files/templates/node-info.yaml b/roles/undercloud/files/templates/node-info.yaml
index eda499c13b..f276c8d430 100644
--- a/roles/undercloud/files/templates/node-info.yaml
+++ b/roles/undercloud/files/templates/node-info.yaml
@@ -3,5 +3,5 @@ parameter_defaults:
   OvercloudComputeFlavor: compute
 #  OvercloudCephStorageFlavor: ceph-storage
   ControllerCount: 3
-  ComputeCount: 4
+  ComputeCount: 8
 #  CephStorageCount: 0
diff --git a/roles/undercloud/tasks/main.yml b/roles/undercloud/tasks/main.yml
index 2994e9f1c9..b9633ef511 100644
--- a/roles/undercloud/tasks/main.yml
+++ b/roles/undercloud/tasks/main.yml
@@ -34,6 +34,7 @@
   with_items:
   - undercloud.conf
   - templates/node-info.yaml
+  - openstack-overcloud-deploy.sh
   tags:
   - config
   - undercloud