diff --git a/ranger-agent/templates/job-ks-user-ranger-admin.yaml b/ranger-agent/templates/job-ks-user-ranger-admin.yaml
new file mode 100755
index 00000000..d52944f7
--- /dev/null
+++ b/ranger-agent/templates/job-ks-user-ranger-admin.yaml
@@ -0,0 +1,20 @@
+{{/*
+Copyright 2017 The Openstack-Helm Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+{{- if .Values.manifests.job_ks_user_ranger }}
+{{- $ksUserJob := dict "envAll" . "serviceName" "ranger-agent" "serviceUser" "ranger_admin" -}}
+{{ $ksUserJob | include "helm-toolkit.manifests.job_ks_user" }}
+{{- end }}
diff --git a/ranger-agent/templates/secret-keystone.yaml b/ranger-agent/templates/secret-keystone.yaml
index 4e4c2a57..3affe4f8 100755
--- a/ranger-agent/templates/secret-keystone.yaml
+++ b/ranger-agent/templates/secret-keystone.yaml
@@ -16,7 +16,7 @@ limitations under the License.
 
 {{- if .Values.manifests.secret_keystone }}
 {{- $envAll := . }}
-{{- range $key1, $userClass := tuple "admin" "ranger" "ranger_agent" }}
+{{- range $key1, $userClass := tuple "admin" "ranger" "ranger_admin" "ranger_agent" }}
 {{- $secretName := index $envAll.Values.secrets.identity $userClass }}
 ---
 apiVersion: v1
diff --git a/ranger-agent/values.yaml b/ranger-agent/values.yaml
index 7a8f9de6..ac2b834d 100755
--- a/ranger-agent/values.yaml
+++ b/ranger-agent/values.yaml
@@ -261,7 +261,8 @@ pod:
 secrets:
   identity:
     admin: admin
-    ranger: ranger-admin
+    ranger: ranger-service-admin
+    ranger_admin: ranger-admin
     ranger_agent: ranger-agent-admin
   oslo_db:
     admin: ranger-agent-db-admin
@@ -323,6 +324,14 @@ endpoints:
         project_name: service
         user_domain_name: default
         project_domain_name: default
+      ranger_admin:
+        role: admin
+        region_name: RegionOne
+        username: ranger-admin
+        password: password
+        project_name: admin
+        user_domain_name: default
+        project_domain_name: default
     hosts:
       default: keystone
       internal: keystone-api
diff --git a/ranger/values.yaml b/ranger/values.yaml
index 48c7c9b3..86895f81 100755
--- a/ranger/values.yaml
+++ b/ranger/values.yaml
@@ -246,6 +246,14 @@ endpoints:
         project_name: service
         user_domain_name: default
         project_domain_name: default
+      ranger_admin:
+        role: admin
+        region_name: RegionOne
+        username: ranger-admin
+        password: password
+        project_name: admin
+        user_domain_name: default
+        project_domain_name: default
     hosts:
       default: keystone
       internal: keystone-api