diff --git a/_config.yml b/_config.yml
index 84b9049a1e..88a9e0a71d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -127,6 +127,7 @@ defaults:
 #   - src is a list of glob source paths within the remote repository
 fetch-remote:
   - repo: "https://github.com/docker/cli"
+    default_branch: "master"
     ref: "20.10"
     paths:
       - dest: "engine/extend"
@@ -145,6 +146,7 @@ fetch-remote:
           - "docs/reference/commandline/dockerd.md"
 
   - repo: "https://github.com/docker/docker"
+    default_branch: "master"
     ref: "20.10"
     paths:
       - dest: "engine/api"
@@ -152,6 +154,7 @@ fetch-remote:
           - "docs/api/**"
 
   - repo: "https://github.com/docker/compose-cli"
+    default_branch: "main"
     ref: "main"
     paths:
       - dest: "cloud"
@@ -161,6 +164,7 @@ fetch-remote:
           - "!docs/architecture.md" # Compose-CLI architecture, unrelated to cloud integration
 
   - repo: "https://github.com/distribution/distribution"
+    default_branch: "main"
     ref: "release/2.7"
     paths:
       - dest: "registry/spec"
diff --git a/_plugins/fetch_remote.rb b/_plugins/fetch_remote.rb
index bd74921b0c..baffb7fc5c 100644
--- a/_plugins/fetch_remote.rb
+++ b/_plugins/fetch_remote.rb
@@ -71,7 +71,7 @@ module Jekyll
 
                     next unless File.file?(ent.path) && File.extname(ent.path) == ".md"
                     # set edit url for markdown files in site config defaults
-                    edit_url = "#{entry['repo']}/edit/#{entry['ref']}/#{file_clean}"
+                    edit_url = "#{entry['repo']}/edit/#{entry['default_branch']}/#{file_clean}"
                     puts "        edit_url: #{edit_url}"
                     site.config['defaults'] << {
                       "scope" => { "path" => destent.path },