diff --git a/.gitpod.yml b/.gitpod.yml
index 877c16eefb5d6..dd58c4df72965 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -4,7 +4,7 @@
 # -------------------------------------------------------------------------
 
 # assuming we use dockerhub: name of the docker user, docker image, tag, e.g. https://hub.docker.com/r/pandas/pandas-gitpod/tags
-image: pythonpandas/pandas-gitpod:latest
+image: pandas/pandas-gitpod:latest
 tasks:
   - name: Prepare development environment
     init: |
diff --git a/gitpod/Dockerfile b/gitpod/Dockerfile
index 7581abe822816..a706824912174 100644
--- a/gitpod/Dockerfile
+++ b/gitpod/Dockerfile
@@ -13,7 +13,7 @@
 # are visible in the host and container.
 # The docker image is retrieved from the pandas dockerhub repository
 #
-# docker run --rm -it -v $(pwd):/home/pandas pythonpandas/pandas-dev:<image-tag>
+# docker run --rm -it -v $(pwd):/home/pandas pandas/pandas-dev:<image-tag>
 #
 # By default the container will activate the conda environment pandas-dev
 # which contains all the dependencies needed for pandas development
diff --git a/gitpod/gitpod.Dockerfile b/gitpod/gitpod.Dockerfile
index 108aae452aa3d..77268577e502b 100644
--- a/gitpod/gitpod.Dockerfile
+++ b/gitpod/gitpod.Dockerfile
@@ -1,7 +1,7 @@
 # Doing a local shallow clone - keeps the container secure
 # and much slimmer than using COPY directly or making a
 # remote clone
-ARG BASE_CONTAINER="pythonpandas/pandas-dev:latest"
+ARG BASE_CONTAINER="pandas/pandas-dev:latest"
 FROM gitpod/workspace-base:latest as clone
 
 # the clone should be deep enough for versioneer to work