diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3490dbb..f55caaf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,6 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       CRYOSTAT_GRAFANA_IMG: quay.io/cryostat/cryostat-grafana-dashboard
+      REF_NAME: ${{ github.ref_name }}
     steps:
     - uses: actions/checkout@v2
     - name: Install qemu
@@ -24,13 +25,28 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y qemu-user-static
+    - name: Check release branch
+      id: check-branch
+      run: |
+        if [[ ${REF_NAME} == cryostat-v* ]]; then
+          echo "image-tag=${REF_NAME:10}-dev" >> $GITHUB_OUTPUT
+        else
+          echo "image-tag=${REF_NAME}" >> $GITHUB_OUTPUT
+        fi
+    - name: Check commit git tag
+      id: check-commit
+      run: |
+        output=$(git describe --tags --exact-match 2>/dev/null | sed -e "s/^v//" || echo -n '')
+        echo "::set-output name=image-tag::$output"
+        echo "::set-output name=image-tag-patch::${output:0:3}"
+        echo "::set-output name=image-tag-release::${output:0:1}"
     - name: Build container images and manifest
       id: buildah-build
       uses: redhat-actions/buildah-build@v2
       with:
         image: ${{ env.CRYOSTAT_GRAFANA_IMG }}
         archs: amd64, arm64
-        tags: ${{ github.ref_name }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }}
+        tags: ${{ steps.check-branch.outputs.image-tag }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }} ${{ steps.check-commit.outputs.image-tag }} ${{ steps.check-commit.outputs.image-tag-patch }} ${{ steps.check-commit.outputs.image-tag-release }}
         containerfiles: |
           ./Dockerfile
     - name: Push to quay.io