diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index b73c99fa223..1d89bd5aa80 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -22,7 +22,7 @@
     <name>Apache CloudStack Developer Tools - Checkstyle Configuration</name>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>checkstyle</artifactId>
-    <version>4.22.0.0</version>
+    <version>4.22.0.0-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 6c68bf3e613..0b29c106555 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -19,7 +19,7 @@
 
 FROM ubuntu:22.04
 
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.22.0.0" Author="Apache CloudStack <dev@cloudstack.apache.org>"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.22.0.0-SNAPSHOT" Author="Apache CloudStack <dev@cloudstack.apache.org>"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index bc6ea6a68bc..5838e5d2428 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -19,11 +19,11 @@
 # build for cloudstack_home_dir not this folder
 FROM python:2
 
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.22.0.0" Author="Apache CloudStack <dev@cloudstack.apache.org>"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.22.0.0-SNAPSHOT" Author="Apache CloudStack <dev@cloudstack.apache.org>"
 
 ENV WORK_DIR=/marvin
 
-ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.22.0.0.tar.gz
+ENV PKG_URL=https://builds.cloudstack.org/job/build-master-marvin/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.22.0.0-SNAPSHOT.tar.gz
 
 RUN apt-get update && apt-get install -y vim
 RUN pip install --upgrade paramiko nose requests
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index f7691589a7f..f5c99b28ac9 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -27,7 +27,7 @@ except ImportError:
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.22.0.0"
+VERSION = "4.22.0.0-SNAPSHOT"
 
 setup(name="Marvin",
       version=VERSION,