diff --git a/.github/workflows/build_dev.yml b/.github/workflows/build_dev.yml
index 46f976b..eef3479 100755
--- a/.github/workflows/build_dev.yml
+++ b/.github/workflows/build_dev.yml
@@ -41,9 +41,10 @@ jobs:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/amd64
             linux/arm/v7
             linux/arm64
-            linux/amd64
+            linux/riscv64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}-dev
diff --git a/.github/workflows/build_main.yml b/.github/workflows/build_main.yml
index 191bdda..e59c43d 100755
--- a/.github/workflows/build_main.yml
+++ b/.github/workflows/build_main.yml
@@ -36,14 +36,15 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: ./docker-build
           file: ./docker-build/Dockerfile
           platforms: |
+            linux/amd64
             linux/arm/v7
             linux/arm64
-            linux/amd64
+            linux/riscv64
           push: true
           tags: | 
             ${{ secrets.DOCKER_USER }}/pihole-unbound-hyperlocal:${{ env.VERSION }}
diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
index 5d5adda..890f489 100755
--- a/docker-build/Dockerfile
+++ b/docker-build/Dockerfile
@@ -1,5 +1,5 @@
 # Get the latest Pi-hole version
-FROM pihole/pihole:2025.03.0
+FROM pihole/pihole:2025.06.2
 
 # Install necessary programs without repository caching
 RUN apk upgrade --no-cache && \
@@ -23,4 +23,4 @@ RUN install -o unbound -g unbound -Dm755 -d /var/log/unbound
 # Add unbound start up script
 COPY --chmod=0755 unbound-entrypoint.sh /usr/bin/unbound-entrypoint.sh
 
-ENTRYPOINT ["unbound-entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["unbound-entrypoint.sh"]
diff --git a/docker-build/VERSION b/docker-build/VERSION
index 18caec7..ce34564 100755
--- a/docker-build/VERSION
+++ b/docker-build/VERSION
@@ -1 +1 @@
-2025.03.0
\ No newline at end of file
+2025.06.2
\ No newline at end of file
diff --git a/example.pihole.env b/example.pihole.env
index 7642880..a073cdb 100755
--- a/example.pihole.env
+++ b/example.pihole.env
@@ -25,7 +25,3 @@ FTLCONF_dns_dnssec = true
 # Theme used by the Pi-hole web interface
 # default-dark | default-darker | default-light | high-contrast | high-contrast-dark | default-auto | lcars
 FTLCONF_webserver_interface_theme=default-dark
-
-# Which temperature unit should be used for temperatures processed by FTL?      
-# C | F | K
-FTLCONF_webserver_api_temp_unit=C