diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh
index 424b7887b60e..e76a5250fd1a 100755
--- a/tools/build/build_asf.sh
+++ b/tools/build/build_asf.sh
@@ -96,11 +96,13 @@ perl -pi -e "s/<cs.xapi.version>6.2.0-1-SNAPSHOT<\/cs.xapi.version>/<cs.xapi.ver
 perl -pi -e "s/-SNAPSHOT//" tools/checkstyle/pom.xml
 perl -pi -e "s/-SNAPSHOT//" deps/XenServerJava/pom.xml
 perl -pi -e "s/-SNAPSHOT//" tools/apidoc/pom.xml
-perl -pi -e "s/-SNAPSHOT//" Dockerfile
 perl -pi -e "s/-SNAPSHOT//" build/replace.properties
 perl -pi -e "s/-SNAPSHOT//" services/console-proxy/plugin/pom.xml
 perl -pi -e "s/-SNAPSHOT//" tools/marvin/setup.py
 perl -pi -e "s/-SNAPSHOT//" tools/marvin/marvin/deployAndRun.py
+perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile
+perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile.marvin
+perl -pi -e "s/-SNAPSHOT//" tools/docker/Dockerfile.centos6
 case "$currentversion" in 
   *-SNAPSHOT*)
     perl -pi -e 's/-SNAPSHOT//' debian/rules
diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh
index a41676db6db0..e2b2ec6ab22e 100755
--- a/tools/build/setnextversion.sh
+++ b/tools/build/setnextversion.sh
@@ -66,6 +66,19 @@ mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P sim
 mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml
 perl -pi -e "s/$currentversion/$version/" deps/XenServerJava/pom.xml
 perl -pi -e "s/$currentversion/$version/" tools/apidoc/pom.xml
+
+# Dockerfiles
+perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile
+perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile.marvin
+# centos6 based dockerfile
+perl -pi -e "s/Version=\"[^\"]*\"/Version=\"$version\"/" tools/docker/Dockerfile.centos6
+perl -pi -e "s/cloudstack-common-(.*).el6.x86_64.rpm/cloudstack-common-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6
+perl -pi -e "s/cloudstack-management-(.*)el6.x86_64.rpm/cloudstack-management-${version}.el6.x86_64.rpm/" tools/docker/Dockerfile.centos6
+perl -pi -e "s/Marvin-(.*).tar.gz/Marvin-${version}.tar.gz/" tools/docker/Dockerfile.marvin
+# systemtpl.sh:  system vm template version without -SNAPSHOT
+SYSTEMPVMTPL_VERSION=`echo $version|cut -d- -f1`
+perl -pi -e "s/[0-9].[0-9].[0-9]/${SYSTEMPVMTPL_VERSION}/" tools/docker/systemtpl.sh
+
 git clean -f
 
 echo 'commit changes'
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 9d8b2e062b65..25e58a49f73e 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -20,7 +20,7 @@
 FROM ubuntu:14.04
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT"
 
 RUN apt-get -y update && apt-get install -y \
     genisoimage \
diff --git a/tools/docker/Dockerfile.centos6 b/tools/docker/Dockerfile.centos6
index 87f6d0a369d4..0f2847309eec 100644
--- a/tools/docker/Dockerfile.centos6
+++ b/tools/docker/Dockerfile.centos6
@@ -18,14 +18,14 @@
 FROM centos:6
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT"
 
 ENV PKG_URL=http://jenkins.buildacloud.org/job/package-rhel63-master/lastSuccessfulBuild/artifact/dist/rpmbuild/RPMS/x86_64
 
 # install CloudStack
 RUN yum install -y nc wget \
-    ${PKG_URL}/cloudstack-common-4.6.0-SNAPSHOT.el6.x86_64.rpm \
-    ${PKG_URL}/cloudstack-management-4.6.0-SNAPSHOT.el6.x86_64.rpm
+    ${PKG_URL}/cloudstack-common-4.7.0-SNAPSHOT.el6.x86_64.rpm \
+    ${PKG_URL}/cloudstack-management-4.7.0-SNAPSHOT.el6.x86_64.rpm
 
 RUN cd /etc/cloudstack/management; \
     ln -s tomcat6-nonssl.conf tomcat6.conf; \
diff --git a/tools/docker/Dockerfile.marvin b/tools/docker/Dockerfile.marvin
index 4293f5632744..bd1ba7932ec0 100644
--- a/tools/docker/Dockerfile.marvin
+++ b/tools/docker/Dockerfile.marvin
@@ -20,11 +20,11 @@
 FROM python:2
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Vendor="Apache.org" License="ApacheV2" Version="4.6.0"
+LABEL Vendor="Apache.org" License="ApacheV2" Version="4.7.0-SNAPSHOT"
 
 ENV WORK_DIR=/marvin
 
-ENV PKG_URL=http://jenkins.buildacloud.org/job/cloudstack-marvin-master/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.6.0-SNAPSHOT.tar.gz
+ENV PKG_URL=http://jenkins.buildacloud.org/job/cloudstack-marvin-master/lastSuccessfulBuild/artifact/tools/marvin/dist/Marvin-4.7.0-SNAPSHOT.tar.gz
 
 RUN pip install --upgrade paramiko nose requests
 RUN pip install --allow-external mysql-connector-python mysql-connector-python
diff --git a/tools/docker/systemtpl.sh b/tools/docker/systemtpl.sh
index f3035aea1d54..d0ddaf984940 100755
--- a/tools/docker/systemtpl.sh
+++ b/tools/docker/systemtpl.sh
@@ -41,19 +41,19 @@ fi
 URL="http://jenkins.buildacloud.org/job/build-systemvm64-master/lastSuccessfulBuild/artifact/tools/appliance/dist"
 case $HYPERVISOR in
  	kvm)
-		TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-kvm.qcow2.bz2
+		TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-kvm.qcow2.bz2
 		;;
 	xenserver)
-		TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-xen.vhd.bz2
+		TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-xen.vhd.bz2
 		;;
 	vmware)
-		TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-vmware.ova
+		TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-vmware.ova
 		;;
 	lxc)
-		TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-kvm.qcow2.bz2
+		TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-kvm.qcow2.bz2
 		;;
 	ovm)
-		TO_DOWNLOAD=${URL}/systemvm64template-master-4.6.0-ovm.raw.bz2
+		TO_DOWNLOAD=${URL}/systemvm64template-master-4.7.0-ovm.raw.bz2
 		;;
 	*)
 		echo "ERROR: hypervisor not found"
diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py
index 56ff80a4b321..9766f3e4250c 100644
--- a/tools/marvin/setup.py
+++ b/tools/marvin/setup.py
@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.6.0-SNAPSHOT"
+VERSION = "4.7.0-SNAPSHOT"
 
 setup(name="Marvin",
       version=VERSION,