diff --git a/components/tenant-mgt/org.wso2.carbon.client.configcontext.provider/pom.xml b/components/tenant-mgt/org.wso2.carbon.client.configcontext.provider/pom.xml
index b4f8d3bc..1cdb7abe 100644
--- a/components/tenant-mgt/org.wso2.carbon.client.configcontext.provider/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.client.configcontext.provider/pom.xml
@@ -12,12 +12,12 @@
 	<parent>
 		<groupId>org.wso2.carbon.multitenancy</groupId>
 		<artifactId>tenant-mgt-parent</artifactId>
-		<version>4.9.8</version>
+		<version>4.9.21-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>org.wso2.carbon.client.configcontext.provider</artifactId>
-	<version>4.9.8</version>
+	<version>4.9.21-SNAPSHOT</version>
 	<name>WSO2 Carbon - Client Configuration Context Provider</name>
 	<url>http://wso2.org</url>
 	<packaging>bundle</packaging>
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.activation/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.activation/pom.xml
index 3e1b83cb..3afdf515 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.activation/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.activation/pom.xml
@@ -18,13 +18,13 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.activation</artifactId>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Stratos - Activation</name>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml
index 56c958e9..908695d4 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.dispatcher/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.dispatcher/pom.xml
index c12ab2af..c028d95d 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.dispatcher/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.dispatcher/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/pom.xml
index 1afbfa46..d1cef383 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.keystore.mgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.mgt.core/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.mgt.core/pom.xml
index e7863bd7..cd2ae670 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.mgt.core/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.mgt.core/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.mgt.ui/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.mgt.ui/pom.xml
index 6bdc8e7a..8da0b809 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.mgt.ui/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.mgt.ui/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.mgt/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.mgt/pom.xml
index e12567b9..d803f9db 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.mgt/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.mgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet.ui/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet.ui/pom.xml
index 302dc9df..5635f302 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet.ui/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet.ui/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.redirector.servlet.ui</artifactId>
     <packaging>bundle</packaging>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <name>WSO2 Stratos - Tenant Specific URL redirector UI component</name>
 
     <build>
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet/pom.xml
index 036a5790..246b83d5 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.redirector.servlet/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.redirector.servlet</artifactId>
     <packaging>bundle</packaging>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <name>WSO2 Stratos - Tenant Specific URL redirector</name>
 
     <build>
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.sso.redirector.ui/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.sso.redirector.ui/pom.xml
index f62e4c61..40cba9d5 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.sso.redirector.ui/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.sso.redirector.ui/pom.xml
@@ -18,13 +18,13 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.sso.redirector.ui</artifactId>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Stratos - SSO redirector UI component</name>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt.ui/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt.ui/pom.xml
index e520a6da..36e75e25 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt.ui/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt.ui/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.multitenancy</groupId>
     <artifactId>org.wso2.carbon.tenant.theme.mgt.ui</artifactId>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Stratos - Theme Configuration User Interface</name>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt/pom.xml
index dc4359da..fe080eba 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.theme.mgt/pom.xml
@@ -18,14 +18,14 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
 
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.theme.mgt</artifactId>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Stratos - Tenant Theme Configurations</name>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.throttling.agent/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.throttling.agent/pom.xml
index 5f6702ae..45252985 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.throttling.agent/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.throttling.agent/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/org.wso2.carbon.tenant.usage.agent/pom.xml b/components/tenant-mgt/org.wso2.carbon.tenant.usage.agent/pom.xml
index c12fe1c8..a3df29ab 100644
--- a/components/tenant-mgt/org.wso2.carbon.tenant.usage.agent/pom.xml
+++ b/components/tenant-mgt/org.wso2.carbon.tenant.usage.agent/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-parent</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/components/tenant-mgt/pom.xml b/components/tenant-mgt/pom.xml
index 78c27664..be2ecc64 100644
--- a/components/tenant-mgt/pom.xml
+++ b/components/tenant-mgt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>carbon-multitenancy</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.common.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.common.feature/pom.xml
index 45bd548f..fea5343f 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.common.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.common.feature/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.common.feature</artifactId>
     <packaging>pom</packaging>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <name>WSO2 Tenant Common Composite Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the bundles required for Common feature</description>
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.common.server.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.common.server.feature/pom.xml
index da71933f..eb36d977 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.common.server.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.common.server.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.common.ui.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.common.ui.feature/pom.xml
index 75ddd13f..2ce8d096 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.common.ui.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.common.ui.feature/pom.xml
@@ -20,14 +20,14 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.tenant.common.ui.feature</artifactId>
     <packaging>pom</packaging>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <name>WSO2 Stratos - Common UI Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the bundles required for Front-end servlet functionality</description>
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml
index 4dc4f2fa..bf215954 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.deployment/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/pom.xml
index 194b620a..4d082e4b 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.mgt.core.feature/pom.xml
@@ -20,7 +20,7 @@
    <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/pom.xml
