diff --git a/.github/workflows/pages.yml b/.github/workflows/fontjson.yml
similarity index 65%
rename from .github/workflows/pages.yml
rename to .github/workflows/fontjson.yml
index 345545a78d..3388bd8fea 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/fontjson.yml
@@ -1,4 +1,4 @@
-name: Update gh-pages
+name: Update gitignore and gh-pages
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  sync:
+  sync_pages:
     runs-on: ubuntu-latest
     steps:
       - name: Fetch files
@@ -43,3 +43,22 @@ jobs:
           git-config-name: GitHub Actions
           git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
           clean: false
+
+  update_gitignore:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Regenerate gitignore
+        run: |
+          cd bin/scripts
+          ./update-gitignore.sh
+
+      - name: Commit gitignore back to repo
+        uses: EndBug/add-and-commit@v9
+        with:
+          fetch: false
+          add: ".gitignore"
+          message: "[ci] Update .gitignore file"
+          committer_name: GitHub Actions
+          committer_email: 41898282+github-actions[bot]@users.noreply.github.com
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9588671227..cddc96bcb7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -309,6 +309,7 @@ jobs:
       - name: Commit patched fonts back to repo
         # For fonts with repoRelease == false in the font.json the gitignore should
         # have been setup in a way that this commits only the README.md
+        # See also fontjson.yml and update-gitignore.sh
         uses: EndBug/add-and-commit@v9
         with:
           fetch: false
