diff --git a/group_vars/all b/group_vars/all
index 6841b3a..ca3bd2f 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -2,7 +2,7 @@
 # Variables listed here are applicable to all host groups
 
 docker_compose_version_to_install: 1.22.0
-docker_ce_version_to_install: 18.09.2
+docker_ce_version_to_install: 18.03.1
 nvm_version: v0.33.5
 node_version: 8.4.0
 registry_location: "registry.wimer.home"
@@ -13,7 +13,6 @@ standard_user: cody
 git_user: "Jacob Cody Wimer"
 git_email: "jacob.wimer@gmail.com"
 proxmox_user: "root@pam"
-proxmox_host: "10.0.0.153"
 proxmox_password: "{{ lookup('env', 'PROXMOX_PASSWORD') }}"
 ubuntu_template_vm_name: "ubuntu-server-1604"
 dns_server: "10.0.0.204"
diff --git a/hosts b/hosts
index 4f23b4e..bf78f2f 100644
--- a/hosts
+++ b/hosts
@@ -1,38 +1,52 @@
 [standard]
-ns ansible_host=10.0.0.204 hypervisor=rack2 memory=1024 cpus=1
-gitea ansible_host=10.0.0.212 hypervisor=rack2 memory=1024 cpus=1
-wrestlingdev-test ansible_host=10.0.0.240 hypervisor=rack2 memory=1024 cpus=1
-guacamole ansible_host=10.0.0.202 hypervisor=rack2 memory=2048 cpus=1
-registry ansible_host=10.0.0.221 hypervisor=rack2 memory=2048 cpus=1
+#haproxy VIP 10.0.0.200
+#tenvis 10.0.0.205
+haproxy-1 ansible_host=10.0.0.209 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+haproxy-2 ansible_host=10.0.0.202 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+registry ansible_host=10.0.0.221 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+ns ansible_host=10.0.0.204 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+gitea ansible_host=10.0.0.212 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+wrestlingdev-test ansible_host=10.0.0.240 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+vpn ansible_host=10.0.0.203 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+plex ansible_host=10.0.0.210 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
+bastion ansible_host=10.0.0.215 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=2560 cpus=1
 
-[developer-machines]
-codydev ansible_host=10.0.0.207 hypervisor=rack2 memory=2048 cpus=2
+#[developer-machines]
+#codydev ansible_host=10.0.0.207 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=2048 cpus=2
 
-[swarm-bootstrap]
-swarm-manager-02 ansible_host=10.0.0.225 hypervisor=rack2 memory=1024 cpus=2
+#[swarm-bootstrap]
+#swarm-manager-02 ansible_host=10.0.0.225 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=1024 cpus=2
 
-[swarm-managers]
-swarm-manager-01 ansible_host=10.0.0.206 hypervisor=rack2 memory=1024 cpus=2
-swarm-manager-03 ansible_host=10.0.0.220 hypervisor=rack2 memory=1024 cpus=2
+#[swarm-managers]
+#swarm-manager-01 ansible_host=10.0.0.206 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=1024 cpus=2
+#swarm-manager-03 ansible_host=10.0.0.220 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=1024 cpus=2
 
-[swarm-workers]
-swarm-worker-01 ansible_host=10.0.0.208 hypervisor=rack2 memory=4096 cpus=4
-swarm-worker-02 ansible_host=10.0.0.213 hypervisor=rack2 memory=4096 cpus=4
-swarm-worker-03 ansible_host=10.0.0.214 hypervisor=rack2 memory=4096 cpus=4
-swarm-worker-04 ansible_host=10.0.0.222 hypervisor=rack2 memory=4096 cpus=4
+#[swarm-workers]
+#swarm-worker-01 ansible_host=10.0.0.208 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=4096 cpus=4
+#swarm-worker-02 ansible_host=10.0.0.213 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=4096 cpus=4
+#swarm-worker-03 ansible_host=10.0.0.214 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=4096 cpus=4
+#swarm-worker-04 ansible_host=10.0.0.222 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=4096 cpus=4
 
 [kube-masters]
