diff --git a/.github/workflows/casks.yml b/.github/workflows/casks.yml
index 3f3ec078b2..9125008c26 100644
--- a/.github/workflows/casks.yml
+++ b/.github/workflows/casks.yml
@@ -1,8 +1,8 @@
 name: Create Casks PR
 
 env:
-  HOMEBREW_REPO: Homebrew/homebrew-cask-fonts
-  HOMEBREW_FORK: Finii/homebrew-cask-fonts
+  HOMEBREW_REPO: Homebrew/homebrew-cask
+  HOMEBREW_FORK: Finii/homebrew-cask
   FORK_USER: Finii
   FORK_TOKEN: tvguho_cng_11NQ2SVID0mjtXoiVj2bko_WF2keYoRABSDHZizFGzxvOOvlwAByzvuuPYaKQ0U85D26U252MBttV2sRmQ
 
@@ -72,13 +72,13 @@ jobs:
           path: casks
       - name: Prepare changes
         run: |
-          cp casks/* homebrew/Casks
+          cp -r casks/* homebrew/Casks/font
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:
           cwd: homebrew
           fetch: false
-          add: Casks
+          add: Casks/font
           message: "[ci] Update Nerd Font casks to ${{ needs.create-casks.outputs.tag }}"
           committer_name: GitHub Actions
           committer_email: 41898282+github-actions[bot]@users.noreply.github.com
diff --git a/bin/scripts/generate-casks.sh b/bin/scripts/generate-casks.sh
index 088d062122..ff8e2c3bf3 100755
--- a/bin/scripts/generate-casks.sh
+++ b/bin/scripts/generate-casks.sh
@@ -1,10 +1,9 @@
 #!/usr/bin/env bash
 # Nerd Fonts Version: 3.2.1
-# Script Version: 2.2.3
+# Script Version: 2.3.0
 #
 # Iterates over all [*] archived fonts
-# to generate ruby cask files for homebrew-fonts (https://github.com/Homebrew/homebrew-cask-fonts)
-# * Only adds non-Windows versions of the fonts
+# to generate ruby cask files for homebrew-fonts (https://github.com/Homebrew/homebrew-cask)
 # * Needs the zip archives in archives/ (i.e. run `./archive-fonts.sh` first)
 #
 # Uses the current release version (including drafts) of the repo.
@@ -236,14 +235,12 @@ while read -r filename; do
         FONTS=("${FONTS[@]}" "$file")
     done < <(find "$searchdir" -type f -iname '*.[ot]tf' -print0 | LC_ALL=C sort -z)
 
-    outputdir=$PWD/../casks
-
     echo "$LINE_PREFIX Generating cask for: $basename"
 
-    [[ -d "$outputdir" ]] || mkdir -p "$outputdir"
-
     caskname="font-${caskbasename}-nerd-font"
-    to="$outputdir/${caskname}.rb"
+    outputdir="${PWD}/../casks/${caskname:0:6}"
+    [[ -d "$outputdir" ]] || mkdir -p "$outputdir"
+    to="${outputdir}/${caskname}.rb"
 
     clear_file "$to"
     write_header "$to" "$caskname"