diff --git a/.docker/ci-testing/Dockerfile b/.docker/ci-testing/Dockerfile
index 88ee8eb1ee..b0ca0e0c07 100644
--- a/.docker/ci-testing/Dockerfile
+++ b/.docker/ci-testing/Dockerfile
@@ -2,7 +2,11 @@
 # CI image using the ROS testing repository
 
 ARG ROS_DISTRO=rolling
+<<<<<<< HEAD
 FROM osrf/ros2:testing
+=======
+FROM moveit/moveit2:${ROS_DISTRO}-ci
+>>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908))
 LABEL maintainer Robert Haschke rhaschke@techfak.uni-bielefeld.de
 
 ENV TERM xterm
diff --git a/.docker/source/Dockerfile b/.docker/source/Dockerfile
index f6864cb642..2b9082885e 100644
--- a/.docker/source/Dockerfile
+++ b/.docker/source/Dockerfile
@@ -4,7 +4,7 @@
 # Downloads the moveit source code and install remaining debian dependencies
 
 ARG ROS_DISTRO=rolling
-FROM ghcr.io/ros-planning/moveit2:${ROS_DISTRO}-ci-testing
+FROM moveit/moveit2:${ROS_DISTRO}-ci-testing
 LABEL maintainer Robert Haschke rhaschke@techfak.uni-bielefeld.de
 
 # Export ROS_UNDERLAY for downstream docker containers
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d6ef85a0d6..d02c891723 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -31,8 +31,15 @@ jobs:
       CXXFLAGS: >-
         -Wall -Wextra -Wwrite-strings -Wunreachable-code -Wpointer-arith -Wredundant-decls
       CLANG_TIDY_ARGS: --fix --fix-errors --format-style=file
+<<<<<<< HEAD
       DOCKER_IMAGE: ghcr.io/ros-planning/moveit2:${{ matrix.env.IMAGE }}
       UPSTREAM_WORKSPACE: moveit2.repos $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)
+=======
+      DOCKER_IMAGE: moveit/moveit2:${{ matrix.env.IMAGE }}
+      UPSTREAM_WORKSPACE: >
+        moveit2.repos
+        $(f="moveit2_$(sed 's/-.*$//' <<< "${{ matrix.env.IMAGE }}").repos"; test -r $f && echo $f)
+>>>>>>> 39d371453 (Temporarily switch to dockerhub for CI jobs (#1908))
       # Pull any updates to the upstream workspace (after restoring it from cache)
       AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src
       # Uninstall binaries that are duplicated in the .repos file