diff --git a/config/nodepool/scripts/prepare_node.sh b/config/nodepool/scripts/prepare_node.sh
index 04790d3f..961e21c2 100755
--- a/config/nodepool/scripts/prepare_node.sh
+++ b/config/nodepool/scripts/prepare_node.sh
@@ -59,7 +59,7 @@ sudo apt-get install qemu kpartx -y
 
 #install Sahara requirements
 sudo pip install mysql-python
-cd /tmp && git clone https://github.com/openstack/sahara
+cd /tmp && git clone https://git.openstack.org/openstack/sahara
 cd sahara && sudo pip install -U -r requirements.txt
 
 # install requirements for Cloudera plugin
diff --git a/config/nodepool/scripts/prepare_ui.sh b/config/nodepool/scripts/prepare_ui.sh
index 20a2baa2..824acf1a 100755
--- a/config/nodepool/scripts/prepare_ui.sh
+++ b/config/nodepool/scripts/prepare_ui.sh
@@ -19,7 +19,7 @@ else
 fi
 
 sudo apt-get install libstdc++5 nodejs xserver-xorg libffi-dev apache2 libapache2-mod-wsgi  -y
-git clone https://github.com/openstack/horizon
+git clone https://git.openstack.org/openstack/horizon
 cd horizon && sudo pip install -U -r requirements.txt
 cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
 sudo sed -i "s/OPENSTACK_HOST = \"127.0.0.1\"/OPENSTACK_HOST = \"${OPENSTACK_HOST}\"/g" openstack_dashboard/local/local_settings.py
diff --git a/jenkins_job_builder/defaults.yaml b/jenkins_job_builder/defaults.yaml
index e35fac2c..60d39ee0 100644
--- a/jenkins_job_builder/defaults.yaml
+++ b/jenkins_job_builder/defaults.yaml
@@ -7,8 +7,8 @@
 
       <p>If you would like to make changes to this job, please see:
 
-        <a href="https://github.com/stackforge/sahara-ci-config">
-          https://github.com/stackforge/sahara-ci-config
+        <a href="https://git.openstack.org/stackforge/sahara-ci-config">
+          https://git.openstack.org/stackforge/sahara-ci-config
         </a>
 
       </p>
diff --git a/jenkins_job_builder/diskimage.yaml b/jenkins_job_builder/diskimage.yaml
index 72aae06b..c1912edf 100644
--- a/jenkins_job_builder/diskimage.yaml
+++ b/jenkins_job_builder/diskimage.yaml
@@ -5,7 +5,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/dib.sh hdp_2"
 
     properties:
@@ -28,7 +28,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/dib.sh {plugin} {os}"
 
     properties:
@@ -51,7 +51,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/dib.sh {plugin}"
 
     properties:
@@ -74,7 +74,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/dib.sh {plugin} {os}"
 
     properties:
diff --git a/jenkins_job_builder/jobs-updater.yaml b/jenkins_job_builder/jobs-updater.yaml
index 764f2e82..a7e71a29 100644
--- a/jenkins_job_builder/jobs-updater.yaml
+++ b/jenkins_job_builder/jobs-updater.yaml
@@ -3,7 +3,7 @@
     node: master
     project-type: freestyle
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                   \n<p><b>Title</b>: Jenkins Jobs Update job <br/>\
                   \n<b>Description</b>: This job updates all other jobs from sahara-ci-config repo. <br/>\
                   \n<b>Maintainer</b>: Sergey Kolekonov<br/>"
@@ -13,7 +13,7 @@
 
     scm:
      - git:
-        url: https://github.com/stackforge/sahara-ci-config.git
+        url: https://git.openstack.org/stackforge/sahara-ci-config
         branches:
           - "master"
 
diff --git a/jenkins_job_builder/sahara-ci-check.yaml b/jenkins_job_builder/sahara-ci-check.yaml
index 6ddf515a..28e8bf21 100644
--- a/jenkins_job_builder/sahara-ci-check.yaml
+++ b/jenkins_job_builder/sahara-ci-check.yaml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                  \n<p>This job check syntax in *.yaml, *.sh, *.py files"
     disabled: false
     concurrent: false
