diff --git a/tasks/archive/nerdfonts.yml b/tasks/archive/nerdfonts.yml
index b24e9f5..bf1bb20 100644
--- a/tasks/archive/nerdfonts.yml
+++ b/tasks/archive/nerdfonts.yml
@@ -24,6 +24,6 @@
         loop_var: font
       ansible.builtin.unarchive:
         creates: "{{ path.prefix }}/{{ nerdfonts.path }}/{{ font }}/README.md"
-        src: "{{ nerdfonts.base_url }}/{{ font }}.tar.xz"
+        src: "{{ nerdfonts.base_url }}/{{ pkgconfig.nerdfonts.fonts[font].archive | default(font) }}.tar.xz"
         dest: "{{ path.prefix }}/{{ nerdfonts.path }}/{{ font }}"
         remote_src: true
diff --git a/vars/pkgs/nerdfonts.yml b/vars/pkgs/nerdfonts.yml
index 0729ff3..f1e27b6 100644
--- a/vars/pkgs/nerdfonts.yml
+++ b/vars/pkgs/nerdfonts.yml
@@ -1,3 +1,5 @@
+# Font key is the name from [https://www.nerdfonts.com/font-downloads]
+# If the archive name is different from the listed name, it is set as the archive key
 nerdfonts:
   fonts:
     0xProto:
@@ -6,21 +8,28 @@ nerdfonts:
       brew: font-3270-nerd-font
     Agave:
       brew: font-agave-nerd-font
-    AnonymousPro:
+    AnonymicePro:
+      archive: AnonymousPro
       brew: font-anonymice-nerd-font
     Arimo:
       brew: font-arimo-nerd-font
-    AurulentSansMono:
+    AurulentSansM:
+      archive: AurulentSansMono
       brew: font-aurulent-sans-mono-nerd-font
-    BigBlueTerminal:
+    BigBlueTerm:
+      archive: BigBlueTerminal
       brew: font-bigblue-terminal-nerd-font
-    BitstreamVeraSansMono:
+    BitstromWera:
+      archive: BitstreamVeraSansMono
       brew: font-bitstream-vera-sans-mono-nerd-font
-    IBMPlexMono:
+    BlexMono:
+      archive: IBMPlexMono
       brew: font-blex-mono-nerd-font
-    CascadiaCode:
+    CaskaydiaCove:
+      archive: CascadiaCode
       brew: font-caskaydia-cove-nerd-font
-    CascadiaMono:
+    CaskaydiaMono:
+      archive: CascadiaMono
       brew: font-caskaydia-mono-nerd-font
     CodeNewRoman:
       brew: font-code-new-roman-nerd-font
@@ -30,19 +39,23 @@ nerdfonts:
       brew: font-commit-mono-nerd-font
     Cousine:
       brew: font-cousine-nerd-font
-    D2Coding:
+    D2CodingLigature:
+      archive: D2Coding
       brew: font-d2coding-nerd-font
     DaddyTimeMono:
       brew: font-daddy-time-mono-nerd-font
-    DejaVuSansMono:
+    DejaVuSansM:
+      archive: DejaVuSansMono
       brew: font-dejavu-sans-mono-nerd-font
     DepartureMono:
       brew: font-departure-mono-nerd-font
-    DroidSansMono:
+    DroidSansM:
+      archive: DroidSansMono
       brew: font-droid-sans-mono-nerd-font
     EnvyCodeR:
       brew: font-envy-code-r-nerd-font
-    FantasqueSansMono:
+    FantasqueSansM:
+      archive: FantasqueSansMono
       brew: font-fantasque-sans-mono-nerd-font
     FiraCode:
       brew: font-fira-code-nerd-font
@@ -50,27 +63,33 @@ nerdfonts:
       brew: font-fira-mono-nerd-font
     GeistMono:
       brew: font-geist-mono-nerd-font
-    Go-Mono:
+    GoMono:
+      archive: Go-Mono
       brew: font-go-mono-nerd-font
