diff --git a/openstack_operator/keystone.py b/openstack_operator/keystone.py
index c889ef56..c1df3701 100644
--- a/openstack_operator/keystone.py
+++ b/openstack_operator/keystone.py
@@ -108,6 +108,7 @@ def create_or_resume(name, spec, **_):
                            project_name=project_name,
                            region_name=region_name,
                            username=username)
+    # (TODO)Replace the current admin url
     utils.create_or_update('keystone/deployment.yml.j2',
                            name=name, spec=spec,
                            env=env, config_hash=config_hash)
diff --git a/openstack_operator/templates/keystone/deployment.yml.j2 b/openstack_operator/templates/keystone/deployment.yml.j2
index 5525e2fe..daa6fc40 100644
--- a/openstack_operator/templates/keystone/deployment.yml.j2
+++ b/openstack_operator/templates/keystone/deployment.yml.j2
@@ -84,7 +84,7 @@ spec:
         - name: OS_BOOTSTRAP_SERVICE_NAME
           value: keystone
         - name: OS_BOOTSTRAP_INTERNAL_URL
-          value: http://keystone.openstack
+          value: http://keystone.openstack.svc.cluster.local
         command:
         - keystone-manage
         - bootstrap