diff --git a/devstack/upgrade/settings b/devstack/upgrade/settings
index 66d37959da..c4c6d1275d 100644
--- a/devstack/upgrade/settings
+++ b/devstack/upgrade/settings
@@ -8,7 +8,7 @@ export TARGET_RUN_SMOKE=False
 export ENABLE_TEMPEST=False
 
 devstack_localrc base enable_service manila m-api m-shr m-sch m-dat
-devstack_localrc base enable_plugin manila git://git.openstack.org/openstack/manila stable/newton
+devstack_localrc base enable_plugin manila https://git.openstack.org/openstack/manila stable/newton
 devstack_localrc base MANILA_UI_ENABLED=False
 devstack_localrc base OSLO_SERVICE_WORKS=True
 
@@ -17,7 +17,7 @@ devstack_localrc base OSLO_SERVICE_WORKS=True
 devstack_localrc base MANILACLIENT_BRANCH="stable/newton"
 
 devstack_localrc target enable_service manila m-api m-shr m-sch m-dat
-devstack_localrc target enable_plugin manila git://git.openstack.org/openstack/manila
+devstack_localrc target enable_plugin manila https://git.openstack.org/openstack/manila
 devstack_localrc target MANILA_UI_ENABLED=False
 devstack_localrc target OSLO_SERVICE_WORKS=True
 devstack_localrc target MANILA_USE_DOWNGRADE_MIGRATIONS=False
diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
index 28ec904550..c0fb19ca2f 100644
--- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
@@ -18,7 +18,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
index 83de354dd7..c8adee992b 100644
--- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
@@ -17,7 +17,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
index eba61e68d6..5103ac6f0e 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
@@ -18,7 +18,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
index 9310e03fd3..0b1f8a42c7 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
@@ -18,7 +18,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
index c9f6c12e26..39b9e4e05d 100644
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
@@ -18,7 +18,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
index a54560e260..09dd7fc983 100644
--- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
@@ -17,7 +17,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
index 1e7ea355ec..3c73584599 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
@@ -17,7 +17,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
index e0d12f52d9..2fd4ad2c4e 100644
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
@@ -18,7 +18,7 @@
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
+              https://git.openstack.org \
               openstack-infra/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -31,7 +31,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
-          enable_plugin manila git://git.openstack.org/openstack/manila
+          enable_plugin manila https://git.openstack.org/openstack/manila
 
           EOF
         executable: /bin/bash