index e8769441..b8c71068 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.mgt.server.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
 	<relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.throttling.agent.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.throttling.agent.feature/pom.xml
index 2bdf075f..5c3047ca 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.throttling.agent.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.throttling.agent.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/org.wso2.carbon.tenant.usage.agent.feature/pom.xml b/features/tenant-mgt/org.wso2.carbon.tenant.usage.agent.feature/pom.xml
index cef7a3bd..e0cfd2c7 100644
--- a/features/tenant-mgt/org.wso2.carbon.tenant.usage.agent.feature/pom.xml
+++ b/features/tenant-mgt/org.wso2.carbon.tenant.usage.agent.feature/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>tenant-mgt-feature</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/features/tenant-mgt/pom.xml b/features/tenant-mgt/pom.xml
index 2eba90fd..04aa2e67 100644
--- a/features/tenant-mgt/pom.xml
+++ b/features/tenant-mgt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>carbon-multitenancy</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 29535fc2..7a9c2821 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.wso2.carbon.multitenancy</groupId>
     <artifactId>carbon-multitenancy</artifactId>
     <packaging>pom</packaging>
-    <version>4.9.8</version>
+    <version>4.9.21-SNAPSHOT</version>
     <name>WSO2 Carbon - Platform Aggregator Pom</name>
     <url>http://wso2.org</url>
 
@@ -28,7 +28,7 @@
         <url>https://github.com/wso2/carbon-multitenancy.git</url>
         <developerConnection>scm:git:https://github.com/wso2/carbon-multitenancy.git</developerConnection>
         <connection>scm:git:https://github.com/wso2/carbon-multitenancy.git</connection>
-        <tag>v4.9.8</tag>
+        <tag>HEAD</tag>
     </scm>
 
 
diff --git a/service-stubs/org.wso2.carbon.tenant.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.tenant.mgt.stub/pom.xml
index 9d180536..91b44515 100644
--- a/service-stubs/org.wso2.carbon.tenant.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.tenant.mgt.stub/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>carbon-multitenancy</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/org.wso2.carbon.tenant.redirector.servlet.stub/pom.xml b/service-stubs/org.wso2.carbon.tenant.redirector.servlet.stub/pom.xml
index e80068a6..41c85c17 100644
--- a/service-stubs/org.wso2.carbon.tenant.redirector.servlet.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.tenant.redirector.servlet.stub/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>carbon-multitenancy</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/service-stubs/org.wso2.carbon.tenant.theme.mgt.stub/pom.xml b/service-stubs/org.wso2.carbon.tenant.theme.mgt.stub/pom.xml
index 0039cb99..05ac60bd 100644
--- a/service-stubs/org.wso2.carbon.tenant.theme.mgt.stub/pom.xml
+++ b/service-stubs/org.wso2.carbon.tenant.theme.mgt.stub/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.multitenancy</groupId>
         <artifactId>carbon-multitenancy</artifactId>
-        <version>4.9.8</version>
+        <version>4.9.21-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>