diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 394b705f..35127ecc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -46,6 +46,8 @@ jobs:
       with:
         platforms: linux/amd64
         push: true
-        tags: ghcr.io/meeb/tubesync:latest
-        cache-from: type=registry,ref=ghcr.io/meeb/tubesync:latest
+        tags: ghcr.io/meeb/${{ env.IMAGE_NAME }}:latest
+        cache-from: type=registry,ref=ghcr.io/meeb/${{ env.IMAGE_NAME }}:latest
         cache-to: type=inline
+        build-args: |
+          IMAGE_NAME=${{ env.IMAGE_NAME }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index a32c1f7b..ffbf5cb7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -11,20 +11,23 @@ jobs:
   containerise:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
     - name: Get tag
       id: vars
       run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
-    - name: Create a new container builder
-      run: docker buildx create --name builder && docker buildx use builder
-    - name: Build the container image
-      run: docker buildx build --platform linux/amd64 --tag $IMAGE_NAME .
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
     - name: Log into GitHub Container Registry
       run: echo "${{ secrets.REGISTRY_ACCESS_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
-    - name: Push image to GitHub Container Registry
-      env:
-        RELEASE_TAG: ${{ steps.vars.outputs.tag }}
-      run: |
-        REF_TAG=ghcr.io/meeb/$IMAGE_NAME:$RELEASE_TAG
-        docker tag $IMAGE_NAME $REF_TAG
-        docker push $REF_TAG
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        platforms: linux/amd64
+        push: true
+        tags: ghcr.io/meeb/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }}
+        cache-from: type=registry,ref=ghcr.io/meeb/${{ env.IMAGE_NAME }}:${{ env.RELEASE_TAG }}
+        cache-to: type=inline
+        build-args: |
+          IMAGE_NAME=${{ env.IMAGE_NAME }}
+          RELEASE_TAG=${{ steps.vars.outputs.tag }}
\ No newline at end of file