-kube-master-1 ansible_host=10.0.0.209 hypervisor=rack2 memory=4096 cpus=4
+kube-master-1 ansible_host=10.0.0.230 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=5120 cpus=2
+kube-master-2 ansible_host=10.0.0.231 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=5120 cpus=2
+kube-master-3 ansible_host=10.0.0.232 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=5120 cpus=2
 
 [kube-workers]
-kube-worker-1 ansible_host=10.0.0.210 hypervisor=rack1 memory=4096 cpus=4
-kube-worker-2 ansible_host=10.0.0.215 hypervisor=rack1 memory=4096 cpus=4
-kube-worker-3 ansible_host=10.0.0.216 hypervisor=rack1 memory=4096 cpus=4
+kube-worker-1 ansible_host=10.0.0.233 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=5120 cpus=2
+kube-worker-2 ansible_host=10.0.0.234 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=5120 cpus=2
+kube-worker-3 ansible_host=10.0.0.235 hypervisor=rack1 hypervisor_ip=10.0.0.152 memory=5120 cpus=2
 
 [need-converted]
-#vpn ansible_host=10.0.0.203 hypervisor=rack2 memory=1024 cpus=1
-#haproxy ansible_host=10.0.0.205 hypervisor=rack2 memory=1024 cpus=1
-#fileserver ansible_host=10.0.0.201 hypervisor=rack2 memory=4096 cpus=1
+#fileserver ansible_host=10.0.0.201 hypervisor=rack2 hypervisor_ip=10.0.0.153 memory=4096 cpus=1
 #template=10.0.0.211
 
+###### INFO ######
+# Next available IP is 216
+# These machines have IPs 200-254
+ 
 # Current consumption
+# Each machine has 24vcpu and 62gb available ram (2 used by system)
+# Regular machines get 1vcpu and 2.5 GB RAM (2560 MB)
+# Bigger machines get 2vcpu and 5 GB RAM (5120 MB)
+# Rack1 21vcpu
diff --git a/playbooks/kvm.yml b/playbooks/kvm.yml
index cbf086a..a6cbb28 100644
--- a/playbooks/kvm.yml
+++ b/playbooks/kvm.yml
@@ -11,11 +11,11 @@
       proxmox_kvm:
         api_user: "{{ proxmox_user }}"
         api_password: "{{ proxmox_password }}"
-        api_host: "{{ proxmox_host }}"
+        api_host: "{{ hypervisor_ip }}"
         clone: "{{ ubuntu_template_vm_name }}"
         full: yes
         name: '{{ inventory_hostname }}'
-        node: 'rack2'
+        node: '{{ hypervisor }}'
         target: '{{ hypervisor }}'
         storage: 'SSD1'
         format: 'qcow2'
@@ -33,7 +33,7 @@
       proxmox_kvm:
         api_user: "{{ proxmox_user }}"
         api_password: "{{ proxmox_password }}"
-        api_host: "{{ proxmox_host }}"
+        api_host: "{{ hypervisor_ip }}"
         name: '{{ inventory_hostname }}'
         node: '{{ hypervisor }}'
         cores: '{{ cpus }}'
@@ -46,7 +46,7 @@
       proxmox_kvm:
         api_user: "{{ proxmox_user }}"
         api_password: "{{ proxmox_password }}"
-        api_host: "{{ proxmox_host }}"
+        api_host: "{{ hypervisor_ip }}"
         name: '{{ inventory_hostname }}'
         node: '{{ hypervisor }}'
         state: started
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 46cfc6c..7a95333 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -42,11 +42,7 @@
 - name: Install docker-ce 
   shell: >
     apt-get install -y -qq docker-ce=$(apt-cache madison docker-ce | grep "{{ docker_ce_version_to_install }}" | awk {'print $3'})
-
-- name: Remove un-needed programs
-  apt: name={{ item }}  state=absent force=yes
-  with_items:
-    - sysstat
+  ignore_errors: true
 
 - name: Replace sudoers file
   template: src=../roles/common/templates/sudoers.j2 dest=/etc/sudoers
@@ -146,4 +142,4 @@
     backup: yes
 
 - name: swap
-  include: swap.yml
\ No newline at end of file
+  include: swap.yml