diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml
index 2492722bc..eb9afdc0e 100644
--- a/.github/workflows/builder.yaml
+++ b/.github/workflows/builder.yaml
@@ -59,7 +59,7 @@ jobs:
     strategy:
       matrix:
         addon: ${{ fromJson(needs.init.outputs.changed_addons) }}
-        arch: ["aarch64", "amd64", "armhf", "armv7"]
+        arch: ["aarch64", "amd64", "armv7"]
 
     steps:
       - name: Check out repository
diff --git a/addons_updater/config.json b/addons_updater/config.json
index 224c1211f..1797beb9a 100644
--- a/addons_updater/config.json
+++ b/addons_updater/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "manual",
   "description": "Automatic addons update by aligning version tag with upstream releases",
   "environment": {
diff --git a/arpspoof/build.json b/arpspoof/build.json
index c24af91b5..70e90b84f 100644
--- a/arpspoof/build.json
+++ b/arpspoof/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "techblog/arpspoof-docker:latest",
-    "armhf": "techblog/arpspoof-docker:latest",
     "aarch64": "techblog/arpspoof-docker:latest",
     "amd64": "techblog/arpspoof-docker:latest"
   }
diff --git a/arpspoof/config.json b/arpspoof/config.json
index 9e5d979a1..14be8eee5 100644
--- a/arpspoof/config.json
+++ b/arpspoof/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "block internet connection for local network devices",
   "devices": [],
diff --git a/bazarr/build.json b/bazarr/build.json
index 46914db8f..cdcb77a4c 100644
--- a/bazarr/build.json
+++ b/bazarr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/bazarr:arm32v7-latest",
     "armv7": "linuxserver/bazarr:arm32v7-latest",
     "aarch64": "linuxserver/bazarr:arm64v8-latest",
     "amd64": "linuxserver/bazarr:amd64-latest"
diff --git a/bazarr/config.json b/bazarr/config.json
index 826d97248..583f3e93b 100644
--- a/bazarr/config.json
+++ b/bazarr/config.json
@@ -5,7 +5,7 @@
   "description": "Companion application to Sonarr and Radarr to download subtitles",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/bazarr",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "image": "ghcr.io/alexbelgium/bazarr-{arch}",
   "upstream": "1.0.2",
diff --git a/bitwarden/config.json b/bitwarden/config.json
index 14fed62c9..4d2acdcc8 100644
--- a/bitwarden/config.json
+++ b/bitwarden/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Open source password management solution",
   "init": false,
   "map": ["ssl"],
diff --git a/booksonic_air/build.json b/booksonic_air/build.json
index 87f02532c..30527539f 100644
--- a/booksonic_air/build.json
+++ b/booksonic_air/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/booksonic-air:arm32v7-latest",
     "armv7": "linuxserver/booksonic-air:arm32v7-latest",
     "aarch64": "linuxserver/booksonic-air:arm64v8-latest",
     "amd64": "linuxserver/booksonic-air:amd64-latest"
diff --git a/booksonic_air/config.json b/booksonic_air/config.json
index 7f7f02943..a0e50a370 100644
--- a/booksonic_air/config.json
+++ b/booksonic_air/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "image": "ghcr.io/alexbelgium/booksonic_air-{arch}",
   "description": "platform for accessing the audibooks you own wherever you are",
diff --git a/cloudcommander/config.json b/cloudcommander/config.json
index cedcd4209..8721ab030 100644
--- a/cloudcommander/config.json
+++ b/cloudcommander/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Cloud Commander a file manager for the web with console and editor",
   "devices": [
     "/dev/mmcblk0p8",
diff --git a/code-server/build.json b/code-server/build.json
index a8503c6cc..930bf6616 100644
--- a/code-server/build.json
+++ b/code-server/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/code-server:arm32v7-latest",
-    "armhf": "linuxserver/code-server:arm32v7-latest",
     "aarch64": "linuxserver/code-server:arm64v8-latest",
     "amd64": "linuxserver/code-server:amd64-latest"
   }
diff --git a/code-server/config.json b/code-server/config.json
index 4b5b661d4..806eb18e6 100644
--- a/code-server/config.json
+++ b/code-server/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Code-server is VS Code running on a remote server, accessible through the browser.",
   "image": "ghcr.io/alexbelgium/code-server-{arch}",