diff --git a/.gitignore b/.gitignore
index 4e297ccc0c..c8316f197f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,8 @@ bin/scripts/name_parser/__pycache__/*
 bin/scripts/name_parser/log
 # This is just needed for the cheat sheet and not go into the repo:
 css/nerd-fonts-generated-removed.min.css
+# AUTOGENERATED lines follow, do not change or remove the comments
 # Non-Repo-Released fonts, see fonts.json:
 patched-fonts/IntelOneMono/*
 !patched-fonts/IntelOneMono/README.md
+# AUTOGENERATED lines end
diff --git a/bin/scripts/README.md b/bin/scripts/README.md
index 207a57e8c2..daca0db257 100644
--- a/bin/scripts/README.md
+++ b/bin/scripts/README.md
@@ -30,6 +30,7 @@ Note: Usually you need to call the scripts in this directory while actually bein
 * `test-powerlines.sh`: Print-to-debug powerline examples [4]
 * `tests.sh`: Create some font usage gif movie? [x]
 * `update-all-contributors-website.py`: Update the contributors page on `nerdfonts.com` (i.e. gh-pages) [7]
+* `update-gitignore.sh`: Correct gitignore file for not-released-in-repo fonts [8]
 * `version-bump.sh`: Change version number in all scripts on a new release [1]
 
 [1] Used by CI (github release workflow)
@@ -39,4 +40,5 @@ Note: Usually you need to call the scripts in this directory while actually bein
 [5] Used by CI (github packsvgs workflow)
 [6] Used by CI (github casks workflow)
 [7] Used by CI (github contributors workflow)
+[8] Used by CI (github fontjson workflow)
 [x] Probably not used by anything
diff --git a/bin/scripts/lib/fonts.json b/bin/scripts/lib/fonts.json
index 9b79466631..b62cbf5f11 100644
--- a/bin/scripts/lib/fonts.json
+++ b/bin/scripts/lib/fonts.json
@@ -8,6 +8,7 @@
       "imagePreviewFont": "3270 Nerd Font",
       "linkPreviewFont": "font3270",
       "caskName": "3270",
+      "repoRelease": true,
       "description": "Derived from the x3270 font, a modern format of a font with high nostalgic value"
     },
     {
@@ -18,6 +19,7 @@
       "imagePreviewFont": "Agave Nerd Font",
       "linkPreviewFont": "agave",
       "caskName": "agave",
+      "repoRelease": true,
       "description": "A small, monospace, outline font that is geometrically regular and simple"
     },
     {
@@ -28,6 +30,7 @@
       "imagePreviewFont": "AnonymicePro Nerd Font",
       "linkPreviewFont": "anonymous-pro",
       "caskName": "anonymice",
+      "repoRelease": true,
       "description": "Inspired by Anonymous 9 on Macintosh, since 2009, distinct `O`, `0`, `I`, `l`, `1`"
     },
     {
@@ -38,6 +41,7 @@
       "imagePreviewFont": "Arimo Nerd Font",
       "linkPreviewFont": false,
       "caskName": "arimo",
+      "repoRelease": true,
       "description": "Metrically similar to Arial, pan-European WGL character set, sans serif"
     },
     {
@@ -48,6 +52,7 @@
       "imagePreviewFont": "AurulentSansM Nerd Font",
       "linkPreviewFont": "aurulent",
       "caskName": "aurulent",
+      "repoRelease": true,
       "description": "Sans serif, designed by Stephen G. Hartke which also created Verily Serif"
     },
     {
@@ -58,6 +63,7 @@
       "imagePreviewFont": "BigBlueTermPlus Nerd Font",
       "linkPreviewFont": "bigblue-terminal",
       "caskName": "bigblue-terminal",
+      "repoRelease": true,
       "description": "Nostalgic, closely based on IBM's 8x14 EGA/VGA charset"
     },
     {
@@ -68,6 +74,7 @@
       "imagePreviewFont": "BitstromWera Nerd Font",
       "linkPreviewFont": "bitstream-vera",
       "caskName": "bitstream-vera-sans-mono",
+      "repoRelease": true,
       "description": "Dotted zero, compact lowercase characters"
     },
     {
@@ -78,6 +85,7 @@
       "imagePreviewFont": "CaskaydiaCove Nerd Font",
       "linkPreviewFont": "cascadia-code",
       "caskName": "caskaydia-cove",
+      "repoRelease": true,
       "description": "A fun, new monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal"
     },
     {
@@ -88,6 +96,7 @@
       "imagePreviewFont": "BlexMono Nerd Font",
       "linkPreviewFont": "plex-mono",
       "caskName": "blex-mono",
+      "repoRelease": true,
       "description": "It's global, it's versatile and it's distinctly IBM"
     },
     {
@@ -98,6 +107,7 @@
       "imagePreviewFont": "CodeNewRoman Nerd Font",
       "linkPreviewFont": "code-new-roman",
       "caskName": "code-new-roman",
+      "repoRelease": true,
       "description": "Tunable, slashed zeros, compact smaller characters"
     },
     {
@@ -108,6 +118,7 @@
       "imagePreviewFont": "ComicShannsMono Nerd Font",
       "linkPreviewFont": "false",
       "caskName": "comic-shanns-mono",
+      "repoRelease": true,
       "description": "The very typeface you’ve been trained to recognize since childhood"
     },
     {
@@ -118,6 +129,7 @@
       "imagePreviewFont": "Cousine Nerd Font",
       "linkPreviewFont": "cousine",
       "caskName": "cousine",
+      "repoRelease": true,
       "description": "Similar to Courier New with better readablitiy, dotted zeros"
     },
     {
@@ -128,6 +140,7 @@
       "imagePreviewFont": "DaddyTimeMono Nerd Font",
       "linkPreviewFont": "daddytimemono",
       "caskName": "daddy-time-mono",
+      "repoRelease": true,
       "description": "A monospaced font for programmers and other terminal groupies"
     },
     {
@@ -138,6 +151,7 @@
       "imagePreviewFont": "DejaVuSansM Nerd Font",
       "linkPreviewFont": "dejavu",
       "caskName": "dejavu-sans-mono",
+      "repoRelease": true,
       "description": "Dotted zero, based on the Bitstream Vera Fonts with a wider range of character"
     },
     {
@@ -148,6 +162,7 @@
       "imagePreviewFont": "DroidSansM Nerd Font",
       "linkPreviewFont": "droid-sans",
       "caskName": "droid-sans-mono",
+      "repoRelease": true,
       "description": "Good for small screens or font sizes"
     },
     {
@@ -158,6 +173,7 @@
       "imagePreviewFont": "EnvyCodeR Nerd Font",
       "linkPreviewFont": "envy-code-r",
       "caskName": "envy-code-r",
+      "repoRelease": true,
       "description": "Fully-scalable monospaced font designed for programming and command prompts"
     },
     {
@@ -168,6 +184,7 @@
       "imagePreviewFont": "FantasqueSansM Nerd Font",
       "linkPreviewFont": "fantasque-sans",
       "caskName": "fantasque-sans-mono",
+      "repoRelease": true,
       "description": "\"Wibbly-wobbly handwriting-like fuzziness\", takes some inspiration from Inconsolata and Monaco"
     },
     {
@@ -178,6 +195,7 @@
       "imagePreviewFont": "FiraCode Nerd Font",
       "linkPreviewFont": "firacode",
       "caskName": "fira-code",
+      "repoRelease": true,
       "description": "Programming ligatures, extension of Fira Mono font, enlarged operators"
     },
     {
@@ -188,6 +206,7 @@
       "imagePreviewFont": "FiraMono Nerd Font",
       "linkPreviewFont": "fira",
       "caskName": "fira-mono",
+      "repoRelease": true,
       "description": "Mozilla typeface, dotted zero"
     },
     {
@@ -198,6 +217,7 @@
       "imagePreviewFont": "GohuFont 14 Nerd Font",
       "linkPreviewFont": "gohufont-14",
       "caskName": "gohufont",
+      "repoRelease": true,
       "description": "Bitmap font, tall capitals and ascenders, small serifs"
     },
     {
@@ -208,6 +228,7 @@
       "imagePreviewFont": "GoMono Nerd Font",
       "linkPreviewFont": "go-mono",
       "caskName": "go-mono",
+      "repoRelease": true,
       "description": "Created specifically for the Go project, looks particularly clear for use with the Go language"
     },
     {
@@ -218,6 +239,7 @@
       "imagePreviewFont": "Hack Nerd Font",
       "linkPreviewFont": "hack",
       "caskName": "hack",
+      "repoRelease": true,
       "description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera & DejaVu, legible at common sizes"
     },
     {
@@ -228,6 +250,7 @@
       "imagePreviewFont": "Hasklug Nerd Font",
       "linkPreviewFont": "hasklig",
       "caskName": "hasklug",
+      "repoRelease": true,
       "description": "Monospaced ligatures, makes composite glyphs (e.g. ->) more reabable, especially in Haskell"
     },
     {
@@ -238,6 +261,7 @@
       "imagePreviewFont": "HeavyData Nerd Font",
       "linkPreviewFont": false,
       "caskName": "heavy-data",
+      "repoRelease": true,
       "description": "Novel and unique design, dotted zero"
     },
     {
@@ -248,6 +272,7 @@
       "imagePreviewFont": "Hurmit Nerd Font",
       "linkPreviewFont": "hermit",
       "caskName": "hurmit",
+      "repoRelease": true,
       "description": "Symbols stand out from common text"
     },
     {
@@ -258,6 +283,7 @@
       "imagePreviewFont": "iMWritingMono Nerd Font",
       "linkPreviewFont": "ia-writer-mono",
       "caskName": "im-writing",
+      "repoRelease": true,
       "description": "A heavy modification of IBM's Plex font"
     },
     {
@@ -268,6 +294,7 @@
       "imagePreviewFont": "Inconsolata Nerd Font",
       "linkPreviewFont": "inconsolata",
       "caskName": "inconsolata",
+      "repoRelease": true,
       "description": "Slashed zero, takes inspiration from many different fonts and glyphs, subtle curves in lowercase"
     },
     {
@@ -278,6 +305,7 @@
       "imagePreviewFont": "InconsolataGo Nerd Font",
       "linkPreviewFont": "inconsolata-go",
       "caskName": "inconsolata-go",
+      "repoRelease": true,
       "description": "Inconsolata with straight quotes"
     },
     {
@@ -288,6 +316,7 @@
       "imagePreviewFont": "Inconsolata LGC Nerd Font",
       "linkPreviewFont": false,
       "caskName": "inconsolata-lgc",
+      "repoRelease": true,
       "description": "Inconsolata with added the Cyrillic alphabet"
     },
     {
@@ -309,6 +338,7 @@
       "imagePreviewFont": "Iosevka Nerd Font",
       "linkPreviewFont": "iosevka",
       "caskName": "iosevka",
+      "repoRelease": true,
       "description": "Narrow and horizontally tight characters, slashed zero"
     },
     {
@@ -319,6 +349,7 @@
       "imagePreviewFont": "IosevkaTerm Nerd Font",
       "linkPreviewFont": "false",
       "caskName": "iosevka-term",
+      "repoRelease": true,
       "description": "A narrower variant focusing terminal uses: Arrows and geometric symbols will be narrow to follow typical terminal usages"
     },
     {
@@ -329,6 +360,7 @@
       "imagePreviewFont": "JetBrainsMono Nerd Font",
       "linkPreviewFont": "jetbrainsmono",
       "caskName": "jetbrains-mono",
+      "repoRelease": true,
       "description": "JetBrains officially created font for developers"
     },
     {
@@ -339,6 +371,7 @@
       "imagePreviewFont": "Lekton Nerd Font",
       "linkPreviewFont": "lekton",
       "caskName": "lekton",
+      "repoRelease": true,
       "description": "Very light and thin characters, sharp m's, `0` and `O` very similar"
     },
     {
@@ -349,6 +382,7 @@
       "imagePreviewFont": "LiterationMono Nerd Font",
       "linkPreviewFont": "liberation",
       "caskName": "liberation",
+      "repoRelease": true,
       "description": "`0` and `O` very similar, very short tight descenders"
     },
     {
@@ -359,6 +393,7 @@
       "imagePreviewFont": "Lilex Nerd Font",
       "linkPreviewFont": "lilex",
       "caskName": "lilex",
+      "repoRelease": true,
       "description": "Modern with ligatures"
     },
     {
@@ -369,6 +404,7 @@
       "imagePreviewFont": "MesloLGM Nerd Font",
       "linkPreviewFont": "meslo",
       "caskName": "meslo-lg",
+      "repoRelease": true,
       "description": "Slashed zeros, customized version of Apple's Menlo"
     },
     {
@@ -379,6 +415,7 @@
       "imagePreviewFont": "Monofur Nerd Font",
       "linkPreviewFont": "monofur",
       "caskName": "monofur",
+      "repoRelease": true,
       "description": "Dotted zeros, slightly exaggerated curvy characters, compact characters"
     },
     {
@@ -389,6 +426,7 @@
       "imagePreviewFont": "Monoid Nerd Font",
       "linkPreviewFont": "monoid",
       "caskName": "monoid",
+      "repoRelease": true,
       "description": "Ligatures, distinguishable glyphs with short ascenders & descenders, large operators & punctuation"
     },
     {
@@ -399,6 +437,7 @@
       "imagePreviewFont": "Mononoki Nerd Font",
       "linkPreviewFont": "mononoki",
       "caskName": "mononoki",
+      "repoRelease": true,
       "description": "Keeps in mind differentiation of characters and resolution sizes"
     },
     {
@@ -409,6 +448,7 @@
       "imagePreviewFont": "M+1Code Nerd Font",
       "linkPreviewFont": "mplus",
       "caskName": "mplus",
+      "repoRelease": true,
       "description": "Multiple styles and weights, many glyph sets (e.g. Kana glyphs)"
     },
     {
@@ -419,6 +459,7 @@
       "imagePreviewFont": "NotoSansM Nerd Font",
       "linkPreviewFont": "noto",
       "caskName": "noto",
+      "repoRelease": true,
       "description": "`0` and `O` very similar, characters are either very curvy or straight lined"
     },
     {
@@ -429,6 +470,7 @@
       "imagePreviewFont": "OpenDyslexic Nerd Font",
       "linkPreviewFont": "opendyslexic",
       "caskName": "open-dyslexic",
+      "repoRelease": true,
       "description": "Designed specifically to alleviate reading errors caused by dyslexia"
     },
     {
@@ -439,6 +481,7 @@
       "imagePreviewFont": "OverpassM Nerd Font",
       "linkPreviewFont": "overpass",
       "caskName": "overpass",
+      "repoRelease": true,
       "description": "An open source font family inspired by Highway Gothic"
     },
     {
@@ -449,6 +492,7 @@
       "imagePreviewFont": "ProFont IIx Nerd Font",
       "linkPreviewFont": "profont",
       "caskName": "profont",
+      "repoRelease": true,
       "description": "Looks best with anti-aliasing turned off, squared off character corners, vertically tight small `s`"
     },
     {
@@ -459,6 +503,7 @@
       "imagePreviewFont": "ProggyClean Nerd Font",
       "linkPreviewFont": "proggy-clean",
       "caskName": "proggy-clean-tt",
+      "repoRelease": true,
       "description": "Designed particularly for use at small point sizes"
     },
     {
@@ -469,6 +514,7 @@
       "imagePreviewFont": "RobotoMono Nerd Font",
       "linkPreviewFont": "roboto",
       "caskName": "roboto-mono",
+      "repoRelease": true,
       "description": "Dashed zero, curved and straight character lines"
     },
     {
@@ -479,6 +525,7 @@
       "imagePreviewFont": "ShureTechMono Nerd Font",
       "linkPreviewFont": "share-tech",
       "caskName": "shure-tech-mono",
+      "repoRelease": true,
       "description": "Dotted zeros, distinguishable 1 and l, curved and straight character lines"
     },
     {
@@ -489,6 +536,7 @@
       "imagePreviewFont": "SauceCodePro Nerd Font",
       "linkPreviewFont": "source-code-pro",
       "caskName": "sauce-code-pro",
+      "repoRelease": true,
       "description": "Monospaced font family for user interface and coding environments"
     },
     {
@@ -499,6 +547,7 @@
       "imagePreviewFont": "SpaceMono Nerd Font",
       "linkPreviewFont": "space",
       "caskName": "space-mono",
+      "repoRelease": true,
       "description": "Squarish character lines, dotted zero, aggressive parethesis"
     },
     {
@@ -509,6 +558,7 @@
       "imagePreviewFont": "Symbols2048Em Nerd Font Mono",
       "linkPreviewFont": false,
       "caskName": "symbols-only",
+      "repoRelease": true,
       "description": "Just the Nerd Font Icons. I.e Symbol font only"
     },
     {
@@ -519,6 +569,7 @@
       "imagePreviewFont": "Terminess Nerd Font",
       "linkPreviewFont": "terminus",
       "caskName": "terminess-ttf",
+      "repoRelease": true,
       "description": "Squarish characters that are slightly askew"
     },
     {
@@ -529,6 +580,7 @@
       "imagePreviewFont": "Tinos Nerd Font",
       "linkPreviewFont": false,
       "caskName": "tinos",
+      "repoRelease": true,
       "description": "Some similarities to Times New Roman, designed by Steve Matteson, includes pan-European WGL character set"
     },
     {
@@ -539,6 +591,7 @@
       "imagePreviewFont": "Ubuntu Nerd Font",
       "linkPreviewFont": false,
       "caskName": "ubuntu",
+      "repoRelease": true,
       "description": "Specially created for Ubuntu"
     },
     {
@@ -549,6 +602,7 @@
       "imagePreviewFont": "UbuntuMono Nerd Font",
       "linkPreviewFont": "ubuntu",
       "caskName": "ubuntu-mono",
+      "repoRelease": true,
       "description": "Dotted zeros, used the `n`, `o`, `H` & `O` Latin characters as a base for design"
     },
     {
@@ -559,6 +613,7 @@
       "imagePreviewFont": "VictorMono Nerd Font",
       "linkPreviewFont": "victor-mono",
       "caskName": "victor-mono",
+      "repoRelease": true,
       "description": "Clean, crisp and narrow, with a large x-height and clear punctuation"
     }
   ]
diff --git a/bin/scripts/update-gitignore.sh b/bin/scripts/update-gitignore.sh
new file mode 100755
index 0000000000..0c5a16ea5c
--- /dev/null
+++ b/bin/scripts/update-gitignore.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# Nerd Fonts Version: 3.0.2
+# Script Version: 1.0.0
+#
+# Edits the repo's .gitignore to prevent patched font artifacts
+# to be included, if that font is set to be not repo-released.
+# to be included, if that font is set to be not repo-released.
+#
+# Example run
+#   update-gitignore.sh
+
+# set -x
+set -e
+
+# Get script directory to set source and target dirs relative to it
+sd="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 || exit ; pwd -P )"
+repo_root_dir=$(dirname "$(dirname "${sd}")") # two levels up (i.e. ../../)
+
+gitignore=${repo_root_dir}/.gitignore
+gitignore_tmp=${gitignore}~
+
+delimiter="# AUTOGENERATED"
+
+num_comments=$(grep -c "^${delimiter}" "${gitignore}")
+if [ "${num_comments}" -ne 2 ]; then
+    echo "Fatal: Unexpected number of delimiting lines in gitignore file"
+    exit 1
+fi
+if [ -f "${gitignore_tmp}" ]; then
+    echo "Fatal: Temporary file ${gitignore_tmp} already exists"
+    exit 1
+fi
+
+while IFS=$'\n' read -r line; do
+    if [[ "${line}" =~ ^"${delimiter}" ]]; then
+        if [ -z "${remove}" ]; then
+            remove=1
+        else
+            unset remove
+        fi
+        continue
+    fi
+    if [ -z "${remove}" ]; then
+        printf '%s\n' "$line" >> "${gitignore_tmp}"
+    fi
+done < "$gitignore"
+
+i=0
+{
+    echo "${delimiter} lines follow, do not change or remove the comments"
+    echo "# Non-Repo-Released fonts, see fonts.json:"
+    while IFS=$'\n' read -r dir; do
+        echo "patched-fonts/${dir// /\\ }/*"
+        echo "!patched-fonts/${dir// /\\ }/README.md"
+        i=$((i + 1))
+    done < <(jq -r '.fonts[] | select(.repoRelease == false) | .folderName' lib/fonts.json)
+    echo "${delimiter} lines end"
+} >> "${gitignore_tmp}"
+
+echo "Created entries for ${i} fonts in ${gitignore_tmp}"
+mv -v -- "${gitignore_tmp}" "${gitignore}"