diff --git a/debian/changelog b/debian/changelog
index 0c50dfa3fd5..e8d490b01b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cloudstack (4.16.1.0-SNAPSHOT) unstable; urgency=low
+
+  * Update the version to 4.16.1.0-SNAPSHOT
+
+ -- the Apache CloudStack project <dev@cloudstack.apache.org>  Wed, 10 Nov 2021 11:31:57 -0300
+
 cloudstack (4.16.0.0) unstable; urgency=low
 
   * Update the version to 4.16.0.0
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql
new file mode 100644
index 00000000000..9db01dd374a
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610-cleanup.sql
@@ -0,0 +1,20 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
+-- Schema upgrade cleanup from 4.16.0.0 to 4.16.1.0
+--;
\ No newline at end of file
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql
new file mode 100644
index 00000000000..24c5b79e658
--- /dev/null
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41600to41610.sql
@@ -0,0 +1,20 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+--;
+-- Schema upgrade from 4.16.0.0 to 4.16.1.0
+--;
\ No newline at end of file
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index e5b2a95a681..1438819d61e 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.16.0.0</version>
+    <version>4.16.1.0-SNAPSHOT</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index a7f2014bd0e..31b56b88de0 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
 FROM ubuntu:20.04
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index 2cce6f22333..0a6a991553f 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -20,7 +20,7 @@
 FROM python:2
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.0.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.16.1.0-SNAPSHOT"
 
 ENV WORK_DIR=/marvin
 
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 883db76bc9b..d0d97a8e77c 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.16.0.0"
+VERSION = "4.16.1.0-SNAPSHOT"
 
 setup(name="Marvin",
       version=VERSION,