diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b470d29..14f3a4f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,7 +54,7 @@ jobs:
           context: ./
           file: ./docker/zero-ui/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
-          # platforms: linux/amd64,linux/armhf
+          platforms: linux/amd64,linux/arm64,linux/arm
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep_zero-ui.outputs.tags }}
           cache-from: type=local,src=/tmp/.buildx-cache
@@ -67,7 +67,7 @@ jobs:
           context: ./
           file: ./docker/zerotier/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
-          # platforms: linux/amd64,linux/armhf
+          platforms: linux/amd64,linux/arm64,linux/arm
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ secrets.DOCKER_HUB_USERNAME }}/zerotier-controller:latest
           cache-from: type=local,src=/tmp/.buildx-cache
diff --git a/docker/zerotier/Dockerfile b/docker/zerotier/Dockerfile
index 7bcfc38..db2c4a1 100644
--- a/docker/zerotier/Dockerfile
+++ b/docker/zerotier/Dockerfile
@@ -1,6 +1,5 @@
-FROM alpine:latest
+FROM zyclonite/zerotier:latest
 
-RUN apk add --no-cache zerotier-one
 RUN echo "{\"settings\": {\"portMappingEnabled\": true,\"softwareUpdate\": \"disable\",\"allowManagementFrom\": [\"0.0.0.0/0\"]}}" > /var/lib/zerotier-one/local.conf
 
 EXPOSE 9993/tcp