diff --git a/.github/workflows/auto-build-container.yml b/.github/workflows/auto-build-container.yml
index 0aabb9d8..4b725435 100644
--- a/.github/workflows/auto-build-container.yml
+++ b/.github/workflows/auto-build-container.yml
@@ -60,7 +60,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: "{{defaultContext}}:pihole-unbound/"
-        platforms: linux/arm/v7,linux/arm64/v8,linux/amd64
+        platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
         push: true
         tags: aleksanderbl/pihole-unbound:latest,aleksanderbl/pihole-unbound:${{ steps.latest_release.outputs.release }}
       if: ${{ steps.latest_release.outputs.release != steps.previous_release.outputs.release }}
diff --git a/README.md b/README.md
index b2e61183..a94e4c79 100644
--- a/README.md
+++ b/README.md
@@ -92,8 +92,7 @@ Try pinging `google.com` vs pinging `8.8.8.8`. If `google.com` fails but `8.8.8.
 - [ ] Run the commands below
 
 ```bash
-cd docker-pihole-unbound
-docker build . -t dev/docker-pihole-unbound:latest
+docker build ./pihole-unbound/ -t dev/docker-pihole-unbound:latest
 ```
 
 ## Automatic dev builds with Github Actions
diff --git a/docker-compose.yaml b/docker-compose.yaml
index b8b36086..dde67427 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -9,8 +9,7 @@ services:
       - 127.0.0.1
     container_name: pihole
     # image: aleksanderbl/pihole-unbound:2024.03.2
-    # image: dev/docker-pihole-unbound:latest
-    image: aleksanderbl/pihole-unbound:dev-45-2024-04-04
+    image: dev/docker-pihole-unbound:latest
     hostname: ${HOSTNAME}
     domainname: ${DOMAIN_NAME}
     ports:
diff --git a/pihole-unbound/Dockerfile b/pihole-unbound/Dockerfile
index 65c686e3..046f8040 100644
--- a/pihole-unbound/Dockerfile
+++ b/pihole-unbound/Dockerfile
@@ -1,12 +1,24 @@
-FROM pihole/pihole:2024.07.0
-RUN echo "deb http://deb.debian.org/debian bookworm main" >> /etc/apt/sources.list
-RUN apt-get update && apt-get -t bookworm install -y unbound
+FROM pihole/pihole:2024.07.0 AS base
+
+RUN echo "deb http://deb.debian.org/debian trixie main" >> /etc/apt/sources.list
+
+RUN apt-get update
+RUN apt-get install -s usrmerge
+
+FROM base
+RUN apt-get update
+# RUN apt-get upgrade -y
+RUN apt-get -t trixie install -y unbound -V
+# RUN apt-get install -y unbound -V
 
 COPY lighttpd-external.conf /etc/lighttpd/external.conf
 COPY unbound-pihole.conf /etc/unbound/unbound.conf.d/pi-hole.conf
 COPY 99-edns.conf /etc/dnsmasq.d/99-edns.conf
+
 RUN mkdir -p /etc/services.d/unbound
+
 COPY unbound-run /etc/services.d/unbound/run
+
 RUN chmod 774 /etc/services.d/unbound/run
 
 ENTRYPOINT ./s6-init
\ No newline at end of file