diff --git a/roles/bootstrap-os/tasks/bootstrap-coreos.yml b/roles/bootstrap-os/tasks/bootstrap-coreos.yml
index ebeced7d6..a638ad82b 100644
--- a/roles/bootstrap-os/tasks/bootstrap-coreos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-coreos.yml
@@ -3,50 +3,47 @@
   raw: stat /opt/bin/.bootstrapped
   register: need_bootstrap
   ignore_errors: True
-  when: bootstrap_os == "coreos"
+
 
 - name: Bootstrap | Run bootstrap.sh
   script: bootstrap.sh
-  when: (bootstrap_os == "coreos" and need_bootstrap | failed)
+  when: (need_bootstrap | failed)
 
 - set_fact:
     ansible_python_interpreter: "/opt/bin/python"
-  when: bootstrap_os == "coreos"
 
 - name: Bootstrap | Check if we need to install pip
   shell: "{{ansible_python_interpreter}} -m pip --version"
   register: need_pip
   ignore_errors: True
   changed_when: false
-  when: (bootstrap_os == "coreos" and need_bootstrap | failed)
+  when: (need_bootstrap | failed)
 
 - name: Bootstrap | Copy get-pip.py
   copy: src=get-pip.py dest=~/get-pip.py
-  when: (bootstrap_os == "coreos" and need_pip | failed)
+  when: (need_pip | failed)
 
 - name: Bootstrap | Install pip
   shell: "{{ansible_python_interpreter}} ~/get-pip.py"
-  when: (bootstrap_os == "coreos" and need_pip | failed)
+  when: (need_pip | failed)
 
 - name: Bootstrap | Remove get-pip.py
   file: path=~/get-pip.py state=absent
-  when: (bootstrap_os == "coreos" and need_pip | failed)
+  when: (need_pip | failed)
 
 - name: Bootstrap | Install pip launcher
   copy: src=runner dest=/opt/bin/pip mode=0755
-  when: (bootstrap_os == "coreos" and need_pip | failed)
+  when: (need_pip | failed)
 
 - name: Install required python modules
   pip:
     name: "{{ item }}"
   with_items: "{{pip_python_modules}}"
-  when: bootstrap_os == "coreos"
 
 - name: Check configured hostname
   shell: hostname
   register: configured_hostname
-  when: bootstrap_os == "coreos"
 
 - name: Assign inventory name to unconfigured hostnames
   shell: sh -c "echo \"{{inventory_hostname}}\" > /etc/hostname; hostname \"{{inventory_hostname}}\""
-  when: (bootstrap_os == "coreos" and configured_hostname.stdout == 'localhost')
+  when: (configured_hostname.stdout == 'localhost')
diff --git a/roles/bootstrap-os/tasks/bootstrap-ubuntu-xenial.yml b/roles/bootstrap-os/tasks/bootstrap-ubuntu-xenial.yml
deleted file mode 100644
index 70a65a596..000000000
--- a/roles/bootstrap-os/tasks/bootstrap-ubuntu-xenial.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: Bootstrap Xenial target hosts for ansible use
-  raw: apt-get install -y python-minimal
-  when: bootstrap_os == "xenial"
diff --git a/roles/ubuntu-bootstrap/tasks/main.yml b/roles/bootstrap-os/tasks/bootstrap-ubuntu.yml
similarity index 100%
rename from roles/ubuntu-bootstrap/tasks/main.yml
rename to roles/bootstrap-os/tasks/bootstrap-ubuntu.yml
diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml
index 6e35e9b38..5d084ec74 100644
--- a/roles/bootstrap-os/tasks/main.yml
+++ b/roles/bootstrap-os/tasks/main.yml
@@ -1,3 +1,6 @@
 ---
-- include: bootstrap-ubuntu-xenial.yml
+- include: bootstrap-ubuntu.yml
+  when: bootstrap_os == "ubuntu"
+
 - include: bootstrap-coreos.yml
+  when: bootstrap_os == "coreos"
\ No newline at end of file
diff --git a/roles/ubuntu-bootstrap/defaults/main.yml b/roles/ubuntu-bootstrap/defaults/main.yml
deleted file mode 100644
index 0de237cfa..000000000
--- a/roles/ubuntu-bootstrap/defaults/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-bootstrap_versions: Ubuntu 1[6-9]\|2[0-9]\.
\ No newline at end of file