diff --git a/.circleci/config.yml b/.circleci/config.yml
index 071aa967..30c4e1f4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,17 +1,20 @@
 version: 2.1
 
-orbs:
-  docker: circleci/docker@0.5.20
+jobs:
+  build:
+    docker:
+      - image: docker:18.09.6
+    environment:
+      DOCKER_BUILDKIT: "1"
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 18.09.3
+      - run: docker build --platform linux/amd64,linux/arm64,linux/arm/v7 -t itzg/minecraft-server:multiarch .
 
 workflows:
   version: 2
   build:
     jobs:
-      - docker/publish:
-          image: $CIRCLE_PROJECT_USERNAME/minecraft-server
-          tag: multiarch
-          extra_build_args: "--platform linux/amd64,linux/arm64,linux/arm/v7"
-          deploy: false
-          executor: docker/docker
-          use-remote-docker: true
+      - build