diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 71f152e..461b007 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM ghcr.io/reazon-research/ros2:humble
+FROM osrf/ros:humble-desktop-full
 
 COPY ros_entrypoint.sh /ros_entrypoint.sh
 RUN . /opt/ros/humble/setup.sh && \
     apt update && \
     apt install nlohmann-json3-dev -y && \
     mkdir --parents ~/ros2_ws/src && \
-    git clone --branch main https://github.com/reazon-research/openarm_ros2.git ~/ros2_ws/src/openarm_ros2 && \
+    git clone --branch main https://github.com/enactic/openarm_ros2.git ~/ros2_ws/src/openarm_ros2 && \
     cd ~/ros2_ws && \
     rosdep install --from-paths src --ignore-src -r -y && \
     colcon build --symlink-install && \
diff --git a/.docker/README.md b/.docker/README.md
index dc1279b..fe5ab1b 100644
--- a/.docker/README.md
+++ b/.docker/README.md
@@ -9,7 +9,7 @@ host +local:root
 docker run --env DISPLAY=$DISPLAY \
 --volume /tmp/.X11-unix:/tmp/.X11-unix \
 --network=host \
--it ghcr.io/reazon-research/openarm:v0.3 \
+-it thchzh/ros2:openarm-humble \
 /bin/bash
 ```
 
@@ -23,5 +23,5 @@ ros2 launch -d openarm_bimanual_moveit_config demo.launch.py hardware_type:=sim
 
 # To build the latest image (v0.3)
 ```sh
-docker build --no-cache -t ghcr.io/reazon-research/openarm:v0.3 .
+docker build --no-cache -t thchzh/ros2:openarm-humble .
 ```
diff --git a/README.md b/README.md
index 1d73a4e..98683c6 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@
   <a href="https://build.ros2.org/job/Hdev__openarm__ubuntu_jammy_amd64/" alt="alt="ROS2 build status">
     <img src="https://build.ros2.org/buildStatus/icon?job=Hdev__openarm__ubuntu_jammy_amd64"/>
   </a>
-  <a href="https://github.com/reazon-research/openarm_ros2/tree/main/LICENSE" alt="Apache License 2.0">
-    <img src="https://img.shields.io/github/license/reazon-research/openarm_ros2"/>
+  <a href="https://github.com/enactic/openarm_ros2/tree/main/LICENSE" alt="Apache License 2.0">
+    <img src="https://img.shields.io/github/license/enactic/openarm_ros2"/>
   </a>
 </p>
 
@@ -48,7 +48,7 @@ source /opt/ros/humble/setup.bash # Change "humble" to your ROS 2 distro, ie:
                                   # source /opt/ros/jazzy/setup.bash 
 mkdir -p ~/ros2_ws/src
 cd ~/ros2_ws/src
-git clone https://github.com/reazon-research/openarm_ros2.git
+git clone https://github.com/enactic/openarm_ros2.git
 ```
 
 3. [Install dependencies with rosdep](https://docs.ros.org/en/humble/Tutorials/Intermediate/Rosdep.html) and [build the packages with colcon](https://docs.ros.org/en/humble/Tutorials/Beginner-Client-Libraries/Colcon-Tutorial.html)