diff --git a/README.md b/README.md
index 34a873e09c..e87a8820db 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Documentation
 ==============
 
 The documentation presented at http://docs.openstack.org/infra/system-config comes from
-git://git.openstack.org/openstack-infra/system-config repo's docs/source.  To
+https://git.openstack.org/openstack-infra/system-config repo's docs/source.  To
 build the documentation use
 
  $ tox -evenv python setup.py build_sphinx
diff --git a/modules/openstack_project/manifests/git_backend.pp b/modules/openstack_project/manifests/git_backend.pp
index d1995c74c0..d95b18783c 100644
--- a/modules/openstack_project/manifests/git_backend.pp
+++ b/modules/openstack_project/manifests/git_backend.pp
@@ -62,7 +62,7 @@ class openstack_project::git_backend (
     ssl_chain_file_contents => $ssl_chain_file_contents,
     behind_proxy            => $behind_proxy,
     cgitrc_settings         => {
-        'clone-prefix'   => 'git://git.openstack.org https://git.openstack.org',
+        'clone-prefix'   => 'https://git.openstack.org',
         'commit-filter'  => '/usr/local/bin/commit-filter.sh',
         'css'            => '/static/openstack.css',
         'favicon'        => '/static/favicon.ico',
diff --git a/modules/openstack_project/manifests/planet.pp b/modules/openstack_project/manifests/planet.pp
index 82124b9641..5aa1dd4d41 100644
--- a/modules/openstack_project/manifests/planet.pp
+++ b/modules/openstack_project/manifests/planet.pp
@@ -6,6 +6,6 @@ class openstack_project::planet (
   include ::planet
 
   planet::site { 'openstack':
-    git_url => 'git://git.openstack.org/openstack/openstack-planet',
+    git_url => 'https://git.openstack.org/openstack/openstack-planet',
   }
 }
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 6979dc3142..c282c114f4 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -93,7 +93,6 @@ class openstack_project::review (
       vhost_name                          => 'review.openstack.org',
       canonicalweburl                     => 'https://review.openstack.org/',
       git_http_url                        => 'https://git.openstack.org/',
-      canonical_git_url                   => 'git://git.openstack.org/',
       ssl_cert_file                       => $ssl_cert_file,
       ssl_key_file                        => $ssl_key_file,
       ssl_chain_file                      => $ssl_chain_file,
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index e7e16368ea..f619a5a04f 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -170,7 +170,7 @@ class openstack_project::status (
   include reviewday
 
   reviewday::site { 'reviewday':
-    git_url                       => 'git://git.openstack.org/openstack-infra/reviewday',
+    git_url                       => 'https://git.openstack.org/openstack-infra/reviewday',
     serveradmin                   => 'webmaster@openstack.org',
     httproot                      => '/srv/static/reviewday',
     gerrit_url                    => 'review.openstack.org',
@@ -187,7 +187,7 @@ class openstack_project::status (
   include bugdaystats
 
   bugdaystats::site { 'bugdaystats':
-    git_url     => 'git://git.openstack.org/openstack-infra/bugdaystats',
+    git_url     => 'https://git.openstack.org/openstack-infra/bugdaystats',
     serveradmin => 'webmaster@openstack.org',
     httproot    => '/srv/static/bugdaystats',
     configfile  => '/var/lib/bugdaystats/config.js',
diff --git a/modules/openstack_project/metadata.json b/modules/openstack_project/metadata.json
index 46af576adb..00ebe3a99b 100644
--- a/modules/openstack_project/metadata.json
+++ b/modules/openstack_project/metadata.json
@@ -4,7 +4,7 @@
   "author": "Openstack CI",
   "summary": "Puppet module for openstack_project",
   "license": "Apache 2.0",
-  "source": "git://git.openstack.org/openstack-infra/system-config.git",
+  "source": "https://git.openstack.org/openstack-infra/system-config.git",
   "project_page": "http://docs.openstack.org/infra/system-config/",
   "issues_url": "https://storyboard.openstack.org/#!/project/778",
   "dependencies": []
diff --git a/roles.yaml b/roles.yaml
index 5fa7a026f7..6786249e1d 100644
--- a/roles.yaml
+++ b/roles.yaml
@@ -1,7 +1,7 @@
 ---
-- src: git+git://git.openstack.org/openstack-infra/ansible-role-puppet.git
+- src: git+https://git.openstack.org/openstack-infra/ansible-role-puppet.git
   version: HEAD
   name: puppet
-- src: git+git://git.openstack.org/openstack/ansible-role-cloud-launcher.git
+- src: git+https://git.openstack.org/openstack/ansible-role-cloud-launcher.git
   version: HEAD
   name: cloud-launcher
diff --git a/tools/install_modules_acceptance.sh b/tools/install_modules_acceptance.sh
index 69463c6911..20a9a74060 100755
--- a/tools/install_modules_acceptance.sh
+++ b/tools/install_modules_acceptance.sh
@@ -70,7 +70,7 @@ EOF
     done
 
     sudo -E /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-        git://git.openstack.org \
+        https://git.openstack.org \
         openstack-infra/project-config \
         $project_names
 
diff --git a/tools/logstash-filter-test.sh b/tools/logstash-filter-test.sh
index 35ea33f33e..d2f1c6c996 100755
--- a/tools/logstash-filter-test.sh
+++ b/tools/logstash-filter-test.sh
@@ -17,7 +17,7 @@
 . ./tools/prep-apply.sh
 
 /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
-    git://git.openstack.org \
+    https://git.openstack.org \
     openstack-infra/logstash-filters
 sha=$(git --git-dir=/tmp/openstack-infra/logstash-filters/.git rev-parse HEAD)
 
diff --git a/tools/prep-apply.sh b/tools/prep-apply.sh
index fc58eafd3e..6a73c204d7 100644
--- a/tools/prep-apply.sh
+++ b/tools/prep-apply.sh
@@ -73,7 +73,7 @@ for MOD in ${!INTEGRATION_MODULES[*]}; do
 done
 
 sudo -E /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-    git://git.openstack.org \
+    https://git.openstack.org \
     $project_names
 
 # Fix hostname lookups