diff --git a/devstack/lib/keystone b/devstack/lib/keystone
index 9378840a..0127cb68 100644
--- a/devstack/lib/keystone
+++ b/devstack/lib/keystone
@@ -22,6 +22,7 @@ export -f install_keystone
 
 # init_keystone() - Initialize databases, etc.
 function init_keystone {
+	kubectl create secret generic keystone-config --from-file=/etc/keystone/keystone.conf -n openstack
 
 	# NOTE(mnaser): Permissions here are bad but it's temporary so we don't care as much.
 	sudo chmod -Rv 777 /etc/keystone
diff --git a/openstack_operator/templates/keystone/deployment.yml.j2 b/openstack_operator/templates/keystone/deployment.yml.j2
index daa6fc40..ed87fbf0 100644
--- a/openstack_operator/templates/keystone/deployment.yml.j2
+++ b/openstack_operator/templates/keystone/deployment.yml.j2
@@ -129,7 +129,7 @@ spec:
           runAsUser: 65534
           runAsGroup: 65534
         volumeMounts:
-        - mountPath: /etc/keystone
+        - mountPath: /etc/keystone/
           name: config
         - name: fernet-keys
           mountPath: /etc/keystone/fernet-keys
@@ -137,9 +137,8 @@ spec:
           mountPath: /etc/keystone/credential-keys
       volumes:
       - name: config
-        hostPath:
-          path: {{ spec['configDir'] }}
-          type: Directory
+        secret:
+          secretName: keystone-config
       - name: fernet-keys
         secret:
           secretName: keystone-fernet