diff --git a/tasks/mesos.yml b/tasks/mesos.yml
index 5984141..4186887 100644
--- a/tasks/mesos.yml
+++ b/tasks/mesos.yml
@@ -69,3 +69,10 @@
     - Reload daemon
     - Restart mesos-slave
 
+- name: Disable mesos-master service
+  service: name=mesos-master enabled=no
+  when: mesos_install_mode == "slave" and systemd_check.stat.exists == true
+
+- name: Disable mesos-slave service
+  service: name=mesos-slave enabled=no
+  when: mesos_install_mode == "master" and systemd_check.stat.exists == true
diff --git a/vars/main.yml b/vars/main.yml
index a90aa5f..ec2c63d 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,2 +1,2 @@
 ---
-mesos_playbook_version: "0.3.6"
+mesos_playbook_version: "0.3.7"