diff --git a/cinder-controller.yml b/cinder-controller.yml
deleted file mode 100644
index 2ac183afc..000000000
--- a/cinder-controller.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: cinder-controller
-  become: True
-  roles:
-     - hpc-cloud/roles/cinder-controller
diff --git a/cinder-storage.yml b/cinder-storage.yml
deleted file mode 100644
index 577a2fdd5..000000000
--- a/cinder-storage.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: cinder-storage
-  become: True
-  roles:
-     - hpc-cloud/roles/cinder-storage
diff --git a/cluster.yml b/cluster.yml
index eabd16e31..387997ab6 100644
--- a/cluster.yml
+++ b/cluster.yml
@@ -55,6 +55,12 @@
      - prom_server
      - cadvisor
      - slurm
+  vars:
+     # These variables are needed by the mariadb role.
+     # Which is a depencency of the slurm role.
+     # See roles/slurm/meta/main.yml
+     hostname_node0: "{{ ansible_hostname }}"
+     ip_node0: "{{ ansible_default_ipv4['address'] }}"
 
 - name: Install virtual compute nodes
   hosts: compute-vm
diff --git a/gearshift_hosts.ini b/gearshift_hosts.ini
index 07a7483d1..689b94092 100644
--- a/gearshift_hosts.ini
+++ b/gearshift_hosts.ini
@@ -1,43 +1,3 @@
-[databases]
-gs-openstack
-gs-compute10
-gs-compute11
-
-[keystone]
-gs-openstack
-
-[glance-controller]
-gs-openstack
-
-[heat]
-gs-openstack
-
-[horizon]
-gs-openstack
-
-[rabbitmq]
-gs-openstack
-gs-compute10
-gs-compute11
-
-[memcached]
-gs-openstack
-
-[neutron-controller]
-gs-openstack physical_interface_mappings=provider:enp130s0f0
-
-[nova-controller]
-gs-openstack
-
-[cinder-controller]
-gs-openstack
-
-[cinder-storage]
-gs-compute[01:11] storage_volume=/dev/sdb
-
-[nova-compute]
-gs-compute[01:11] physical_interface_mappings=provider:enp130s0f0
-
 [jumphost]
 airlock
 
@@ -68,7 +28,3 @@ administration
 [gearshift-cluster:children]
 cluster
 jumphost
-
-[metal]
-gs-openstack
-gs-compute[01:11]
diff --git a/glance-controller.yml b/glance-controller.yml
deleted file mode 100644
index 4d307f798..000000000
--- a/glance-controller.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: glance-controller
-  become: True
-  roles:
-     - hpc-cloud/roles/glance-controller
diff --git a/heat.yml b/heat.yml
deleted file mode 100644
index a5e7eecd5..000000000
--- a/heat.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: heat
-  become: True
-  roles:
-     - hpc-cloud/roles/heat
diff --git a/horizon.yml b/horizon.yml
deleted file mode 100644
index 2ea928605..000000000
--- a/horizon.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: horizon
-  become: True
-  roles:
-     - hpc-cloud/roles/horizon
diff --git a/keystone.yml b/keystone.yml
deleted file mode 100644
index 1c930b30f..000000000
--- a/keystone.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: databases
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: keystone
-  become: True
-  roles:
-     - hpc-cloud/roles/keystone
diff --git a/mariadb.yml b/mariadb.yml
deleted file mode 100644
index b0143909f..000000000
--- a/mariadb.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-# Run all plays as root.
-- hosts: databases
-  become: True
-  roles:
-      - hpc-cloud/roles/mariadb
-  vars:
-      hostname_node0: "{{ hostvars[groups['databases'][0]]['ansible_hostname'] }}"
-      hostname_node1: "{{ hostvars[groups['databases'][1]]['ansible_hostname'] }}"
-      hostname_node2: "{{ hostvars[groups['databases'][2]]['ansible_hostname'] }}"
-      ip_node0: "{{ hostvars[groups['databases'][0]]['listen_ip'] | default(hostvars[groups['databases'][0]]['ansible_default_ipv4']['address']) }}"
-      ip_node1: "{{ hostvars[groups['databases'][1]]['listen_ip'] | default(hostvars[groups['databases'][1]]['ansible_default_ipv4']['address']) }}"
-      ip_node2: "{{ hostvars[groups['databases'][2]]['listen_ip'] | default(hostvars[groups['databases'][2]]['ansible_default_ipv4']['address']) }}"
diff --git a/memcached.yml b/memcached.yml
deleted file mode 100644
index af6c17b11..000000000
--- a/memcached.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- hosts: memcached
-  become: True
-  roles:
-     - hpc-cloud/roles/memcached
diff --git a/neutron-controller.yml b/neutron-controller.yml
deleted file mode 100644
index 3992b6f0e..000000000
--- a/neutron-controller.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: neutron-controller
-  become: True
-  roles:
-     - hpc-cloud/roles/neutron-controller
diff --git a/nova-compute.yml b/nova-compute.yml
deleted file mode 100644
index 308d32683..000000000
--- a/nova-compute.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: nova-compute
-  become: True
-  roles:
-     - hpc-cloud/roles/nova-compute
diff --git a/nova-controller.yml b/nova-controller.yml
deleted file mode 100644
index 87a1db7f9..000000000
--- a/nova-controller.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- hosts: all
-  name: Dummy to gather facts
-  tasks: []
-
-- hosts: nova-controller
-  become: True
-  roles:
-     - hpc-cloud/roles/nova-controller
diff --git a/rabbitmq.yml b/rabbitmq.yml
deleted file mode 100644
index 0dc8cf16a..000000000
--- a/rabbitmq.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- hosts: rabbitmq
-  become: True
-  roles:
-      - hpc-cloud/roles/rabbitmq
-  vars:
-      hostname_node0: "{{ hostvars[groups['rabbitmq'][0]]['ansible_hostname'] }}"
diff --git a/requirements.yml b/requirements.yml
index bf8562e51..27b5324eb 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,10 +1,4 @@
 ---
