diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
index 9f15e2d1a..78172923e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
@@ -182,9 +182,6 @@
                 <Multiple>Y</Multiple>
                 <OptionValues>
                     <atf>Abuse.ch - ThreatFox IOC database</atf>
-                    <oisd0>OISD - Domain Blocklist Ads</oisd0>
-                    <oisd1>OISD - Domain Blocklist Big</oisd1>
-                    <oisd2>OISD - Domain Blocklist NSFW</oisd2>
                     <aa>AdAway List</aa>
                     <ag>AdGuard List</ag>
                     <bla0>Blocklist.site Abuse</bla0>
@@ -207,15 +204,31 @@
                     <bly>Blocklist.site Youtube</bly>
                     <el>EasyList</el>
                     <ep>EasyPrivacy</ep>
-                    <nc>NoCoin List</nc>
-                    <pa>All Porn List</pa>
-                    <pt>PornTop1M List</pt>
-                    <sa>Simple Ad List</sa>
-                    <st>Simple Tracker List</st>
+                    <hgz001>[hagezi] Multi LIGHT - Basic protection</hgz001>
+                    <hgz002>[hagezi] Multi NORMAL - All-round protection</hgz002>
+                    <hgz003>[hagezi] Multi PRO - Extended protection</hgz003>
+                    <hgz004>[hagezi] Multi PRO mini </hgz004>
+                    <hgz005>[hagezi] Multi PRO++ - Maximum protection</hgz005>
+                    <hgz006>[hagezi] Multi PRO++ mini</hgz006>
+                    <hgz007>[hagezi] Multi ULTIMATE - Aggressive protection</hgz007>
+                    <hgz008>[hagezi] Multi ULTIMATE mini</hgz008>
+                    <hgz009>[hagezi] Fake - scams / fakes</hgz009>
+                    <hgz010>[hagezi] Pop-Up Ads</hgz010>
+                    <hgz011>[hagezi] Threat Intelligence Feeds</hgz011>
+                    <hgz012>[hagezi] Threat Intelligence Feeds - Medium</hgz012>
+                    <hgz013>[hagezi] Threat Intelligence Feeds - Mini</hgz013>
+                    <hgz014>[hagezi] DoH/VPN/TOR/Proxy Bypass</hgz014>
+                    <hgz015>[hagezi] Safesearch not supported</hgz015>
+                    <hgz016>[hagezi] Dynamic DNS blocking</hgz016>
+                    <hgz017>[hagezi] Badware Hoster blocking</hgz017>
+                    <hgz018>[hagezi] Anti Piracy</hgz018>
+                    <hgz019>[hagezi] Gambling</hgz019>
+                    <hgz020>[hagezi] Gambling - Medium</hgz020>
+                    <hgz021>[hagezi] Gambling - Mini</hgz021>
+                    <oisd0>OISD - Domain Blocklist Ads</oisd0>
+                    <oisd1>OISD - Domain Blocklist Big</oisd1>
+                    <oisd2>OISD - Domain Blocklist NSFW</oisd2>
                     <sb>Steven Black List</sb>
-                    <ws>WindowsSpyBlocker (spy)</ws>
-                    <wsu>WindowsSpyBlocker (update)</wsu>
-                    <wse>WindowsSpyBlocker (extra)</wse>
                     <yy>YoYo List</yy>
                 </OptionValues>
             </type>
diff --git a/src/opnsense/service/templates/OPNsense/Unbound/core/blocklists.conf b/src/opnsense/service/templates/OPNsense/Unbound/core/blocklists.conf
index 0c1efe3ad..73167280a 100644
--- a/src/opnsense/service/templates/OPNsense/Unbound/core/blocklists.conf
+++ b/src/opnsense/service/templates/OPNsense/Unbound/core/blocklists.conf
@@ -25,17 +25,39 @@
       "bly": "https://blocklistproject.github.io/Lists/alt-version/youtube-nl.txt",
       "el": "https://v.firebog.net/hosts/Easylist.txt",
       "ep": "https://v.firebog.net/hosts/Easyprivacy.txt",
-      "nc": "https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt",
-      "pa": "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list",
-      "pt": "https://raw.githubusercontent.com/chadmayfield/pihole-blocklists/master/lists/pi_blocklist_porn_top1m.list",
-      "sa": "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt",
       "sb": "https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts",
+      "yy": "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&mimetype=plaintext",
+      "atf": "https://threatfox.abuse.ch/downloads/hostfile",
+      "hgz001": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/light.txt",
+      "hgz002": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/multi.txt",
+      "hgz003": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/pro.txt",
+      "hgz004": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/pro.mini.txt",
+      "hgz005": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/pro.plus.txt",
+      "hgz006": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/pro.plus.mini.txt",
+      "hgz007": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/ultimate.txt",
+      "hgz008": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/ultimate.mini.txt",
+      "hgz009": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/fake.txt",
+      "hgz010": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/popupads.txt",
+      "hgz011": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/tif.txt",
+      "hgz012": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/tif.medium.txt",
+      "hgz013": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/tif.mini.txt",
+      "hgz014": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/doh-vpn-proxy-bypass.txt",
+      "hgz015": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/nosafesearch.txt",
+      "hgz016": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/dyndns.txt",
+      "hgz017": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/hoster.txt",
+      "hgz018": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/anti.piracy.txt",
+      "hgz019": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/gambling.txt",
+      "hgz020": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/gambling.medium.txt",
+      "hgz021": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/wildcard/gambling.mini.txt",
+      "*** below fields are deprecated, but still exist. Not selectable anymore ***":"",
+      "sa": "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt",
       "st": "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt",
+      "nc": "https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt",
       "ws": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt",
       "wsu": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/update.txt",
       "wse": "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/extra.txt",
-      "yy": "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=nohtml&mimetype=plaintext",
-      "atf": "https://threatfox.abuse.ch/downloads/hostfile"
+      "pa": "https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list",
+      "pt": "https://raw.githubusercontent.com/chadmayfield/pihole-blocklists/master/lists/pi_blocklist_porn_top1m.list"
   }
 %}
 {%  if not helpers.empty('OPNsense.unboundplus.dnsbl.enabled') %}