diff --git a/keystone/files/keystonerc b/keystone/files/keystonerc
index e4d7306..c91d196 100644
--- a/keystone/files/keystonerc
+++ b/keystone/files/keystonerc
@@ -6,6 +6,8 @@
 export OS_REGION_NAME={{ server.region }}
 export OS_SERVICE_TOKEN={{ server.service_token }}
 export OS_SERVICE_ENDPOINT="http://{{ server.bind.private_address }}:{{ server.bind.private_port }}/v2.0/"
-export OS_INTERFACE=internal
-export OS_ENDPOINT_TYPE="internal"
+{%- if server.interface is defined %}
+export OS_INTERFACE={{ server.interface }}
+{%- endif %}
+export OS_ENDPOINT_TYPE={{ server.get('interface', 'internal') }}
 export OS_CACERT="{{ server.cacert }}"
diff --git a/keystone/server.sls b/keystone/server.sls
index 9996eb3..3608855 100644
--- a/keystone/server.sls
+++ b/keystone/server.sls
@@ -228,7 +228,7 @@
   {%- endif %}
   - watch:
     {%- if server.notification and server.message_queue.get('ssl',{}).get('enabled', False) %}
-    - file: rabbitmq_ca
+    - file: rabbitmq_ca_keystone_server
     {%- endif %}
     - file: /etc/keystone/keystone.conf
 {%- endif %}
@@ -438,7 +438,7 @@
 {%- endif %} {# end noservices #}
 
 {%- if server.database.get('ssl',{}).get('enabled',False)  %}
-mysql_ca:
+mysql_ca_keystone_server:
 {%- if server.database.ssl.cacert is defined %}
   file.managed:
     - name: {{ server.database.ssl.cacert_file }}
@@ -457,7 +457,7 @@
 
 
 {%- if server.notification and server.message_queue.get('ssl',{}).get('enabled', False) %}
-rabbitmq_ca:
+rabbitmq_ca_keystone_server:
 {%- if server.message_queue.ssl.cacert is defined %}
   file.managed:
     - name: {{ server.message_queue.ssl.cacert_file }}