diff --git a/emby/build.json b/emby/build.json
index 834170451..03ce455f0 100644
--- a/emby/build.json
+++ b/emby/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/emby:arm32v7-beta",
-    "armhf": "linuxserver/emby:arm32v7-beta",
     "aarch64": "linuxserver/emby:arm64v8-beta",
     "amd64": "linuxserver/emby:amd64-beta"
   }
diff --git a/emby/config.json b/emby/config.json
index 0b9bd1e19..af6d1ae5f 100644
--- a/emby/config.json
+++ b/emby/config.json
@@ -6,7 +6,7 @@
   "description": "A Free Software Media System that puts you in control of managing and streaming your media.",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "image": "ghcr.io/alexbelgium/emby-{arch}",
   "boot": "auto",
   "upstream": "4.7.0.20",
diff --git a/enedisgateway2mqtt/config.json b/enedisgateway2mqtt/config.json
index 32e9e88f9..96e7eb48e 100644
--- a/enedisgateway2mqtt/config.json
+++ b/enedisgateway2mqtt/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "use Enedis Gateway API to send data in your MQTT Broker (latest channel)",
   "map": ["config:rw"],
   "name": "Enedisgateway2mqtt",
diff --git a/enedisgateway2mqtt_dev/config.json b/enedisgateway2mqtt_dev/config.json
index fcc626e71..37887f714 100644
--- a/enedisgateway2mqtt_dev/config.json
+++ b/enedisgateway2mqtt_dev/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "use Enedis Gateway API to send data in your MQTT Broker (latest-dev channel)",
   "map": ["config:rw"],
   "name": "Enedisgateway2mqtt Dev",
diff --git a/filebrowser/config.json b/filebrowser/config.json
index 16f163358..f1a61b6f2 100644
--- a/filebrowser/config.json
+++ b/filebrowser/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files",
   "devices": [
     "/dev/sda",
diff --git a/fireflyiii/config.json b/fireflyiii/config.json
index 4dfab2b5f..daf4bbd9c 100644
--- a/fireflyiii/config.json
+++ b/fireflyiii/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "A free and open source personal finance manager",
   "devices": [],
diff --git a/fireflyiii_data_importer/build.json b/fireflyiii_data_importer/build.json
index 4dd70ee76..ad742f792 100644
--- a/fireflyiii_data_importer/build.json
+++ b/fireflyiii_data_importer/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "fireflyiii/data-importer:version-",
     "armv7": "fireflyiii/data-importer:version-",
     "aarch64": "fireflyiii/data-importer:version-",
     "amd64": "fireflyiii/data-importer:version-"
diff --git a/fireflyiii_data_importer/config.json b/fireflyiii_data_importer/config.json
index 1b8127937..c12c5b796 100644
--- a/fireflyiii_data_importer/config.json
+++ b/fireflyiii_data_importer/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Data importer for Firefly III (separate addon)",
   "devices": [],
diff --git a/flaresolverr/config.json b/flaresolverr/config.json
index 4cd563430..5171d1664 100644
--- a/flaresolverr/config.json
+++ b/flaresolverr/config.json
@@ -16,5 +16,5 @@
   "environment": {},
   "options": {},
   "schema": {},
-  "arch": ["aarch64", "amd64", "armhf", "armv7"]
+  "arch": ["aarch64", "amd64", "armv7"]
 }
