diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
deleted file mode 100644
index ea3a9252..00000000
--- a/.github/workflows/build-image.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Build container image for TubeSync
-
-on:
-  release:
-    types: [release]
-
-env:
-  IMAGE_NAME: tubesync
-
-jobs:
-  container:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Build the container image
-      run: docker build . --tag $IMAGE_NAME
-    - 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
-      run: |
-        LATEST_TAG=ghcr.io/meeb/$IMAGE_NAME:latest
-        DATED_TAG=ghcr.io/meeb/$IMAGE_NAME:$(date +%s)
-        docker tag $IMAGE_NAME $LATEST_TAG
-        docker tag $IMAGE_NAME $DATED_TAG
-        docker push $LATEST_TAG
-        docker push $DATED_TAG
diff --git a/.github/workflows/testing.yaml b/.github/workflows/ci.yaml
similarity index 55%
rename from .github/workflows/testing.yaml
rename to .github/workflows/ci.yaml
index f10eba15..6d692d3f 100644
--- a/.github/workflows/testing.yaml
+++ b/.github/workflows/ci.yaml
@@ -29,3 +29,19 @@ jobs:
         run: cp tubesync/tubesync/local_settings.py.example tubesync/tubesync/local_settings.py
       - name: Run Django tests
         run: cd tubesync && python3 manage.py test --verbosity=2
+  containerise:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Build the container image
+      run: docker build . --tag $IMAGE_NAME
+    - 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
+      run: |
+        LATEST_TAG=ghcr.io/meeb/$IMAGE_NAME:latest
+        DATED_TAG=ghcr.io/meeb/$IMAGE_NAME:$(date +%s)
+        docker tag $IMAGE_NAME $LATEST_TAG
+        docker tag $IMAGE_NAME $DATED_TAG
+        docker push $LATEST_TAG
+        docker push $DATED_TAG