diff --git a/Dockerfile b/Dockerfile
index 1d7a5bb..f0a3ddb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,4 @@
-FROM alpine as buildx
-
-RUN apk add curl jq
-
-RUN mkdir -p /root/.docker/cli-plugins
-RUN curl -L https://github.com/docker/buildx/releases/download/v0.5.1/buildx-v0.5.1.linux-amd64 > /root/.docker/cli-plugins/docker-buildx
-RUN chmod a+x /root/.docker/cli-plugins/docker-buildx
+FROM docker/buildx-bin:v0.8 as buildx
 
 FROM docker:20
 
@@ -12,7 +6,7 @@ RUN apk add bash ip6tables pigz sysstat procps lsof
 
 COPY etc/docker/daemon.json /etc/docker/daemon.json
 
-COPY --from=buildx /root/.docker /root/.docker
+COPY --from=buildx /buildx /root/.docker/cli-plugins/docker-buildx
 
 COPY ./entrypoint ./entrypoint
 COPY ./docker-entrypoint.d/* ./docker-entrypoint.d/
@@ -21,4 +15,4 @@ ENV DOCKER_TMPDIR=/data/docker/tmp
 
 ENTRYPOINT ["./entrypoint"]
 
-CMD ["dockerd", "-p", "/var/run/docker.pid", "--tls=false"]
\ No newline at end of file
+CMD ["dockerd", "-p", "/var/run/docker.pid"]
\ No newline at end of file
diff --git a/etc/docker/daemon.json b/etc/docker/daemon.json
index e15f87a..574c149 100644
--- a/etc/docker/daemon.json
+++ b/etc/docker/daemon.json
@@ -1,6 +1,8 @@
 {
     "data-root": "/data/docker",
+    "experimental": true,
     "ipv6": true,
+    "ip6tables": true,
     "fixed-cidr-v6": "2001:db8:1::/64",
     "default-address-pools": [
         {
@@ -20,5 +22,6 @@
     "mtu": 1400,
     "max-concurrent-downloads": 10,
     "max-concurrent-uploads": 5,
-    "metrics-addr": "0.0.0.0:9323"
+    "metrics-addr": "0.0.0.0:9323",
+    "tls": false
 }
\ No newline at end of file