diff --git a/flexget/config.json b/flexget/config.json
index c6e67ee0c..d8129d573 100644
--- a/flexget/config.json
+++ b/flexget/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "FlexGet is a multipurpose automation tool for all of your media",
   "environment": {
     "FG_PLUGINS": "",
diff --git a/gazpar2mqtt/config.json b/gazpar2mqtt/config.json
index c2e4121f7..73b2c2225 100644
--- a/gazpar2mqtt/config.json
+++ b/gazpar2mqtt/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "fetch GRDF data and publish data to a mqtt broker",
   "map": ["config:rw", "share:rw"],
   "name": "gazpar2mqtt",
diff --git a/grav/build.json b/grav/build.json
index 16bc72556..c4b4cbf09 100644
--- a/grav/build.json
+++ b/grav/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/grav:arm32v7-latest",
     "armv7": "linuxserver/grav:arm32v7-latest",
     "aarch64": "linuxserver/grav:arm64v8-latest",
     "amd64": "linuxserver/grav:amd64-latest"
diff --git a/grav/config.json b/grav/config.json
index 6e7f000fe..10ebee4f3 100644
--- a/grav/config.json
+++ b/grav/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Fast, Simple, and Flexible, file-based Web-platform",
   "devices": [],
diff --git a/inadyn/build.json b/inadyn/build.json
index 102d56ec0..29efc6836 100644
--- a/inadyn/build.json
+++ b/inadyn/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "troglobit/inadyn:latest",
-    "armhf": "troglobit/inadyn:latest",
     "aarch64": "troglobit/inadyn:latest",
     "amd64": "troglobit/inadyn:latest"
   }
diff --git a/inadyn/config.json b/inadyn/config.json
index 449913247..ba210bdef 100644
--- a/inadyn/config.json
+++ b/inadyn/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Inadyn is a small and simple Dynamic DNS, DDNS, client with HTTPS support. A large number of dynamic dns providers are supported (https://github.com/troglobit/inadyn#supported-providers). For those that are not, you can use a custom provider as per this project's documentation (https://github.com/nalipaz/hassio-addons/blob/master/README.md)",
   "environment": {},
   "host_network": true,
diff --git a/jackett/build.json b/jackett/build.json
index 7247b0363..264713b90 100644
--- a/jackett/build.json
+++ b/jackett/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/jackett:arm32v7-latest",
     "armv7": "linuxserver/jackett:arm32v7-latest",
     "aarch64": "linuxserver/jackett:arm64v8-latest",
     "amd64": "linuxserver/jackett:amd64-latest"
diff --git a/jackett/config.json b/jackett/config.json
index 406394c3b..b186abb37 100644
--- a/jackett/config.json
+++ b/jackett/config.json
@@ -5,7 +5,7 @@
   "description": "translates queries from apps (Sonarr, SickRage, CouchPotato, Mylar, etc) into tracker-site-specific http queries, parses the html response, then sends results back to the requesting software",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/jackett",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "upstream": "0.20.371",
   "image": "ghcr.io/alexbelgium/jackett-{arch}",
@@ -37,4 +37,3 @@
     "cifspassword": "str?"
   }
 }
-
diff --git a/jellyfin/build.json b/jellyfin/build.json
index ebde6af63..140ad1bc4 100644
--- a/jellyfin/build.json
+++ b/jellyfin/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/jellyfin:arm32v7-latest",
-    "armhf": "linuxserver/jellyfin:arm32v7-latest",
     "aarch64": "linuxserver/jellyfin:arm64v8-latest",
     "amd64": "linuxserver/jellyfin:amd64-latest"
   }
diff --git a/jellyfin/config.json b/jellyfin/config.json
index 012b5d6ca..0950696c5 100644
--- a/jellyfin/config.json
+++ b/jellyfin/config.json
@@ -1,7 +1,7 @@
 {
   "host_network": true,
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "A Free Software Media System that puts you in control of managing and streaming your media.",
   "image": "ghcr.io/alexbelgium/jellyfin-{arch}",
diff --git a/joal/config.json b/joal/config.json
index 97e907f17..79b02113c 100644
--- a/joal/config.json
+++ b/joal/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "An open source command line RatioMaster with WebUI",
   "environment": {},
diff --git a/joplin/config.json b/joplin/config.json
index 07f16526d..6ac807023 100644
--- a/joplin/config.json
+++ b/joplin/config.json
@@ -37,5 +37,5 @@
     "MAILER_NOREPLY_NAME": "str?",
     "MAILER_NOREPLY_EMAIL": "str?"
   },
-  "arch": ["aarch64", "amd64", "armhf", "armv7"]
+  "arch": ["aarch64", "amd64", "armv7"]
 }
