diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9955f13..fbacb04 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -49,14 +49,3 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep_zero-ui.outputs.tags }}
-
-      - name: Build and push zerotier-controller
-        id: docker_build_zerotier-controller
-        uses: docker/build-push-action@master
-        with:
-          context: ./
-          file: ./docker/zerotier/Dockerfile
-          builder: ${{ steps.buildx.outputs.name }}
-          platforms: linux/amd64,linux/arm64,linux/arm
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/zerotier-controller:latest
diff --git a/docker-compose.yml b/docker-compose.yml
index b4f0eae..573d0ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,14 +2,14 @@ version: "3.9"
 
 services:
   zerotier:
-    image: dec0dos/zerotier-controller:latest
+    image: zyclonite/zerotier:1.10.0
     container_name: zu-controller
-    build:
-      context: .
-      dockerfile: ./docker/zerotier/Dockerfile
     restart: unless-stopped
     volumes:
       - controller_data:/var/lib/zerotier-one
+    environment:
+      - ZT_OVERRIDE_LOCAL_CONF=true
+      - ZT_ALLOW_MANAGEMENT_FROM=0.0.0.0/0
     expose:
       - "9993/tcp"
     ports:
diff --git a/docker/zerotier/Dockerfile b/docker/zerotier/Dockerfile
deleted file mode 100644
index db2c4a1..0000000
--- a/docker/zerotier/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM zyclonite/zerotier:latest
-
-RUN echo "{\"settings\": {\"portMappingEnabled\": true,\"softwareUpdate\": \"disable\",\"allowManagementFrom\": [\"0.0.0.0/0\"]}}" > /var/lib/zerotier-one/local.conf
-
-EXPOSE 9993/tcp
-EXPOSE 9993/udp
-
-ENTRYPOINT ["zerotier-one"]