diff --git a/adsb-multi-portal-feeder/CHANGELOG.md b/adsb-multi-portal-feeder/CHANGELOG.md
index bef7982..191fbc5 100644
--- a/adsb-multi-portal-feeder/CHANGELOG.md
+++ b/adsb-multi-portal-feeder/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.18.0.1] - 2022-12-07
+
+- Background change only: Change to ghcr container registry and new build process
+
 ## [1.18.0] - 2022-11-25
 
 - Update `thomx/fr24feed-piaware` to `1.18.0` - see [their release notes](https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/releases/tag/1.18.0) for more
diff --git a/adsb-multi-portal-feeder/Dockerfile b/adsb-multi-portal-feeder/Dockerfile
index 93e9fa8..532c5a7 100644
--- a/adsb-multi-portal-feeder/Dockerfile
+++ b/adsb-multi-portal-feeder/Dockerfile
@@ -1,4 +1,5 @@
-FROM thomx/fr24feed-piaware:1.18.0
+ARG BUILD_FROM
+FROM $BUILD_FROM
 
 # add bashio (thx https://github.com/hassio-addons/addon-debian-base/blob/main/base/Dockerfile#L47)
 ADD https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz  /tmp/bashio.tar.gz
diff --git a/adsb-multi-portal-feeder/build.json b/adsb-multi-portal-feeder/build.json
new file mode 100644
index 0000000..dc0f9c1
--- /dev/null
+++ b/adsb-multi-portal-feeder/build.json
@@ -0,0 +1,7 @@
+{
+  "build_from": {
+    "armhf": "thomx/fr24feed-piaware:1.18.0",
+    "aarch64": "thomx/fr24feed-piaware:1.18.0",
+    "amd64": "thomx/fr24feed-piaware:1.18.0"
+  }
+}
diff --git a/adsb-multi-portal-feeder/config.yaml b/adsb-multi-portal-feeder/config.yaml
index d4eb74b..69f294b 100644
--- a/adsb-multi-portal-feeder/config.yaml
+++ b/adsb-multi-portal-feeder/config.yaml
@@ -1,15 +1,12 @@
 slug: adsb-multi-portal-feeder
-stage: stable
 url: https://github.com/MaxWinterstein/homeassistant-addons/
-image: maxwinterstein/adsb-multi-portal-feeder-{arch}
+image: ghcr.io/maxwinterstein/homeassistant-adsb-multi-portal-feeder-{arch}
 usb: true
-version: 1.18.0
+version: 1.18.0.1
 arch:
   - armhf
-  - armv7
   - aarch64
   - amd64
-boot: auto
 description: Dump1090 based feeder for FlightRadar24, FlightAware and more
 hassio_api: true
 homeassistant_api: true