diff --git a/openstack_operator/templates/keystone/deployment.yml.j2 b/openstack_operator/templates/keystone/deployment.yml.j2
index 6e189b94..76a6e510 100644
--- a/openstack_operator/templates/keystone/deployment.yml.j2
+++ b/openstack_operator/templates/keystone/deployment.yml.j2
@@ -46,11 +46,11 @@ spec:
             port: keystone
         resources:
           limits:
-            cpu: 1000m
+            cpu: 2000m
             ephemeral-storage: 500M
             memory: 1024M
           requests:
-            cpu: 500m
+            cpu: 1000m
             ephemeral-storage: 500M
             memory: 128M
         securityContext:
@@ -64,6 +64,7 @@ spec:
         hostPath:
           path: {{ spec['configDir'] }}
           type: Directory
+      terminationGracePeriodSeconds: 5
 {% if 'nodeSelector' in spec %}
       nodeSelector:
         {{ spec.nodeSelector | to_yaml | indent(8) }}
diff --git a/openstack_operator/templates/keystone/horizontalpodautoscaler.yml.j2 b/openstack_operator/templates/keystone/horizontalpodautoscaler.yml.j2
index b7993282..2ca889ef 100644
--- a/openstack_operator/templates/keystone/horizontalpodautoscaler.yml.j2
+++ b/openstack_operator/templates/keystone/horizontalpodautoscaler.yml.j2
@@ -26,4 +26,4 @@ spec:
     name: keystone-{{ name }}
   minReplicas: 1
   maxReplicas: 10
-  targetCPUUtilizationPercentage: 50
\ No newline at end of file
+  targetCPUUtilizationPercentage: 90
\ No newline at end of file