diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f27a9f17..38582217 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -121,3 +121,43 @@ jobs:
           # tags parameter must be a string input so convert `gettags` JSON
           # array into a comma separated list of tags
           tags: ${{ join(fromJson(steps.gettags.outputs.tags)) }}
+
+      # jupyterhub-onbuild
+
+      - name: Get list of jupyterhub-onbuild tags
+        id: onbuildtags
+        uses: jupyterhub/action-major-minor-tag-calculator@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          prefix: "jupyterhub-onbuild/jupyterhub:"
+
+      - name: Build and push jupyterhub-onbuild
+        if: ${{ env.PUSH_IMAGE == 'true' }}
+        uses: docker/build-push-action@v2
+        with:
+          build-args: |
+            BASE_IMAGE=${{ fromJson(steps.onbuildtags.outputs.tags)[0] }}
+          context: onbuild
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ join(fromJson(steps.onbuildtags.outputs.tags)) }}
+
+      # jupyterhub-demo
+
+      - name: Get list of jupyterhub-demo tags
+        id: demotags
+        uses: jupyterhub/action-major-minor-tag-calculator@main
+        with:
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          prefix: "jupyterhub-demo/jupyterhub:"
+
+      - name: Build and push jupyterhub-demo
+        if: ${{ env.PUSH_IMAGE == 'true' }}
+        uses: docker/build-push-action@v2
+        with:
+          build-args: |
+            BASE_IMAGE=${{ fromJson(steps.demotags.outputs.tags)[0] }}
+          context: demo-image
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ join(fromJson(steps.demotags.outputs.tags)) }}