diff --git a/adapter/pom.xml b/adapter/pom.xml
index 83cc874e61..8b822bce24 100644
--- a/adapter/pom.xml
+++ b/adapter/pom.xml
@@ -79,7 +79,7 @@
                   <images>
                     <image>
                         <alias>mg-adapter</alias>
-                        <name>wso2am/mg-adapter:${project.version}</name>
+                        <name>wso2/mg-adapter:${project.version}</name>
                       <build>
                         <contextDir>${project.basedir}/src/main/resources</contextDir>
                         <assembly>
diff --git a/developer-guide.md b/developer-guide.md
index e322565a61..64886ebeb4 100644
--- a/developer-guide.md
+++ b/developer-guide.md
@@ -20,7 +20,7 @@ maven plugin would fail to create the new docker images)
  java-11 as the source)
  
  - Navigate to distribution/target/.
- Then extract the zip file called wso2am-micro-gw-4.0.0-SNAPSHOT.zip
+ Then extract the zip file called wso2am-micro-gw-4.0.0-m1.zip
  
  - Then execute `docker-compose up` to run the setup. This will start an envoy container,
  filter-core container and piot container. The mounted configurations can be found from
diff --git a/enforcer/pom.xml b/enforcer/pom.xml
index 13ba35cda9..9e88c5ed32 100644
--- a/enforcer/pom.xml
+++ b/enforcer/pom.xml
@@ -161,7 +161,7 @@
                   <images>
                     <image>
                         <alias>mg-enforcer</alias>
-                        <name>wso2am/mg-enforcer:${project.version}</name>
+                        <name>wso2/mg-enforcer:${project.version}</name>
                       <build>
                         <contextDir>${project.basedir}/src/main/resources</contextDir>
                         <args>
diff --git a/remove-containers.sh b/remove-containers.sh
index b612beeb15..faddd0edbf 100755
--- a/remove-containers.sh
+++ b/remove-containers.sh
@@ -16,10 +16,10 @@
 # -----------------------------------------------------------------------
 
 # Just to assist developers by removing all the containers.
-micro_gw_version=4.0.0-SNAPSHOT
+micro_gw_version=4.0.0-m1
 
-docker kill $(docker ps -a | grep wso2am/mg-enforcer:$micro_gw_version | awk '{print $1}')
-docker rm $(docker ps -a | grep wso2am/mg-enforcer:$micro_gw_version | awk '{print $1}')
+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}')
 
-docker kill $(docker ps -a | grep wso2am/mg-adapter:$micro_gw_version | awk '{print $1}')
-docker rm $(docker ps -a | grep wso2am/mg-adapter:$micro_gw_version | awk '{print $1}')
+docker kill $(docker ps -a | grep wso2/mg-adapter:$micro_gw_version | awk '{print $1}')
+docker rm $(docker ps -a | grep wso2/mg-adapter:$micro_gw_version | awk '{print $1}')
diff --git a/resources/docker-compose.yaml b/resources/docker-compose.yaml
index ce9de95c71..7bbe83b04f 100644
--- a/resources/docker-compose.yaml
+++ b/resources/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: "3.7"
 services:
   router:
-    image: wso2am/mg-router:4.0.0-SNAPSHOT
+    image: wso2/mg-router:4.0.0-m1
     ports:
       - "9095:9095"
       - "9000:9000"
@@ -9,7 +9,7 @@ services:
       - adapter
       - enforcer
   adapter:
-    image: wso2am/mg-adapter:4.0.0-SNAPSHOT
+    image: wso2/mg-adapter:4.0.0-m1
     volumes:  
       - ./resources/adapter/security:/home/wso2/security
       - ./resources/conf:/home/wso2/conf
@@ -17,7 +17,7 @@ services:
       - "18000:18000" 
       - "9843:9843"
   enforcer:
-    image: wso2am/mg-enforcer:4.0.0-SNAPSHOT
+    image: wso2/mg-enforcer:4.0.0-m1
     volumes:  
       - ./resources/enforcer/security:/home/wso2/mg/security
       - ./resources/conf:/home/wso2/conf
diff --git a/router/pom.xml b/router/pom.xml
index ab28d16d3d..9ee0cfcdbc 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -38,7 +38,7 @@
                   <images>
                     <image>
                         <alias>mg-router</alias>
-                        <name>wso2am/mg-router:${project.version}</name>
+                        <name>wso2/mg-router:${project.version}</name>
                       <build>
                         <contextDir>${project.basedir}/src/main/resources</contextDir>
                         <assembly>