diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index edd6037a590c060dbe99bd95aed965695be82322..2eed8e7cbc040550af44864f0b7b23e2b3499f81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/pygobject/main:v22
+image: registry.gitlab.gnome.org/gnome/pygobject/main:v23
 
 stages:
   - build_and_test
@@ -111,10 +111,10 @@ python3.12:
     TEST_GTK_VERSION: "3.0"
   <<: *defaults
 
-pypy3.9:
+pypy3:
   allow_failure: true
   variables:
-    PYTHON_VERSION: "pypy3.9"
+    PYTHON_VERSION: "pypy3"
     TEST_GTK_VERSION: "3.0"
   <<: *defaults
 
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 4963d5b955086fd0050baa1619fafa4b70825eb1..4e1ce2e6a2066dc45c532d6f005bf2939884a7d8 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -3,6 +3,7 @@ FROM ubuntu:jammy
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y \
+    software-properties-common \
     build-essential \
     ccache \
     curl \
@@ -30,6 +31,11 @@ RUN apt-get update && apt-get install -y \
     xvfb \
     && rm -rf /var/lib/apt/lists/*
 
+RUN add-apt-repository -y ppa:pypy/ppa \
+    && apt-get update \
+    && apt-get install -y pypy3 pypy3-dev \
+    && rm -rf /var/lib/apt/lists/*
+
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
@@ -48,7 +54,11 @@ ENV PYTHON_CONFIGURE_OPTS="--enable-shared"
 ENV PYENV_GIT_TAG v2.3.31
 RUN curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
 
-RUN pyenv install pypy3.9
+# Register the pypy3 system installation
+RUN mkdir -p "${PYENV_ROOT}/versions/pypy3-system/bin/"
+RUN sudo ln -s /usr/bin/pypy3 "${PYENV_ROOT}/versions/pypy3-system/bin/python"
+RUN pyenv rehash
+
 RUN pyenv install --debug 3.8
 RUN pyenv install --debug 3.9
 RUN pyenv install --debug 3.10
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index ebff013c145e0930e122094216845d764c56b042..241049795788c02c968ba24126803819067fd225 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v22"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v23"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .
diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh
index 5d3dc2a8bec7d364b430bc5bda67ab9d3178ea4c..e06c16e6be3952d57cbbd772c7135da2906a3f93 100755
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -17,6 +17,7 @@ export G_SLICE="debug-blocks"
 export COVERAGE_FILE="${COV_DIR}/.coverage.${COV_KEY}"
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+export PATH="$PATH:$(python -m site --user-base)/bin"
 
 # https://docs.python.org/3/using/cmdline.html#envvar-PYTHONDEVMODE
 export PYTHONDEVMODE=1