diff --git a/.kitchen.yml b/.kitchen.yml
index 73f2e37..32e9f68 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -10,7 +10,7 @@
   salt_bootstrap_url: https://bootstrap.saltstack.com
   salt_version: latest
   require_chef: false
-  log_level: info
+  log_level: error
   formula: keystone
   grains:
     noservices: False
diff --git a/keystone/server.sls b/keystone/server.sls
index b8fde3a..c88db61 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -8,13 +8,11 @@
 {%- if server.service_name in ['apache2', 'httpd'] %}
 {%- set keystone_service = 'apache_service' %}
 
-{%- if not grains.get('noservices', False) %}
 purge_not_needed_configs:
   file.absent:
     - names: ['/etc/apache2/sites-enabled/keystone.conf', '/etc/apache2/sites-enabled/wsgi-keystone.conf']
     - watch_in:
       - service: {{ keystone_service }}
-{%- endif %}
 
 include:
 - apache
@@ -135,10 +133,8 @@
     - template: jinja
     - require:
       - file: /etc/keystone/domains
-    {%- if not grains.get('noservices', False) %}
     - watch_in:
       - service: {{ keystone_service }}
-    {%- endif %}
     - defaults:
         domain_name: {{ domain_name }}
 
@@ -157,7 +153,6 @@
 
 {%- endif %}
 
-{%- if not grains.get('noservices', False) %}
 keystone_domain_{{ domain_name }}:
   cmd.run:
     - name: source /root/keystonercv3 && openstack domain create --description "{{ domain.description }}" {{ domain_name }}
@@ -165,7 +160,6 @@
     - require:
       - file: /root/keystonercv3
       - service: {{ keystone_service }}
-{%- endif %}
 
 {%- endfor %}
 
@@ -189,9 +183,9 @@
   service.running:
   - name: {{ server.service_name }}
   - enable: True
-  {% if grains.noservices is defined %}
-  - onlyif: {% if grains.get('noservices', "True") %}"True"{% else %}False{% endif %}
-  {% endif %}
+  {%- if grains.get('noservices') %}
+  - onlyif: /bin/false
+  {%- endif %}
   - watch:
     - file: /etc/keystone/keystone.conf
 {%- endif %}