diff --git a/lidarr/build.json b/lidarr/build.json
index 67015c894..c9d50e3bf 100644
--- a/lidarr/build.json
+++ b/lidarr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/lidarr:arm32v7-latest",
     "armv7": "linuxserver/lidarr:arm32v7-latest",
     "aarch64": "linuxserver/lidarr:arm64v8-latest",
     "amd64": "linuxserver/lidarr:amd64-latest"
diff --git a/lidarr/config.json b/lidarr/config.json
index 7c5a56efa..d1d6dec7d 100644
--- a/lidarr/config.json
+++ b/lidarr/config.json
@@ -5,7 +5,7 @@
   "description": "Music collection manager for Usenet and BitTorrent users",
   "url": "https://github.com/alexbelgium/hassio-addons/blob/master/lidarr/Readme.md",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "image": "ghcr.io/alexbelgium/lidarr-{arch}",
   "upstream": "0.8.1.2135-ls69",
diff --git a/mealie/build.json b/mealie/build.json
index 2ed81a23a..6ee524c0c 100644
--- a/mealie/build.json
+++ b/mealie/build.json
@@ -1,8 +1,7 @@
 {
   "build_from": {
-    "armhf" : "hkotel/mealie:v0.4.3",
     "armv7": "hkotel/mealie:v0.4.3",
     "aarch64": "hkotel/mealie:latest",
-    "amd64" : "hkotel/mealie:latest"
+    "amd64": "hkotel/mealie:latest"
   }
 }
diff --git a/mealie/config.json b/mealie/config.json
index 3a36ad36c..81e77add2 100644
--- a/mealie/config.json
+++ b/mealie/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armhf", "armv7"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Mealie is a self hosted recipe manager and meal planner built in Vue",
   "environment": {
diff --git a/mylar3/build.json b/mylar3/build.json
index 60b3e7b02..ee631e4e6 100644
--- a/mylar3/build.json
+++ b/mylar3/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/mylar3:arm32v7-latest",
     "armv7": "linuxserver/mylar3:arm32v7-latest",
     "aarch64": "linuxserver/mylar3:arm64v8-latest",
     "amd64": "linuxserver/mylar3:amd64-latest"
diff --git a/mylar3/config.json b/mylar3/config.json
index 40e46c115..03570ce24 100644
--- a/mylar3/config.json
+++ b/mylar3/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Automated comic book downloader for use with NZB and torrents",
   "image": "ghcr.io/alexbelgium/mylar3-{arch}",
diff --git a/nextcloud/build.json b/nextcloud/build.json
index 26343423e..f7a61cffc 100644
--- a/nextcloud/build.json
+++ b/nextcloud/build.json
@@ -2,7 +2,6 @@
   "build_from": {
     "aarch64": "linuxserver/nextcloud:arm64v8-latest",
     "amd64": "linuxserver/nextcloud:amd64-latest",
-    "armhf": "linuxserver/nextcloud:arm32v7-latest",
     "armv7": "linuxserver/nextcloud:arm32v7-latest"
   }
 }
diff --git a/nextcloud/config.json b/nextcloud/config.json
index 32e763d37..53b7a6fca 100644
--- a/nextcloud/config.json
+++ b/nextcloud/config.json
@@ -41,7 +41,7 @@
   "ingress": false,
   "hassio_api": true,
   "ingress_port": 0,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Nextcloud for Home Assistant",
   "boot": "manual",
   "uart": true,
diff --git a/nzbget/build.json b/nzbget/build.json
index 02d6ce748..edfad0b49 100644
--- a/nzbget/build.json
+++ b/nzbget/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/nzbget:arm32v7-latest",
     "armv7": "linuxserver/nzbget:arm32v7-latest",
     "aarch64": "linuxserver/nzbget:arm64v8-latest",
     "amd64": "linuxserver/nzbget:amd64-latest"
diff --git a/nzbget/config.json b/nzbget/config.json
index 19631cf4f..f5ec98ffd 100644
--- a/nzbget/config.json
+++ b/nzbget/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "usenet downloader",
   "image": "ghcr.io/alexbelgium/nzbget-{arch}",