-# pull down common roles from the HPC cloud repo
-- src: ssh://git@git.webhosting.rug.nl:222/HPC/hpc-cloud.git
-  name: hpc-cloud
-  version: umcg-0.2
-  scm: git
-
 # Mostly user accounts of hpc playbooks.
 - src: ssh://git@git.webhosting.rug.nl:222/HPC/HPCplaybooks.git
   name: HPCplaybooks
diff --git a/settings.yml b/settings.yml
deleted file mode 100644
index 1017c9443..000000000
--- a/settings.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- allocation_pool:
-    start: 172.23.40.38
-    end: 172.23.40.50
-
-- dns_nameserver: 129.125.4.6
-
-- gateway: 172.23.40.250
-
-- subnet_range: 172.23.40.0/24
-
-- rsa_pub: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDStPUPXkcu81onUm/le54JCu174yXJJDsthDr96Mv8irBVBWuy5FxnaASuDpmC4QE4s0UAIg1iq/SWrr8qdBQ4OVuYFiW0S7ZJvcoKr/40Wh+T5MeltGQfmkDp6kBsfaMSo6M4tF1c8i+XgOgxb4fxHYb8mFhseztRLx6McxJJJLB0nu+T12WQ01nl0XtwD+3EsZWfxRH0KA59VHZSe3Anc5z+Fm7WU+1Vzy6/pkiIhVReI1L6VVhZsIdSu3fQK6fHQcujtfuw6RKEpisZQqnxMUviWQ98yeQXHk6Nx840WCh3vvKveEAoC4Y/UEZa1TMe6PczfUaLjaidUkpulJsP egon@egon-pc
diff --git a/dai.yml b/single_roles/dai.yml
similarity index 100%
rename from dai.yml
rename to single_roles/dai.yml
diff --git a/figlet.yml b/single_roles/figlet.yml
similarity index 100%
rename from figlet.yml
rename to single_roles/figlet.yml
diff --git a/firewall.yml b/single_roles/firewall.yml
similarity index 100%
rename from firewall.yml
rename to single_roles/firewall.yml
diff --git a/monitoring.yml b/single_roles/monitoring.yml
similarity index 100%
rename from monitoring.yml
rename to single_roles/monitoring.yml
diff --git a/resolver.yml b/single_roles/resolver.yml
similarity index 100%
rename from resolver.yml
rename to single_roles/resolver.yml
diff --git a/rsyslog.yml b/single_roles/rsyslog.yml
similarity index 100%
rename from rsyslog.yml
rename to single_roles/rsyslog.yml
diff --git a/slurm-client.yml b/single_roles/slurm-client.yml
similarity index 100%
rename from slurm-client.yml
rename to single_roles/slurm-client.yml
diff --git a/slurm.yml b/single_roles/slurm.yml
similarity index 100%
rename from slurm.yml
rename to single_roles/slurm.yml
diff --git a/ssh_host_signer.yml b/single_roles/ssh_host_signer.yml
similarity index 100%
rename from ssh_host_signer.yml
rename to single_roles/ssh_host_signer.yml
diff --git a/site.yml b/site.yml
deleted file mode 100644
index fe79d8726..000000000
--- a/site.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- import_playbook: hpc-cloud/common.yml
-- import_playbook: hpc-cloud/rabbitmq.yml
-- import_playbook: hpc-cloud/memcached.yml
-- import_playbook: hpc-cloud/mariadb.yml
-- import_playbook: hpc-cloud/keystone.yml
-- import_playbook: hpc-cloud/glance-controller.yml
-- import_playbook: hpc-cloud/nova-controller.yml
-- import_playbook: hpc-cloud/neutron-controller.yml
-- import_playbook: hpc-cloud/cinder-controller.yml
-- import_playbook: hpc-cloud/cinder-storage.yml
-- import_playbook: hpc-cloud/nova-compute.yml
-- import_playbook: hpc-cloud/horizon.yml
-- import_playbook: hpc-cloud/heat.yml
-- import_playbook: hpc-cloud/post-install.yml
-...
diff --git a/vnode.yml b/vnode.yml
deleted file mode 100644
index 2caed3adb..000000000
--- a/vnode.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Install Roles that are needed for the virtual cluster.
-  hosts:
-    - cluster
-  become: True
-  roles:
-      #- spacewalk_client
-    - cluster
-      #- ldap
-
-# - import_playbook: users.yml