diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 26bbc15140..0b4a9c2507 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,13 @@ jobs:
             sed -i '/total size\|file list/d' content/.gitignore;
           done
       - name: Build
-        run: hugo --minify
+        run: |
+          # Delete unnecessary files to prevent hugo from creating shared 404.html files for the wrong default language - Temporary fix
+          find content -name '404.md' -not -path 'content/en/404.md' -exec rm {} +
+          # Build
+          hugo --minify
+          # Append language options to public/404.html - Temporary fix
+          sed -i 's|<option>English</option>|&<option value="/fr">Français</option><option value="/ja">日本語</option>|g' public/404.html
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
diff --git a/config/_default/languages.yaml b/config/_default/languages.yaml
index cd8f6fa0d8..9edf73bfbf 100644
--- a/config/_default/languages.yaml
+++ b/config/_default/languages.yaml
@@ -1,36 +1,36 @@
 en:
   languageName: English
   contentDir: content/en
-  weight: 1
+  weight: 10
+fr:
+  languageName: Français
+  contentDir: content/fr
+  weight: 20
 ja:
   languageName: 日本語
   contentDir: content/ja
-  weight: 2
+  weight: 20
 de:
   languageName: Deutsch
   contentDir: content/de
-  weight: 3
-zh:
-  languageName: 中文
-  contentDir: content/zh
-  weight: 3
-it:
-  languageName: Italiano
-  contentDir: content/it
-  weight: 3
+  weight: 30
 es:
   languageName: Español
   contentDir: content/es
-  weight: 3
-ru:
-  languageName: Русский
-  contentDir: content/ru
-  weight: 3
-fr:
-  languageName: Français
-  contentDir: content/fr
-  weight: 3
+  weight: 30
+it:
+  languageName: Italiano
+  contentDir: content/it
+  weight: 30
 pt-br:
   languageName: Português Brasileiro
   contentDir: content/pt-br
-  weight: 3
\ No newline at end of file
+  weight: 30
+ru:
+  languageName: Русский
+  contentDir: content/ru
+  weight: 30
+zh:
+  languageName: 中文
+  contentDir: content/zh
+  weight: 30
\ No newline at end of file
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 067b5c8046..6a3e150d06 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -41,7 +41,7 @@
         {{ else }}
           <select id="langpicker" class="selectpicker" data-style="btn-light btn-sm ml-3" data-width="fit">
             <option>{{ .Site.Language.LanguageName }}</option>
-            {{ range where .Translations ".Language.LanguageName" "in" "English 日本語 Français"}}
+            {{ range where .Translations ".Language.LanguageName" "in" "English Français 日本語"}}
             <option value="{{ .Permalink }}">{{ .Language.LanguageName }}</option>
             {{ end }}
           </select>