diff --git a/ombi/build.json b/ombi/build.json
index 123aeef1c..0b821f9ab 100644
--- a/ombi/build.json
+++ b/ombi/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/ombi:arm32v7-latest",
     "armv7": "linuxserver/ombi:arm32v7-latest",
     "aarch64": "linuxserver/ombi:arm64v8-latest",
     "amd64": "linuxserver/ombi:amd64-latest"
diff --git a/ombi/config.json b/ombi/config.json
index c68326a44..b1aae6426 100644
--- a/ombi/config.json
+++ b/ombi/config.json
@@ -5,7 +5,7 @@
   "description": "Self-hosted Plex Request and user management system",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/ombi",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "upstream": "4.3.3",
   "webui": "http://[HOST]:[PORT:3579]",
diff --git a/organizr/build.json b/organizr/build.json
index c1e7f6eef..b2737f163 100644
--- a/organizr/build.json
+++ b/organizr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "organizr/organizr:linux-arm-v7",
     "armv7": "organizr/organizr:linux-arm-v7",
     "aarch64": "organizr/organizr:linux-arm64",
     "amd64": "organizr/organizr:linux-amd64"
diff --git a/organizr/config.json b/organizr/config.json
index 660fb1db1..dd1aa6f05 100644
--- a/organizr/config.json
+++ b/organizr/config.json
@@ -6,7 +6,7 @@
   "description": "An HTPC/Homelab services organizer that is written in PHP",
   "url": "https://github.com/alexbelgium/hassio-addons",
   "startup": "services",
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "ports": {
     "80/tcp": 88
   },
diff --git a/paperless_ng/build.json b/paperless_ng/build.json
index 3c1d3d0a8..8457a5206 100644
--- a/paperless_ng/build.json
+++ b/paperless_ng/build.json
@@ -1,8 +1,7 @@
 {
   "build_from": {
     "armv7": "linuxserver/paperless-ng:arm32v7-latest",
-    "armhf": "linuxserver/paperless-ng:arm32v7-latest",
     "aarch64": "linuxserver/paperless-ng:arm64v8-latest",
     "amd64": "linuxserver/paperless-ng:amd64-latest"
   }
-} 
+}
diff --git a/paperless_ng/config.json b/paperless_ng/config.json
index c539639c6..ef45f0489 100644
--- a/paperless_ng/config.json
+++ b/paperless_ng/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "scan, index and archive all your physical documents",
   "image": "ghcr.io/alexbelgium/paperless_ng-{arch}",
diff --git a/papermerge/build.json b/papermerge/build.json
index f293b09e7..d5b50cb53 100644
--- a/papermerge/build.json
+++ b/papermerge/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/papermerge:arm32v7-latest",
-    "armhf": "linuxserver/papermerge:arm32v7-latest",
     "aarch64": "linuxserver/papermerge:arm64v8-latest",
     "amd64": "linuxserver/papermerge:amd64-latest"
   }
diff --git a/papermerge/config.json b/papermerge/config.json
index 2f345575c..c2e97ff93 100644
--- a/papermerge/config.json
+++ b/papermerge/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Open source document management system (DMS)",
   "environment": {},
   "map": ["share:rw", "media:rw", "ssl", "config:rw"],
diff --git a/piwigo/build.json b/piwigo/build.json
index 6c75f13b1..681253abb 100644
--- a/piwigo/build.json
+++ b/piwigo/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/piwigo:arm32v7-latest",
-    "armhf": "linuxserver/piwigo:arm32v7-latest",
     "aarch64": "linuxserver/piwigo:arm64v8-latest",
     "amd64": "linuxserver/piwigo:amd64-latest"
   }
diff --git a/piwigo/config.json b/piwigo/config.json
index b9da60844..470fa3c46 100644
--- a/piwigo/config.json
+++ b/piwigo/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Piwigo is a photo gallery software for the web",
   "image": "ghcr.io/alexbelgium/piwigo-{arch}",
diff --git a/plex/build.json b/plex/build.json
index ca0dde75b..d24ab5ed1 100644
--- a/plex/build.json
+++ b/plex/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/plex:arm32v7-latest",
-    "armhf": "linuxserver/plex:arm32v7-latest",
     "aarch64": "linuxserver/plex:arm64v8-latest",
     "amd64": "linuxserver/plex:amd64-latest"
   }