diff --git a/jenkins_job_builder/sahara-pypimirror.yaml b/jenkins_job_builder/sahara-pypimirror.yaml
index f09709b9..46032cb5 100644
--- a/jenkins_job_builder/sahara-pypimirror.yaml
+++ b/jenkins_job_builder/sahara-pypimirror.yaml
@@ -3,7 +3,7 @@
     node: master
     project-type: freestyle
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                   \n<p><b>Title</b>: Pypi mirror updater<br/>\
                   \n<b>Description</b>: This job creates/updates Pypi mirror used for testing with all Sahara requirements from all Sahara branches (based on openstack-infra jeepyb scripts). Mirror url:\
                   \n<a href=\"http://sahara.mirantis.net/pypi/\">http://sahara.mirantis.net/pypi</a><br/>\
diff --git a/jenkins_job_builder/sahara-ui.yaml b/jenkins_job_builder/sahara-ui.yaml
index 48e0924c..698e9ad4 100644
--- a/jenkins_job_builder/sahara-ui.yaml
+++ b/jenkins_job_builder/sahara-ui.yaml
@@ -3,7 +3,7 @@
     project-type: freestyle
     defaults: global
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                   \n<p><b>Title</b>: Tests for Sahara dashboard<br/>\
                   \n<b>Description</b>: This job installs Sahara-dashboard and run selenium tests.<br/>\
                   \n<b>Maintainer</b>: Vadim Rovachev<br/>"
@@ -17,7 +17,7 @@
     builders:
     - gerrit-git-prep
     - shell:  "rm -rf sahara-ci-config\
-             \ngit clone https://github.com/stackforge/sahara-ci-config\
+             \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
              \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/gate-ui-tests.sh"
 
     publishers:
diff --git a/jenkins_job_builder/sahara.yaml b/jenkins_job_builder/sahara.yaml
index 37243aab..c48d718c 100644
--- a/jenkins_job_builder/sahara.yaml
+++ b/jenkins_job_builder/sahara.yaml
@@ -5,7 +5,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config /tmp/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config /tmp/sahara-ci-config\
               \nFUNCTION_PATH=/tmp/sahara-ci-config/slave-scripts/functions.sh bash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient.sh"
     properties:
       - zeromq-event
@@ -31,7 +31,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config /tmp/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config /tmp/sahara-ci-config\
               \nFUNCTION_PATH=/tmp/sahara-ci-config/slave-scripts/functions.sh bash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient.sh"
     properties:
       - zeromq-event
@@ -57,7 +57,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config /tmp/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config /tmp/sahara-ci-config\
               \nFUNCTION_PATH=/tmp/sahara-ci-config/slave-scripts/functions.sh bash -x /tmp/sahara-ci-config/slave-scripts/gate-saharaclient.sh"
     properties:
       - zeromq-event
@@ -83,7 +83,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/gate-sahara.sh"
     properties:
       - zeromq-event
@@ -109,7 +109,7 @@
     builders:
       - gerrit-git-prep
       - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nFUNCTION_PATH=sahara-ci-config/slave-scripts/functions.sh bash -x sahara-ci-config/slave-scripts/gate-sahara.sh"
     properties:
       - zeromq-event
@@ -154,7 +154,7 @@
     project-type: freestyle
     defaults: global
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                  \n<p>This job destroys vms which were not deleted after integration tests"
     disabled: false
     concurrent: false
@@ -176,7 +176,7 @@
 
     builders:
     - shell: "rm -rf sahara-ci-config\
-            \ngit clone https://github.com/stackforge/sahara-ci-config\
+            \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
             \nbash sahara-ci-config/slave-scripts/integration-cleanup.sh"
 
 - job:
@@ -184,7 +184,7 @@
     project-type: freestyle
     defaults: global
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                  \n<p>This job runs pep8 check using trunk version of hacking"
     disabled: false
     concurrent: true