-    Gohu:
+    GohuFont:
+      archive: Gohu
       brew: font-gohufont-nerd-font
     Hack:
       brew: font-hack-nerd-font
-    Hasklig:
+    Hasklug:
+      archive: Hasklig
       brew: font-hasklug-nerd-font
     HeavyData:
       brew: font-heavy-data-nerd-font
-    Hermit:
+    Hurmit:
+      archive: Hermit
       brew: font-hurmit-nerd-font
-    IA-Writer:
+    iMWriting:
+      archive: IA-Writer
       brew: font-im-writing-nerd-font
+    Inconsolata:
+      brew: font-inconsolata-nerd-font
     InconsolataGo:
       brew: font-inconsolata-go-nerd-font
     InconsolataLGC:
       brew: font-inconsolata-lgc-nerd-font
-    Inconsolata:
-      brew: font-inconsolata-nerd-font
-    IntelOneMono:
+    IntoneMono:
+      archive: IntelOneMono
       brew: font-intone-mono-nerd-font
     Iosevka:
       brew: font-iosevka-nerd-font
@@ -82,26 +101,28 @@ nerdfonts:
       brew: font-jetbrains-mono-nerd-font
     Lekton:
       brew: font-lekton-nerd-font
-    LiberationMono:
+    LiterationMono:
+      archive: LiberationMono
       brew: font-liberation-nerd-font
     Lilex:
       brew: font-lilex-nerd-font
-    MPlus:
-      brew: font-m+-nerd-font
     MartianMono:
       brew: font-martian-mono-nerd-font
-    Meslo:
+    MesloLG:
+      archive: Meslo
       brew: font-meslo-lg-nerd-font
-    Monaspace:
+    Monaspice:
+      archive: Monaspace
       brew: font-monaspace-nerd-font
     Monofur:
       brew: font-monofur-nerd-font
-    Mononoki:
-      brew: font-mononoki-nerd-font
     Monoid:
       brew: font-monoid-nerd-font
-    NerdFontsSymbolsOnly:
-      brew: font-symbols-only-nerd-font
+    Mononoki:
+      brew: font-mononoki-nerd-font
+    M+:
+      archive: MPlus
+      brew: font-m+-nerd-font
     Noto:
       brew: font-noto-nerd-font
     OpenDyslexic:
@@ -112,24 +133,31 @@ nerdfonts:
       brew: font-profont-nerd-font
     ProggyClean:
       brew: font-proggy-clean-tt-nerd-font
-    Recursive:
+    RecMono:
+      archive: Recursive
       brew: font-recursive-mono-nerd-font
     RobotoMono:
       brew: font-roboto-mono-nerd-font
-    SourceCodePro:
-      brew: font-sauce-code-pro-nerd-font
-    ShareTechMono:
+    ShureTechMono:
+      archive: ShareTechMono
       brew: font-shure-tech-mono-nerd-font
+    SauceCodePro:
+      archive: SourceCodePro
+      brew: font-sauce-code-pro-nerd-font
     SpaceMono:
       brew: font-space-mono-nerd-font
-    Terminus:
+    Symbols:
+      archive: NerdFontsSymbolsOnly
+      brew: font-symbols-only-nerd-font
+    Terminess:
+      archive: Terminus
       brew: font-terminess-ttf-nerd-font
     Tinos:
       brew: font-tinos-nerd-font
-    UbuntuMono:
-      brew: font-ubuntu-mono-nerd-font
     Ubuntu:
       brew: font-ubuntu-nerd-font
+    UbuntuMono:
+      brew: font-ubuntu-mono-nerd-font
     UbuntuSans:
       brew: font-ubuntu-sans-nerd-font
     VictorMono:
@@ -139,9 +167,9 @@ nerdfonts:
   base_url: https://github.com/ryanoasis/nerd-fonts/releases/latest/download
   path: share/fonts
   default_install:
-    - CascadiaCode
+    - CaskaydiaCove
     - FiraCode
-    - Hasklig
+    - Hasklug
     - Lilex
     - Monoid
-    - NerdFontsSymbolsOnly
+    - Symbols