diff --git a/plex/config.json b/plex/config.json
index 10473ed6e..25c851204 100644
--- a/plex/config.json
+++ b/plex/config.json
@@ -1,7 +1,7 @@
 {
   "host_network": true,
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "image": "ghcr.io/alexbelgium/plex-{arch}",
   "description": "Plex organizes video, music and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices.",
diff --git a/portainer/config.json b/portainer/config.json
index dc8c18946..f3fe36619 100644
--- a/portainer/config.json
+++ b/portainer/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armhf", "armv7"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Manage your Docker environment with ease",
   "docker_api": true,
   "hassio_api": true,
diff --git a/prowlarr/build.json b/prowlarr/build.json
index ebf57fb23..5c6779fd1 100644
--- a/prowlarr/build.json
+++ b/prowlarr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/prowlarr:arm32v7-nightly",
     "armv7": "linuxserver/prowlarr:arm32v7-nightly",
     "aarch64": "linuxserver/prowlarr:arm64v8-nightly",
     "amd64": "linuxserver/prowlarr:amd64-nightly"
diff --git a/prowlarr/config.json b/prowlarr/config.json
index c875550b9..c4535e020 100644
--- a/prowlarr/config.json
+++ b/prowlarr/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Torrent Trackers and Usenet Indexers offering complete management ofSonarr, Radarr, Lidarr, and Readarr indexers with no per app setup required",
   "environment": {
diff --git a/qbittorrent/build.json b/qbittorrent/build.json
index 7958ca5e1..5627f1b63 100644
--- a/qbittorrent/build.json
+++ b/qbittorrent/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/qbittorrent:arm32v7",
-    "armhf": "linuxserver/qbittorrent:arm32v7",
     "aarch64": "linuxserver/qbittorrent:arm64v8",
     "amd64": "linuxserver/qbittorrent:amd64"
   }
diff --git a/qbittorrent/config.json b/qbittorrent/config.json
index 920df18bd..6d3367f4b 100644
--- a/qbittorrent/config.json
+++ b/qbittorrent/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "backup_exclude": ["image.tar"],
   "boot": "auto",
   "image": "ghcr.io/alexbelgium/qbittorrent-{arch}",
@@ -105,4 +105,3 @@
   "version": "14.3.9.99202110311443-7435-01519b5e7ubuntu20.04.1-ls166-5",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }
-
diff --git a/radarr/build.json b/radarr/build.json
index 37a87e382..f4582dc16 100644
--- a/radarr/build.json
+++ b/radarr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/radarr:arm32v7-latest",
     "armv7": "linuxserver/radarr:arm32v7-latest",
     "aarch64": "linuxserver/radarr:arm64v8-latest",
     "amd64": "linuxserver/radarr:amd64-latest"
diff --git a/radarr/config.json b/radarr/config.json
index 6844f0555..95b5aa831 100644
--- a/radarr/config.json
+++ b/radarr/config.json
@@ -5,7 +5,7 @@
   "description": "A fork of Sonarr to work with movies like Couchpotato",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/radarr",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "upstream": "3.2.2.5080",
   "image": "ghcr.io/alexbelgium/radarr-{arch}",
diff --git a/readarr/build.json b/readarr/build.json
index aa47149e5..a16b983ce 100644
--- a/readarr/build.json
+++ b/readarr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/readarr:arm32v7-nightly",
     "armv7": "linuxserver/readarr:arm32v7-nightly",
     "aarch64": "linuxserver/readarr:arm64v8-nightly",
     "amd64": "linuxserver/readarr:amd64-nightly"
diff --git a/readarr/config.json b/readarr/config.json
index 984edc7cf..d9f1d0177 100644
--- a/readarr/config.json
+++ b/readarr/config.json
@@ -5,7 +5,7 @@
   "description": "Book Manager and Automation",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/readarr",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "image": "ghcr.io/alexbelgium/readarr-{arch}",
   "upstream": "nightly-alpine-0.1.0.1175-ls12",
