diff --git a/docker/client/compose.sls b/docker/client/compose.sls
index 5567b36..a07eaf3 100644
--- a/docker/client/compose.sls
+++ b/docker/client/compose.sls
@@ -104,15 +104,12 @@
     - watch:
       - file: docker_{{ app }}_env
       - file: docker_{{ app }}_compose
-    {%- if not grains.get('noservices', False)%}
     {%- if compose.status is defined %}
     - watch_in:
       - cmd: docker_{{ app }}_{{ compose.status }}
     {%- endif %}
-    {%- endif %}
 {%- endif %}
 
-{%- if not grains.get('noservices', False)%}
 {%- if compose.status is defined %}
 docker_{{ app }}_{{ compose.status }}:
   cmd.run:
@@ -120,6 +117,9 @@
     endif %}docker-compose {{ compose.status }} -d'
     - cwd: {{ client.compose.base }}/{{ app }}
     - user: {{ compose.user|default("root") }}
+    {% if grains.noservices is defined %}
+    - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
+    {% endif %}
     - require:
         {%- if client.compose.source.engine == 'pkg' %}
         - pkg: docker_compose
@@ -133,5 +133,4 @@
       - file: docker_{{ app }}_compose
 {%- endif %}
 {%- endif %}
-{%- endif %}
 {%- endfor %}
diff --git a/docker/host.sls b/docker/host.sls
index a8bc815..fca6fec 100644
--- a/docker/host.sls
+++ b/docker/host.sls
@@ -23,10 +23,8 @@
   - template: jinja
   - require:
     - pkg: docker_packages
-  {%- if not grains.get('noservices', False)%}
   - watch_in:
     - service: docker_service
-  {%- endif %}
 
 {%- endif %}
 
@@ -37,23 +35,19 @@
   - makedirs: True
   - require:
     - pkg: docker_packages
-  {%- if not grains.get('noservices', False)%}
   - watch_in:
     - service: docker_service
-  {%- endif %}
-
-{%- if not grains.get('noservices', False)%}
 
 docker_service:
   service.running:
   - name: {{ host.service }}
   - enable: true
+  {% if grains.noservices is defined %}
+  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
+  {% endif %}
   - require:
     - pkg: docker_packages
 
-{%- endif %}
-
-
 {%- if host.registry is defined %}
 
 {%- for name,registry in host.registry.iteritems() %}