diff --git a/.github/workflows/push-ci.yaml b/.github/workflows/push-ci.yaml
index faaad4fcf..673f14bcb 100644
--- a/.github/workflows/push-ci.yaml
+++ b/.github/workflows/push-ci.yaml
@@ -117,8 +117,7 @@ jobs:
       with:
         image: ${{ env.CI_IMG }}
         archs: amd64, arm64
-        # tags: ${{ env.IMAGE_VERSION }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }}
-        tags: ${{ env.IMAGE_VERSION }}
+        tags: ${{ env.IMAGE_VERSION }} ${{ github.ref == 'refs/heads/main' && 'latest' || '' }}
         containerfiles: |
           ./src/main/docker/Dockerfile.jvm
     - name: Push to quay.io
diff --git a/.mergify.yml b/.mergify.yml
index 83fbd5915..4ca54efbb 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -1,14 +1,14 @@
 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: 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:
diff --git a/compose/cryostat.yml b/compose/cryostat.yml
index 80dd96fe3..2bc5a14b8 100644
--- a/compose/cryostat.yml
+++ b/compose/cryostat.yml
@@ -6,7 +6,7 @@ services:
         limits:
           cpus: '2'
           memory: 512m
-    image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:3.0.0-snapshot}
+    image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:latest}
     volumes:
       - ${XDG_RUNTIME_DIR}/podman/podman.sock:/run/user/1000/podman/podman.sock:Z
       - jmxtls_cfg:/truststore:U
diff --git a/compose/cryostat_docker.yml b/compose/cryostat_docker.yml
index 54874c983..7b1f2c7b1 100644
--- a/compose/cryostat_docker.yml
+++ b/compose/cryostat_docker.yml
@@ -11,7 +11,7 @@ services:
         limits:
           cpus: '2'
           memory: 512m
-    image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:3.0.0-snapshot}
+    image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:latest}
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:Z
     security_opt:
diff --git a/compose/cryostat_k8s.yml b/compose/cryostat_k8s.yml
index 2ec0eb28f..1ebb5d68a 100644
--- a/compose/cryostat_k8s.yml
+++ b/compose/cryostat_k8s.yml
@@ -6,7 +6,7 @@ services:
         condition: service_healthy
       s3:
         condition: service_healthy
-    image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:3.0.0-snapshot}
+    image: ${CRYOSTAT_IMAGE:-quay.io/cryostat/cryostat:latest}
     hostname: cryostat3
     expose:
       - "9091"
diff --git a/pom.xml b/pom.xml
index cf9590816..16565afda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.cryostat</groupId>
   <artifactId>cryostat3</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>4.0.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
@@ -38,7 +38,7 @@
 
     <build.arch>amd64</build.arch>
 
-    <io.cryostat.core.version>3.0.0-SNAPSHOT</io.cryostat.core.version>
+    <io.cryostat.core.version>4.0.0-SNAPSHOT</io.cryostat.core.version>
     <org.openjdk.jmc.version>9.0.0</org.openjdk.jmc.version>
 
     <org.apache.commons.codec.version>1.16.1</org.apache.commons.codec.version>
diff --git a/schema/openapi.yaml b/schema/openapi.yaml
index 96e94aa63..ae4c70beb 100644
--- a/schema/openapi.yaml
+++ b/schema/openapi.yaml
@@ -362,7 +362,7 @@ info:
     name: Apache 2.0
     url: https://github.com/cryostatio/cryostat3/blob/main/LICENSE
   title: Cryostat API
-  version: 3.0.0-snapshot
+  version: 4.0.0-snapshot
 openapi: 3.0.3
 paths:
   /api/beta/credentials/{connectUrl}:
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e2a1a13a6..65f2d373d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -114,6 +114,6 @@ quarkus.container-image.registry=quay.io
 quarkus.container-image.group=cryostat
 quarkus.container-image.name=cryostat
 quarkus.container-image.tag=${quarkus.application.version}
-quarkus.container-image.additional-tags=dev
+quarkus.container-image.additional-tags=dev,latest
 
 quarkus.native.additional-build-args=--initialize-at-run-time=org.openjdk.jmc.jdp.client.JDPClient\\,io.cryostat.core.net.discovery.JvmDiscoveryClient\\,java.net.Inet4Address\\,java.net.Inet6Address