diff --git a/README b/README
index 9e1e659..96c2ddd 100644
--- a/README
+++ b/README
@@ -124,7 +124,7 @@ setup within it:
         Layer type:               Base
         Summary:                  Core metadata
         Description:              Core metadata
-        Repository URL:           git://git.openembedded.org/openembedded-core
+        Repository URL:           https://git.openembedded.org/openembedded-core
         Repository subdirectory:  meta
 
         Once you have filled in the required values, click on the
@@ -217,11 +217,11 @@ been migrated/superseded). If you want to enable this, do the following:
 2. Clone OE-Classic somewhere locally on the machine running the
    layer index:
 
-   git clone git://git.openembedded.org/openembedded
+   git clone https://git.openembedded.org/openembedded
 
 3. Clone a bitbake somewhere locally and check out the 1.12 branch:
 
-   git clone git://git.openembedded.org/bitbake -b 1.12
+   git clone https://git.openembedded.org/bitbake -b 1.12
 
 4. Run import_classic.py, specifying the path to OE-Classic and
    the bitbake you checked out:
diff --git a/docker/connectivity_check.sh b/docker/connectivity_check.sh
index 59b26b8..2e46ce4 100755
--- a/docker/connectivity_check.sh
+++ b/docker/connectivity_check.sh
@@ -25,7 +25,7 @@ if ! wget -q $HTTPS_TEST_URL ; then
     exit 1
 fi
 
-GIT_TEST_REPO="git://git.yoctoproject.org/meta-layerindex-test"
+GIT_TEST_REPO="https://git.yoctoproject.org/meta-layerindex-test"
 if ! git clone -q $GIT_TEST_REPO ; then
     echo "ERROR: failed to clone $GIT_TEST_REPO"
     cleanup_tmp
diff --git a/docker/settings.py b/docker/settings.py
index fdf09de..e3ae0fd 100644
--- a/docker/settings.py
+++ b/docker/settings.py
@@ -250,7 +250,7 @@ LAYER_FETCH_DIR = "/opt/workdir"
 TEMP_BASE_DIR = "/tmp"
 
 # Fetch URL of the BitBake repository for the update script
-BITBAKE_REPO_URL = "git://git.openembedded.org/bitbake"
+BITBAKE_REPO_URL = "https://git.openembedded.org/bitbake"
 
 # Path within the BITBAKE_REPO_URL, usually empty
 BITBAKE_PATH = ""
diff --git a/layerindex/tools/import_classic.py b/layerindex/tools/import_classic.py
index 44f8f88..07565ac 100755
--- a/layerindex/tools/import_classic.py
+++ b/layerindex/tools/import_classic.py
@@ -116,10 +116,10 @@ def main():
         layer.layer_type = 'M'
         layer.summary = 'OE-Classic'
         layer.description = 'OpenEmbedded-Classic'
-        layer.vcs_url =  'git://git.openembedded.org/openembedded'
-        layer.vcs_web_url = 'http://cgit.openembedded.org/openembedded'
-        layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%'
-        layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/openembedded/tree/%path%'
+        layer.vcs_url =  'https://git.openembedded.org/openembedded'
+        layer.vcs_web_url = 'https://git.openembedded.org/openembedded'
+        layer.vcs_web_tree_base_url = 'https://git.openembedded.org/openembedded/tree/%path%'
+        layer.vcs_web_file_base_url = 'https://git.openembedded.org/openembedded/tree/%path%'
         layer.comparison = True
         layer.save()
 
diff --git a/settings.py b/settings.py
index bbc5aca..94b3dd1 100644
--- a/settings.py
+++ b/settings.py
@@ -242,7 +242,7 @@ LAYER_FETCH_DIR = ""
 TEMP_BASE_DIR = "/tmp"
 
 # Fetch URL of the BitBake repository for the update script
-BITBAKE_REPO_URL = "git://git.openembedded.org/bitbake"
+BITBAKE_REPO_URL = "https://git.openembedded.org/bitbake"
 
 # Path within the BITBAKE_REPO_URL, usually empty
 BITBAKE_PATH = ""
diff --git a/templates/layerindex/editlayer.html b/templates/layerindex/editlayer.html
index a95dab3..e14f953 100644
--- a/templates/layerindex/editlayer.html
+++ b/templates/layerindex/editlayer.html
@@ -196,7 +196,7 @@
         if( repoval[repoval.length-1] == '/' )
             repoval = repoval.slice(0, repoval.length-1)
 
-        if( repoval.startsWith('git://git.openembedded.org/') ) {
+        if( repoval.startsWith('git://git.openembedded.org/') || repoval.startsWith('https://git.openembedded.org/') ) {
             reponame = repoval.replace(/^.*\//, '')
             this.vcs_web_url = 'https://git.openembedded.org/' + reponame
             this.vcs_web_tree_base_url = 'https://git.openembedded.org/' + reponame + '/tree/%path%?h=%branch%'
@@ -204,7 +204,7 @@
             this.vcs_web_commit_url = 'https://git.openembedded.org/' + reponame + '/commit/?id=%hash%'
             this.vcs_web_type = 'cgit'
         }
-        else if( repoval.startsWith('git://git.yoctoproject.org/') ) {
+        else if( repoval.startsWith('git://git.yoctoproject.org/') || repoval.startsWith('https://git.yoctoproject.org/') ) {
             reponame = repoval.replace(/^.*\//, '')
             this.vcs_web_url = 'https://git.yoctoproject.org/' + reponame
             this.vcs_web_tree_base_url = 'https://git.yoctoproject.org/' + reponame + '/tree/%path%?h=%branch%'
diff --git a/tests/test_update.py b/tests/test_update.py
index 588b2ed..a0ac897 100644
--- a/tests/test_update.py
+++ b/tests/test_update.py
@@ -63,8 +63,8 @@ def hack_settings(backup_settings):
 
 @pytest.fixture(scope="module")
 def import_layer(hack_settings):
-    run_cmd("layerindex/tools/import_layer.py git://git.openembedded.org/openembedded-core -s meta openembedded-core")
-    run_cmd("layerindex/tools/import_layer.py git://git.yoctoproject.org/meta-layerindex-test -s meta-layerindex-test")
+    run_cmd("layerindex/tools/import_layer.py https://git.openembedded.org/openembedded-core -s meta openembedded-core")
+    run_cmd("layerindex/tools/import_layer.py https://git.yoctoproject.org/meta-layerindex-test -s meta-layerindex-test")
     run_cmd("layerindex/update.py -l meta-layerindex-test")
 
 def test_example_recipe(import_layer):