diff --git a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
index 2b17956..be346cd 100644
--- a/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-pike-dvr-sl.yml
@@ -150,7 +150,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
index df0c250..d8302c2 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-contrail41-sl.yml
@@ -150,7 +150,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
index a0ec82a..5e575af 100644
--- a/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/2019.2.0-heat-cicd-queens-dvr-sl.yml
@@ -150,7 +150,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
index 108aadd..e64a02c 100644
--- a/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-b300-cicd-queens-ovs-maas.yml
@@ -138,7 +138,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/bm-cicd-pike-ovs-maas.yml b/jobs/templates/bm-cicd-pike-ovs-maas.yml
index d3dfb38..a3b6e4a 100644
--- a/jobs/templates/bm-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-pike-ovs-maas.yml
@@ -138,7 +138,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/bm-cicd-queens-ovs-maas.yml b/jobs/templates/bm-cicd-queens-ovs-maas.yml
index fc07ba4..73b9196 100644
--- a/jobs/templates/bm-cicd-queens-ovs-maas.yml
+++ b/jobs/templates/bm-cicd-queens-ovs-maas.yml
@@ -138,7 +138,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
index 80a464e..26e463e 100644
--- a/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-odl-maas.yml
@@ -148,7 +148,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
index d8de8b1..131f7e3 100644
--- a/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
+++ b/jobs/templates/bm-e7-cicd-pike-ovs-maas.yml
@@ -143,7 +143,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/deploy-released.yml b/jobs/templates/deploy-released.yml
index 95f2ff5..126b5e0 100644
--- a/jobs/templates/deploy-released.yml
+++ b/jobs/templates/deploy-released.yml
@@ -33,7 +33,7 @@
           name: OS_CREDENTIALS
           trim: 'false'
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: ''
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/deploy_bm.yml b/jobs/templates/deploy_bm.yml
index ebdb885..0e3c102 100644
--- a/jobs/templates/deploy_bm.yml
+++ b/jobs/templates/deploy_bm.yml
@@ -34,7 +34,7 @@
         name: PARENT_NODE_NAME
         trim: 'false'
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: ''
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
index c55e807..576936f 100644
--- a/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-pike-contrail-sl.yml
@@ -145,7 +145,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
index d8b6eeb..313f9c6 100644
--- a/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
+++ b/jobs/templates/heat-bm-cicd-queens-contrail-sl.yml
@@ -146,7 +146,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/heat-cicd-pike-dvr-sl.yml b/jobs/templates/heat-cicd-pike-dvr-sl.yml
index 0248d9d..2ade702 100644
--- a/jobs/templates/heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-pike-dvr-sl.yml
@@ -155,7 +155,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/heat-cicd-queens-contrail41-sl.yml b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
index a7e8944..2eca95b 100644
--- a/jobs/templates/heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/heat-cicd-queens-contrail41-sl.yml
@@ -148,7 +148,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/heat-cicd-queens-dvr-sl.yml b/jobs/templates/heat-cicd-queens-dvr-sl.yml
index a159abd..bcaaa84 100644
--- a/jobs/templates/heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/heat-cicd-queens-dvr-sl.yml
@@ -149,7 +149,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/released-bm-pike-ovs.yml b/jobs/templates/released-bm-pike-ovs.yml
index c3f1961..ceb8563 100644
--- a/jobs/templates/released-bm-pike-ovs.yml
+++ b/jobs/templates/released-bm-pike-ovs.yml
@@ -133,7 +133,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
index f0670f0..0e00a79 100644
--- a/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-contrail41-sl.yml
@@ -153,7 +153,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
index 9273793..da9c52a 100644
--- a/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-pike-dvr-sl.yml
@@ -153,7 +153,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
index 5e3d05c..89f5d39 100644
--- a/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-contrail41-sl.yml
@@ -151,7 +151,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'
diff --git a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
index 01921e0..8d845b6 100644
--- a/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
+++ b/jobs/templates/released-heat-cicd-queens-dvr-sl.yml
@@ -153,7 +153,7 @@
         description: ''
         name: ENV_MANAGER
     - string:
-        default: https://ic-eu.ssl.mirantis.net:5000/v3
+        default: https://keystone.ic-eu.ssl.mirantis.net/v3
         description: 'Openstack keystone catalog endpoint, for example https://10.90.0.80:5000/v3'
         name: OS_AUTH_URL
         trim: 'false'