diff --git a/remove-containers.sh b/remove-containers.sh
index e066c11c33..1f324bf024 100644
--- a/remove-containers.sh
+++ b/remove-containers.sh
@@ -16,7 +16,7 @@
 # -----------------------------------------------------------------------
 
 # Just to assist developers by removing all the containers.
-micro_gw_version=4.0.0-m8
+micro_gw_version=4.0.0-m9-SNAPSHOT
 
 docker kill "$(docker ps -a | grep wso2/mg-enforcer:$micro_gw_version | awk '{print $1}')"
 docker rm "$(docker ps -a | grep wso2/mg-enforcer:$micro_gw_version | awk '{print $1}')"
diff --git a/resources/apim/docker-compose.yaml b/resources/apim/docker-compose.yaml
index 2ba0118eca..b6e3a352cf 100644
--- a/resources/apim/docker-compose.yaml
+++ b/resources/apim/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/mg-router:4.0.0-m8
+    image: wso2/mg-router:4.0.0-m9-SNAPSHOT
     logging:
       options:
         max-size: "20m"
@@ -28,7 +28,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/mg-adapter:4.0.0-m8
+    image: wso2/mg-adapter:4.0.0-m9-SNAPSHOT
     logging:
       options:
         max-size: "20m"
@@ -48,7 +48,7 @@ services:
     links:
       - apim
   enforcer:
-    image: wso2/mg-enforcer:4.0.0-m8
+    image: wso2/mg-enforcer:4.0.0-m9-SNAPSHOT
     logging:
       options:
         max-size: "20m"
diff --git a/resources/docker-compose.yaml b/resources/docker-compose.yaml
index 6bdb9c7903..c1ac2c2060 100644
--- a/resources/docker-compose.yaml
+++ b/resources/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2/mg-router:4.0.0-m8
+    image: wso2/mg-router:4.0.0-m9-SNAPSHOT
     logging:
       options:
         max-size: "20m"
@@ -28,7 +28,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2/mg-adapter:4.0.0-m8
+    image: wso2/mg-adapter:4.0.0-m9-SNAPSHOT
     logging:
       options:
         max-size: "20m"
@@ -43,7 +43,7 @@ services:
       - "18000:18000"
       - "9843:9843"
   enforcer:
-    image: wso2/mg-enforcer:4.0.0-m8
+    image: wso2/mg-enforcer:4.0.0-m9-SNAPSHOT
     logging:
       options:
         max-size: "20m"
diff --git a/resources/k8s-artifacts/mg-adapter/deployment.yaml b/resources/k8s-artifacts/mg-adapter/deployment.yaml
index c4e5c96870..3803dc23c3 100644
--- a/resources/k8s-artifacts/mg-adapter/deployment.yaml
+++ b/resources/k8s-artifacts/mg-adapter/deployment.yaml
@@ -48,7 +48,7 @@ spec:
             - mountPath: /home/wso2/conf/log_config.toml
               subPath: log_config.toml
               name: logconfig-toml-vol
-          image: wso2/mg-adapter:4.0.0-m8
+          image: wso2/mg-adapter:4.0.0-m9-SNAPSHOT
           imagePullPolicy: Always
           env:
             - name: cp_admin_pwd
diff --git a/resources/k8s-artifacts/mg-enforcer/deployment.yaml b/resources/k8s-artifacts/mg-enforcer/deployment.yaml
index f67055cd2c..735c0393fb 100644
--- a/resources/k8s-artifacts/mg-enforcer/deployment.yaml
+++ b/resources/k8s-artifacts/mg-enforcer/deployment.yaml
@@ -52,7 +52,7 @@ spec:
               name: logconfig-toml-vol
             - mountPath: /home/wso2/lib/dropins
               name: dropins-vol
-          image: wso2/mg-enforcer:4.0.0-m8
+          image: wso2/mg-enforcer:4.0.0-m9-SNAPSHOT
           imagePullPolicy: Always
           env:
             - name: ENFORCER_PRIVATE_KEY_PATH
diff --git a/resources/k8s-artifacts/mg-router/deployment.yaml b/resources/k8s-artifacts/mg-router/deployment.yaml
index 0bbe347729..c492ffc031 100644
--- a/resources/k8s-artifacts/mg-router/deployment.yaml
+++ b/resources/k8s-artifacts/mg-router/deployment.yaml
@@ -37,7 +37,7 @@ spec:
               name: router-keystore-vol
             - mountPath: /home/wso2/security/truststore
               name: router-truststore-vol
-          image: wso2/mg-router:4.0.0-m8
+          image: wso2/mg-router:4.0.0-m9-SNAPSHOT
           imagePullPolicy: Always
           env:
             - name: ROUTER_ADMIN_HOST