diff --git a/inventory/group_vars/newcloud b/inventory/group_vars/newcloud
new file mode 100644
index 0000000000..4b4821ebaa
--- /dev/null
+++ b/inventory/group_vars/newcloud
@@ -0,0 +1,8 @@
+---
+datacenter: cloud
+nm: 255.255.254.0
+gw: 209.132.184.254
+fas_client_groups: sysadmin-main
+dns: 8.8.8.8
+freezes: false
+ansible_ifcfg_whitelist: ['eth1']
diff --git a/inventory/host_vars/control01.cloud.fedoraproject.org b/inventory/host_vars/control01.cloud.fedoraproject.org
new file mode 100644
index 0000000000..ddde6f6d1f
--- /dev/null
+++ b/inventory/host_vars/control01.cloud.fedoraproject.org
@@ -0,0 +1,2 @@
+---
+eth1_ip: 172.23.1.5
diff --git a/inventory/inventory b/inventory/inventory
index ebe797158b..ab474afa02 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -1099,23 +1099,6 @@ fed-cloud15.cloud.fedoraproject.org
 fed-cloud-ppc02.cloud.fedoraproject.org
 cloud-noc01.cloud.fedoraproject.org
 
-[new-cloud-hardware]
-fed-cloud03.cloud.fedoraproject.org
-fed-cloud04.cloud.fedoraproject.org
-fed-cloud05.cloud.fedoraproject.org
-fed-cloud06.cloud.fedoraproject.org
-fed-cloud07.cloud.fedoraproject.org
-fed-cloud08.cloud.fedoraproject.org
-fed-cloud09.cloud.fedoraproject.org
-fed-cloud10.cloud.fedoraproject.org
-fed-cloud11.cloud.fedoraproject.org
-fed-cloud12.cloud.fedoraproject.org
-fed-cloud13.cloud.fedoraproject.org
-fed-cloud14.cloud.fedoraproject.org
-fed-cloud15.cloud.fedoraproject.org
-#fed-cloud-ppc01.cloud.fedoraproject.org
-fed-cloud-ppc02.cloud.fedoraproject.org
-
 [openstack-compute]
 fed-cloud03.cloud.fedoraproject.org
 fed-cloud04.cloud.fedoraproject.org
@@ -1132,6 +1115,15 @@ fed-cloud15.cloud.fedoraproject.org
 #fed-cloud-ppc01.cloud.fedoraproject.org
 fed-cloud-ppc02.cloud.fedoraproject.org
 
+[newcloud:children]
+newcloud-control
+newcloud-compute
+
+[newcloud-control]
+control01.cloud.fedoraproject.org
+
+[newcloud-compute]
+
 [pdc-web]
 pdc-web01.phx2.fedoraproject.org
 pdc-web02.phx2.fedoraproject.org
diff --git a/playbooks/groups/newcloud.yml b/playbooks/groups/newcloud.yml
new file mode 100644
index 0000000000..a60ed22aef
--- /dev/null
+++ b/playbooks/groups/newcloud.yml
@@ -0,0 +1,29 @@
+# Set up OpenStack
+#
+- name: basic host setup
+  hosts: newcloud
+  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
+
+  pre_tasks:
+  - import_tasks: "{{ tasks_path }}/yumrepos.yml"
+
+  roles:
+  - base
+  - rkhunter
+  - nagios_client
+  - hosts
+  - fas_client
+  - sudo
+
+  tasks:
+  - import_tasks: "{{ tasks_path }}/2fa_client.yml"
+  - import_tasks: "{{ tasks_path }}/motd.yml"
+
+  handlers:
+  - import_tasks: "{{ handlers_path }}/restart_services.yml"
diff --git a/roles/base/files/resolv.conf/cloud b/roles/base/files/resolv.conf/cloud
index 4d417eea20..9661da5d33 100644
--- a/roles/base/files/resolv.conf/cloud
+++ b/roles/base/files/resolv.conf/cloud
@@ -1,4 +1,4 @@
 search cloud.fedoraproject.org fedoraproject.org
-nameserver 66.35.62.163
-nameserver 140.211.169.201
+nameserver 8.8.8.8
+nameserver 8.8.4.4
 options rotate timeout:1