diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 830c6101..174ca6de 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -44,7 +44,7 @@ Vagrant.configure("2") do |config|
             ansible.limit = "all"
             ansible.playbook = "site.yml"
             ansible.groups = {
-                "master" => ["master"],
+                "masters" => ["master"],
                 "nodes" => (0..NODES-1).map {|j| "node#{j}"},
             }
             ansible.extra_vars = {
diff --git a/vagrant/gcr_proxy.yml b/vagrant/gcr_proxy.yml
index 930fccc1..38869993 100644
--- a/vagrant/gcr_proxy.yml
+++ b/vagrant/gcr_proxy.yml
@@ -1,4 +1,4 @@
-- hosts: master
+- hosts: masters
   become: yes
   become_method: sudo
   vars_files:
@@ -7,7 +7,7 @@
     - include_role:
         name: master
         tasks_from: gcr_proxy.yml
-      when: custom_registry_gcr | default(false)
+      when: custom_registry_gcr is default(false)
 
 - hosts: nodes
   become: yes
@@ -18,4 +18,4 @@
     - include_role:
         name: nodes
         tasks_from: gcr_proxy.yml
-      when: custom_registry_gcr | default(false)
+      when: custom_registry_gcr is default(false)
diff --git a/vagrant/roles/common/tasks/main.yml b/vagrant/roles/common/tasks/main.yml
index f0926eec..1e93f04e 100644
--- a/vagrant/roles/common/tasks/main.yml
+++ b/vagrant/roles/common/tasks/main.yml
@@ -137,11 +137,11 @@
 
   - name: install fixed kubelet-kubeadm config file (1.8 and later)
     copy: src=10-kubeadm-post-1.8.conf dest=/etc/systemd/system/kubelet.service.d/10-kubeadm.conf owner=root group=root mode=644 backup=yes
-  when: kube_ver.stdout | version_compare('1.8', '>=')
+    when: kube_ver.stdout is version_compare('1.8', '>=')
 
 - name: install fixed kubelet-kubeadm config file
   copy: src=10-kubeadm.conf dest=/etc/systemd/system/kubelet.service.d/ owner=root group=root mode=644 backup=yes
-  when: kube_ver.stdout | version_compare('1.8', '<')
+  when: kube_ver.stdout is version_compare('1.8', '<')
 
 - name: copy docker conf
   template: src=docker.j2 dest=/etc/sysconfig/docker force=yes mode=0644
diff --git a/vagrant/roles/master/tasks/main.yml b/vagrant/roles/master/tasks/main.yml
index bedd28e4..48dabc0a 100644
--- a/vagrant/roles/master/tasks/main.yml
+++ b/vagrant/roles/master/tasks/main.yml
@@ -1,4 +1,4 @@
-- include: gcr_proxy.yml
+- include_tasks: gcr_proxy.yml
   when:
   - custom_registry is defined
   - custom_registry_gcr | default(false)
diff --git a/vagrant/roles/nodes/tasks/main.yml b/vagrant/roles/nodes/tasks/main.yml
index b6584a2e..f6307921 100644
--- a/vagrant/roles/nodes/tasks/main.yml
+++ b/vagrant/roles/nodes/tasks/main.yml
@@ -16,7 +16,7 @@
 - name: Open ports 49152-49251 (GlusterFS bricks)
   firewalld: port=49152-49251/tcp zone=trusted permanent=true state=enabled immediate=true
 
-- include: gcr_proxy.yml
+- include_tasks: gcr_proxy.yml
   when:
   - custom_registry is defined
   - custom_registry_gcr | default(false)
diff --git a/vagrant/site.yml b/vagrant/site.yml
index a78bc8b7..56612d62 100644
--- a/vagrant/site.yml
+++ b/vagrant/site.yml
@@ -15,7 +15,7 @@
   roles:
     - common
 
-- hosts: master
+- hosts: masters
   become: yes
   become_method: sudo
   vars_files:
@@ -31,7 +31,7 @@
   roles:
     - nodes
 
-- hosts: master
+- hosts: masters
   become: yes
   become_method: sudo
   vars_files: