diff --git a/roles/common/tasks/guest.yml b/roles/common/tasks/guest.yml
index 04b0c04..bfe6628 100644
--- a/roles/common/tasks/guest.yml
+++ b/roles/common/tasks/guest.yml
@@ -4,11 +4,24 @@
   stat: path=/dev/virtio-ports/org.qemu.guest_agent.0
   register: qemu_ga_dev
 
-- block:
-    - include_tasks: guest_{{ ansible_os_family }}.yml
+- when:
+    - qemu_ga_dev.stat.exists | default(False)
+    - ansible_virtualization_type == 'kvm'
+  block:
+    - name: Install qemu guest agent
+      package:
+        name:
+          - qemu-guest-agent
 
     - name: Start and enable qemu guest agent
       service: name=qemu-guest-agent state=started enabled=True
-  when:
-    - qemu_ga_dev.stat.exists | default(False)
-    - ansible_virtualization_type == 'kvm'
+
+- when: ansible_virtualization_type == 'VMware'
+  block:
+    - name: Install open-vm-tools
+      package:
+        name:
+          - open-vm-tools
+
+    - name: Start and enable vmtoolsd
+      service: name=vmtoolsd state=started enabled=True
diff --git a/roles/common/tasks/guest_Debian.yml b/roles/common/tasks/guest_Debian.yml
deleted file mode 100644
index 100b660..0000000
--- a/roles/common/tasks/guest_Debian.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- name: Install qemu guest agent
-  apt: name=qemu-guest-agent state=present
diff --git a/roles/common/tasks/guest_RedHat.yml b/roles/common/tasks/guest_RedHat.yml
deleted file mode 100644
index a279e07..0000000
--- a/roles/common/tasks/guest_RedHat.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- name: Install qemu guest agent
-  yum: name=qemu-guest-agent state=present
-