diff --git a/requestrr/build.json b/requestrr/build.json
index 7b0d8306f..1a26b28ad 100644
--- a/requestrr/build.json
+++ b/requestrr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/requestrr:arm32v7-latest",
     "armv7": "linuxserver/requestrr:arm32v7-latest",
     "aarch64": "linuxserver/requestrr:arm64v8-latest",
     "amd64": "linuxserver/requestrr:amd64-latest"
diff --git a/requestrr/config.json b/requestrr/config.json
index 2397ff4f8..92ce41d01 100644
--- a/requestrr/config.json
+++ b/requestrr/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Chatbot used to simplify using services like Sonarr/Radarr/Ombi via the use of chat",
   "environment": {
diff --git a/resiliosync/build.json b/resiliosync/build.json
index 5f5ca1790..d580b2042 100644
--- a/resiliosync/build.json
+++ b/resiliosync/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf" : "linuxserver/resilio-sync:arm32v7-latest",
     "armv7": "linuxserver/resilio-sync:arm32v7-latest",
     "aarch64": "linuxserver/resilio-sync:arm64v8-latest",
     "amd64" : "linuxserver/resilio-sync:amd64-latest"
diff --git a/resiliosync/config.json b/resiliosync/config.json
index 0b678de81..88ea779c7 100644
--- a/resiliosync/config.json
+++ b/resiliosync/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armhf", "armv7"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Self-hosted file share and collaboration platform on the web",
   "devices": [
diff --git a/scrutiny/build.json b/scrutiny/build.json
index de48a253b..9ec2fffeb 100644
--- a/scrutiny/build.json
+++ b/scrutiny/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/scrutiny:arm32v7-latest",
     "armv7": "linuxserver/scrutiny:arm32v7-latest",
     "aarch64": "linuxserver/scrutiny:arm64v8-latest",
     "amd64": "linuxserver/scrutiny:amd64-latest"
diff --git a/scrutiny/config.json b/scrutiny/config.json
index 670cbfe6c..91c608c75 100644
--- a/scrutiny/config.json
+++ b/scrutiny/config.json
@@ -6,7 +6,7 @@
   "description": "Scrutiny WebUI for smartd S.M.A.R.T monitoring",
   "url": "https://github.com/AnalogJ/scrutiny",
   "startup": "services",
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "ingress": true,
   "ingress_port": 8099,
   "panel_icon": "mdi:glasses",
diff --git a/sonarr/build.json b/sonarr/build.json
index b253ca611..f9049c91c 100644
--- a/sonarr/build.json
+++ b/sonarr/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/sonarr:arm32v7-latest",
     "armv7": "linuxserver/sonarr:arm32v7-latest",
     "aarch64": "linuxserver/sonarr:arm64v8-latest",
     "amd64": "linuxserver/sonarr:amd64-latest"
diff --git a/sonarr/config.json b/sonarr/config.json
index 41ee999e8..34427f70f 100644
--- a/sonarr/config.json
+++ b/sonarr/config.json
@@ -5,7 +5,7 @@
   "description": "Can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. ",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/sonarr",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "upstream": "3.0.6.1342",
   "webui": "http://[HOST]:[PORT:8989]",
diff --git a/tandoor_recipes/build.json b/tandoor_recipes/build.json
index 08f44fc9e..ea2b6bc30 100644
--- a/tandoor_recipes/build.json
+++ b/tandoor_recipes/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "vabene1111/recipes:latest",
     "armv7": "vabene1111/recipes:latest",
     "aarch64": "vabene1111/recipes:latest",
     "amd64": "vabene1111/recipes:latest"
diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json
index 90371ee7d..7c2c6b26c 100644
--- a/tandoor_recipes/config.json
+++ b/tandoor_recipes/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "recipe manager",
   "environment": {
diff --git a/teamspeak/build.json b/teamspeak/build.json
index 6b7d280e1..98b4b579b 100644
--- a/teamspeak/build.json
+++ b/teamspeak/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "ertagh/teamspeak3-server:latest-predownloaded",
-    "armhf": "ertagh/teamspeak3-server:latest-predownloaded",
     "aarch64": "ertagh/teamspeak3-server:latest-predownloaded",
     "amd64": "mbentley/teamspeak:latest"
   }
diff --git a/teamspeak/config.json b/teamspeak/config.json
index 6c0bf563f..25926e626 100644
--- a/teamspeak/config.json
+++ b/teamspeak/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armhf", "armv7"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "voice communication for online gaming, education and training",
   "environment": {
     "TS3SERVER_LICENSE": "accept",
diff --git a/transmission/build.json b/transmission/build.json
index a55c8bb39..025c0ebae 100644
--- a/transmission/build.json
+++ b/transmission/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/transmission:arm32v7-latest",
-    "armhf": "linuxserver/transmission:arm32v7-latest",
     "aarch64": "linuxserver/transmission:arm64v8-latest",
     "amd64": "linuxserver/transmission:amd64-latest"
   }
diff --git a/transmission/config.json b/transmission/config.json
index 24ede7b38..115ad1918 100644
--- a/transmission/config.json
+++ b/transmission/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Bittorrent client based on linuxserver image",
   "image": "ghcr.io/alexbelgium/transmission-{arch}",
diff --git a/ubooquity/build.json b/ubooquity/build.json
index 1678cb246..5d8a47c15 100644
--- a/ubooquity/build.json
+++ b/ubooquity/build.json
@@ -1,7 +1,6 @@
 {
   "build_from": {
     "armv7": "linuxserver/ubooquity:arm32v7-latest",
-    "armhf": "linuxserver/ubooquity:arm32v7-latest",
     "aarch64": "linuxserver/ubooquity:arm64v8-latest",
     "amd64": "linuxserver/ubooquity:amd64-latest"
   }
diff --git a/ubooquity/config.json b/ubooquity/config.json
index 25703f2f1..807fb66a7 100644
--- a/ubooquity/config.json
+++ b/ubooquity/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "Free, lightweight and easy-to-use home server for your comics and ebooks",
   "image": "ghcr.io/alexbelgium/ubooquity-{arch}",
diff --git a/webtop/build.json b/webtop/build.json
index 29a489271..c34efc96c 100644
--- a/webtop/build.json
+++ b/webtop/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "linuxserver/webtop:arm32v7-",
     "armv7": "linuxserver/webtop:arm32v7-",
     "aarch64": "linuxserver/webtop:arm64v8-",
     "amd64": "linuxserver/webtop:amd64-"
diff --git a/webtop/config.json b/webtop/config.json
index b28c9b1f1..532457f56 100644
--- a/webtop/config.json
+++ b/webtop/config.json
@@ -1,6 +1,6 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "environment": {
     "PUID": "0",
@@ -83,4 +83,3 @@
   "version": "4.16",
   "webui": "http://[HOST]:[PORT:3000]"
 }
-
diff --git a/webtrees/config.json b/webtrees/config.json
index 7b6fac045..4d5fa87e2 100644
--- a/webtrees/config.json
+++ b/webtrees/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "description": "web's leading on-line collaborative genealogy application",
   "devices": [
diff --git a/whoogle/build.json b/whoogle/build.json
index 51080de9c..fbb87285f 100644
--- a/whoogle/build.json
+++ b/whoogle/build.json
@@ -1,6 +1,5 @@
 {
   "build_from": {
-    "armhf": "benbusby/whoogle-search:latest",
     "armv7": "benbusby/whoogle-search:latest",
     "aarch64": "benbusby/whoogle-search:latest",
     "amd64": "benbusby/whoogle-search:latest"
diff --git a/whoogle/config.json b/whoogle/config.json
index b609d6257..c1171b112 100644
--- a/whoogle/config.json
+++ b/whoogle/config.json
@@ -5,7 +5,7 @@
   "description": "Self-hosted, ad-free, privacy-respecting metasearch engine",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/whoogle",
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "boot": "auto",
   "upstream": "0.7.0",
   "webui": "http://[HOST]:[PORT:5000]",
diff --git a/xteve/config.json b/xteve/config.json
index fe71573bb..67048f4b3 100644
--- a/xteve/config.json
+++ b/xteve/config.json
@@ -1,5 +1,5 @@
 {
-  "arch": ["aarch64", "amd64", "armhf", "armv7"],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "M3U Proxy for Plex DVR and Emby Live TV",
   "environment": {},
   "map": ["config:rw", "share:rw"],