diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 778b6db..bd4eedc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,21 +25,21 @@ jobs:
           - 0.13.1
           - 0.13.0
     env:
-      DOCKER_TAG: v${{ matrix.version }}-${{ matrix.arch }}
+      DOCKER_IMAGE: bitcoind:v${{ matrix.version }}-${{ matrix.arch }}
     steps:
       - uses: actions/checkout@v1
       - name: Register Docker QEMU
         run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-      - name: Build lukechilds/bitcoind
-        run: docker build --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.version }} -t lukechilds/bitcoind:$DOCKER_TAG .
+      - name: Build bitcoind
+        run: docker build --build-arg ARCH=${{ matrix.arch }} --build-arg VERSION=${{ matrix.version }} -t $DOCKER_IMAGE .
       - name: Log image data
-        run: docker images lukechilds/bitcoind
+        run: docker images bitcoind
       - name: Log OS details
-        run: docker run --entrypoint sh lukechilds/bitcoind:$DOCKER_TAG '-c' 'uname -a && . /etc/os-release && echo $PRETTY_NAME'
+        run: docker run --entrypoint sh $DOCKER_IMAGE '-c' 'uname -a && . /etc/os-release && echo $PRETTY_NAME'
       - name: Check bitcoind -version
-        run: (docker run lukechilds/bitcoind:$DOCKER_TAG -version | tee /dev/stderr | grep -q ${{ matrix.version }}) 2>&1
+        run: (docker run $DOCKER_IMAGE -version | tee /dev/stderr | grep -q ${{ matrix.version }}) 2>&1
       - name: Save built image into a .tgz file
-        run: mkdir -p images && docker save lukechilds/bitcoind:$DOCKER_TAG | gzip > "images/bitcoind:$DOCKER_TAG.tgz"
+        run: mkdir -p images && docker save $DOCKER_IMAGE | gzip > "images/${DOCKER_IMAGE}.tgz"
       - name: Print sha256sum of built image
         run: sha256sum images/*
       - name: Upload built image