diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment-api.yaml
similarity index 99%
rename from keystone/templates/deployment.yaml
rename to keystone/templates/deployment-api.yaml
index 217a02f1..d1622e8d 100644
--- a/keystone/templates/deployment.yaml
+++ b/keystone/templates/deployment-api.yaml
@@ -22,7 +22,7 @@ kind: Deployment
 metadata:
   name: keystone-api
 spec:
-  replicas: {{ .Values.replicas }}
+  replicas: {{ .Values.replicas.api }}
 {{ tuple $envAll | include "helm-toolkit.snippets.kubernetes_upgrades_deployment" | indent 2 }}
   template:
     metadata:
diff --git a/keystone/templates/ingress.yaml b/keystone/templates/ingress-api.yaml
similarity index 100%
rename from keystone/templates/ingress.yaml
rename to keystone/templates/ingress-api.yaml
diff --git a/keystone/templates/service.yaml b/keystone/templates/service-api.yaml
similarity index 100%
rename from keystone/templates/service.yaml
rename to keystone/templates/service-api.yaml
diff --git a/keystone/templates/service-ingress.yaml b/keystone/templates/service-ingress-api.yaml
similarity index 100%
rename from keystone/templates/service-ingress.yaml
rename to keystone/templates/service-ingress-api.yaml
diff --git a/keystone/values.yaml b/keystone/values.yaml
index eca697cb..53da11dd 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -17,7 +17,8 @@
 # Declare name/value pairs to be passed into your templates.
 # name: value
 
-replicas: 1
+replicas:
+  api: 1
 
 labels:
   node_selector_key: openstack-control-plane
@@ -48,9 +49,6 @@ termination_grace_period:
   api:
     timeout: 30
 
-keystone:
-
-
 bootstrap:
   enabled: true
   script: |