diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml
index 9d27a83e83d..6eec0cd9eb9 100644
--- a/.github/workflows/ci-elasticsearch.yml
+++ b/.github/workflows/ci-elasticsearch.yml
@@ -9,11 +9,6 @@ on:
 jobs:
   elasticsearch:
     runs-on: ubuntu-latest
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000
     strategy:
       matrix:
         version:
@@ -48,12 +43,5 @@ jobs:
 
     - uses: docker/setup-qemu-action@v1
 
-    - uses: docker/setup-buildx-action@v1
-      with:
-        driver-opts: network=host
-
     - name: Run elasticsearch integration tests
       run: bash scripts/es-integration-test.sh ${{ matrix.version.distribution }} ${{ matrix.version.image }}
-      env:
-        DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-        QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }}
diff --git a/docker/Makefile b/docker/Makefile
index 815c24bd35b..6db950eb614 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -3,9 +3,9 @@ ROOT_IMAGE ?= alpine:3.13
 CERT_IMAGE := $(ROOT_IMAGE)
 GOLANG_IMAGE := golang:1.16-alpine
 
-BASE_IMAGE ?= localhost:5000/baseimg_alpine:latest
-DEBUG_IMAGE ?= localhost:5000/debugimg_alpine:latest
-PLATFORMS ?= linux/amd64,linux/s390x,linux/ppc64le,linux/arm64
+BASE_IMAGE := localhost:5000/baseimg_alpine:latest
+DEBUG_IMAGE := localhost:5000/debugimg_alpine:latest
+PLATFORMS := linux/amd64,linux/s390x,linux/ppc64le,linux/arm64
 
 create-baseimg-debugimg: create-baseimg create-debugimg