@@ -193,7 +193,7 @@
     builders:
     - gerrit-git-prep
     - shell: "rm -rf sahara-ci-config\
-              \ngit clone https://github.com/stackforge/sahara-ci-config\
+              \ngit clone https://git.openstack.org/stackforge/sahara-ci-config\
               \nbash -x sahara-ci-config/slave-scripts/gate-sahara-pep8-trunk.sh"
     properties:
       - zeromq-event
diff --git a/jenkins_job_builder/update-config.yaml b/jenkins_job_builder/update-config.yaml
index 635666c8..9dc57592 100644
--- a/jenkins_job_builder/update-config.yaml
+++ b/jenkins_job_builder/update-config.yaml
@@ -3,7 +3,7 @@
     node: master
     project-type: freestyle
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                   \n<p><b>Title</b>: Update job for Zuul and Nodepool <br/>\
                   \n<b>Description</b>: This job updates Zuul and Nodepool configs from sahara-ci-config repo. <br/>\
                   \n<b>Maintainer</b>: Sergey Kolekonov<br/>"
@@ -13,7 +13,7 @@
 
     scm:
      - git:
-        url: https://github.com/stackforge/sahara-ci-config.git
+        url: https://git.openstack.org/stackforge/sahara-ci-config
         branches:
           - "master"
 
diff --git a/jenkins_job_builder/update-pool.yaml b/jenkins_job_builder/update-pool.yaml
index 4898b7d0..5dff2e9c 100644
--- a/jenkins_job_builder/update-pool.yaml
+++ b/jenkins_job_builder/update-pool.yaml
@@ -3,7 +3,7 @@
     node: master
     project-type: freestyle
     description: "<b>This job is managed by Jenkins Job Builder, do not edit it through WebUI.\
-                  \n<p>Please use this repository to make changes: <a href=\"https://github.com/stackforge/sahara-ci-config\">https://github.com/stackforge/sahara-ci-config</a></b>\
+                  \n<p>Please use this repository to make changes: <a href=\"https://git.openstack.org/stackforge/sahara-ci-config\">https://git.openstack.org/stackforge/sahara-ci-config</a></b>\
                   \n<p><b>Title</b>: Update Pool <br/>\
                   \n<b>Description</b>: This job updates vm pool using Nodepool. <br/>\
                   \n<b>Maintainer</b>: Sergey Kolekonov<br/>"
diff --git a/slave-scripts/gate-saharaclient.sh b/slave-scripts/gate-saharaclient.sh
index 456ffed3..4c749cc0 100644
--- a/slave-scripts/gate-saharaclient.sh
+++ b/slave-scripts/gate-saharaclient.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 sudo rm -rf /tmp/sahara
-git clone https://github.com/openstack/sahara /tmp/sahara
+git clone https://git.openstack.org/openstack/sahara /tmp/sahara
 cd /tmp/sahara
 # prepare test dependencies
 tox -e integration --notest
diff --git a/slave-scripts/gate-ui-tests.sh b/slave-scripts/gate-ui-tests.sh
index 37a99211..7bacc060 100644
--- a/slave-scripts/gate-ui-tests.sh
+++ b/slave-scripts/gate-ui-tests.sh
@@ -8,7 +8,7 @@ sudo iptables -F
 if [ ! -d saharadashboard ]
 then
    DASHBOARD_PATH=$(pwd)/sahara-dashboard
-   git clone https://github.com/openstack/sahara-dashboard
+   git clone https://git.openstack.org/openstack/sahara-dashboard
 else
    DASHBOARD_PATH=$(pwd)
 fi
@@ -22,7 +22,7 @@ enable_pypi
 
 SAHARA_DIR=$HOME/sahara
 rm -rf $SAHARA_DIR
-git clone https://github.com/openstack/sahara $SAHARA_DIR
+git clone https://git.openstack.org/openstack/sahara $SAHARA_DIR
 cd $SAHARA_DIR
 write_sahara_main_conf $SAHARA_DIR/etc/sahara/sahara.conf
 sudo pip install .