diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 41ed052..78e6ebb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,16 @@
 on: [push]
 name: CI
 jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: ci/checkout-repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: ci/setup-docker-buildx
+        uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1          
+      - name: ci/test-arm-build
+        run: make docker-build
+
   lint:
     env:
       GOPATH: ${{ github.workspace }}
diff --git a/Makefile b/Makefile
index 6b4f78f..9aad044 100644
--- a/Makefile
+++ b/Makefile
@@ -190,12 +190,6 @@ test: go-test ## to test
 
 docker-build: ## to build the docker image
 	@$(INFO) Performing Docker build ${APP_NAME}:${APP_VERSION} for ${DOCKER_BUILD_PLATFORMS}
-ifeq ($(DOCKER_BUILDER_MISSING),1)
-ifeq ($(CI),true)
-	@$(INFO) Creating ${DOCKER_BUILDER} builder
-	$(AT)$(DOCKER) buildx create --name ${DOCKER_BUILDER} --use
-endif
-endif
 	$(AT)$(DOCKER) buildx build \
 	--platform ${DOCKER_BUILD_PLATFORMS} \
 	--output=type=${DOCKER_BUILD_OUTPUT_TYPE} \