diff --git a/keystone/client.sls.orig b/keystone/client.sls.orig
deleted file mode 100644
index 8a8cb30..0000000
--- a/keystone/client.sls.orig
+++ /dev/null
@@ -1,63 +0,0 @@
-{%- from "keystone/map.jinja" import client with context %}
-{%- if client.enabled %}
-
-keystone_client_packages:
-  pkg.installed:
-  - names: {{ client.pkgs }}
-
-/root/openrc:
-  file.managed:
-  - source: salt://keystone/conf/openrc
-  - template: jinja
-
-{%- if client.tenant is defined %}
-
-keystone_client_roles:
-  keystone.role_present:
-  - names: {{ client.roles }}
-
-{%- for tenant_name, tenant in client.get('tenant', {}).iteritems() %}
-
-keystone_tenant_{{ tenant_name }}:
-  keystone.tenant_present:
-  - name: {{ tenant_name }}
-  - require:
-    - keystone: keystone_client_roles
-
-{%- for user_name, user in tenant.get('user', {}).iteritems() %}
-
-keystone_{{ tenant_name }}_user_{{ user_name }}:
-  keystone.user_present:
-  - name: {{ user_name }}
-  - password: {{ user.password }}
-  - email: {{ user.get('email', 'root@localhost') }}
-  - tenant: {{ tenant_name }}
-<<<<<<< HEAD
-  - roles: 
-      "{{ tenant_name }}":
-        {%- if user.get('is_admin', False) %}
-        - admin
-        {%- else %}
-        - Member
-        {%- endif %}
-=======
-  - roles:
-    - {{ tenant_name }}:
-      {%- if user.get('is_admin', False) %}
-      - admin
-      {%- elif user.get('roles', False) %}
-      {{ user.roles }}
-      {%- else %}
-      - Member
-      {%- endif %}
->>>>>>> Allow to define keystone roles in pillar
-  - require:
-    - keystone: keystone_tenant_{{ tenant_name }}
-
-{%- endfor %}
-
-{%- endfor %}
-
-{%- endif %}
-
-{%- endif %}
diff --git a/keystone/files/sensu.conf b/keystone/files/sensu.conf
deleted file mode 100644
index 282fa3c..0000000
--- a/keystone/files/sensu.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-local_keystone_server_proc:
-  command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C keystone-all -u keystone -c 1:20"
-  interval: 60
-  occurrences: 1
-  subscribers:
-  - local-keystone-server
-remote_keystone_server_api:
-  command: "PATH=$PATH:/usr/local/bin oschecks-check_keystone_api --os-auth-url='http://:::openstack.host:::::::openstack.port:::/v2.0' --os-username :::openstack.user::: --os-password :::openstack.password::: --tenant :::openstack.tenant:::"
-  interval: 300
-  occurrences: 1
-  subscribers:
-  - remote-network
\ No newline at end of file
diff --git a/keystone/meta/sphinx.yml b/keystone/meta/sphinx.yml
index ace988c..dd8af20 100644
--- a/keystone/meta/sphinx.yml
+++ b/keystone/meta/sphinx.yml
@@ -10,7 +10,9 @@
   {%- if pillar.keystone.server is defined %}
     server:
       name: server
-      param: {}
+      param:
+        token_engine:
+          value: {{ server.tokens.engine }}
   {%- endif %}
   {%- if pillar.keystone.control is defined %}
     control:
diff --git a/metadata/service/client/init.yml b/metadata/service/client/init.yml
index e69de29..b89c0ea 100644
--- a/metadata/service/client/init.yml
+++ b/metadata/service/client/init.yml
@@ -0,0 +1,2 @@
+classes:
+- service.keystone.support
diff --git a/metadata/service/server/cluster.yml b/metadata/service/server/cluster.yml
index f1e7f03..89eb9e1 100644
--- a/metadata/service/server/cluster.yml
+++ b/metadata/service/server/cluster.yml
@@ -1,5 +1,7 @@
 applications:
 - keystone
+classes:
+- service.keystone.support
 parameters:
   _param:
     mysql_keystone_password: password
diff --git a/metadata/service/server/single.yml b/metadata/service/server/single.yml
index 5ba48d9..8415473 100644
--- a/metadata/service/server/single.yml
+++ b/metadata/service/server/single.yml
@@ -1,8 +1,8 @@
 applications:
 - keystone
+classes:
+- service.keystone.support
 parameters:
-  _param:
-    mysql_keystone_password: password
   keystone:
     server:
       enabled: true