diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4df0d0f..9739e57 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,13 +32,28 @@ jobs:
         sudo apt-get install -y qemu-user-static
     - name: Get date tag
       run: echo "DATE_TAG=$(date -uI)" >> "$GITHUB_ENV"
+    - 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.CI_IMG }}
         archs: amd64, arm64
-        tags: ${{ github.ref_name }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }} ${{ env.DATE_TAG }}
+        tags: ${{ github.ref_name }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }} ${{ env.DATE_TAG }} ${{ steps.check-branch.outputs.image-tag }} ${{ 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
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..5f49cc7
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,19 @@
+pull_request_rules:
+  - name: backport patches to cryostat-v3.0 branch
+    conditions:
+      - base=main
+      - label=backport
+    actions:
+      backport:
+        branches:
+          - cryostat-v3.0
+        assignees:
+          - "{{ author }}"
+
+  - name: auto label PRs from reviewers
+    conditions:
+      - author=@reviewers
+    actions:
+      label:
+        add:
+          - safe-to-test