diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml
index c05c6b6..3b441e9 100644
--- a/roles/docker/tasks/services.yml
+++ b/roles/docker/tasks/services.yml
@@ -9,11 +9,13 @@
   loop: "{{ services | dict2items(value_name='service') }}"
   when: single_service is not defined and
         item.service.file is defined and
-        item.service.disabled_in_vagrant is not defined
+        (item.service.disabled_in_vagrant is not defined or
+        not (item.service.disabled_in_vagrant and vagrant))
 
 - name: setup single service
   include_tasks: "services/{{ services[single_service].file }}"
   when: single_service is defined and
         single_service in services and
         services[single_service].file is defined and
-        services[single_service].disabled_in_vagrant is not defined
+        (services[single_service].disabled_in_vagrant is not defined or
+        not (services[single_service].disabled_in_vagrant and vagrant))