diff --git a/.github/workflows/ci-sage.yml b/.github/workflows/ci-sage.yml
index 8cb9e3827f..0530fb0bb9 100644
--- a/.github/workflows/ci-sage.yml
+++ b/.github/workflows/ci-sage.yml
@@ -73,15 +73,13 @@ jobs:
           && echo "sage-package create ${{ env.SPKG }} --version git --tarball ${{ env.SPKG }}-git.tar.gz --type=standard" > upstream/update-pkgs.sh \
           && if [ -n "${{ env.REMOVE_PATCHES }}" ]; then echo "(cd ../build/pkgs/${{ env.SPKG }}/patches && rm -f ${{ env.REMOVE_PATCHES }}; :)" >> upstream/update-pkgs.sh; fi \
           && ls -l upstream/
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           path: upstream
           name: upstream
 
   linux:
-    # https://github.com/sagemath/sage/blob/develop/.github/workflows/docker.yml
-    # Use branch of ticket https://trac.sagemath.org/ticket/33288
-    uses: sagemath/sagetrac-mirror/.github/workflows/docker.yml@u/mkoeppe/setuptools_ci_target
+    uses: sagemath/sage/.github/workflows/docker.yml@develop
     with:
       # Sage distribution packages to build
       targets: setuptools pyzmq
@@ -89,11 +87,6 @@ jobs:
       sage_repo: sagemath/sage
       sage_ref: develop
       upstream_artifact: upstream
-      sage_trac_git: https://github.com/sagemath/sagetrac-mirror.git
-      # Test with the branch from https://trac.sagemath.org/ticket/33288
-      # This may provide hotfixes for the CI that have not been merged into
-      # the sage develop branch yet.
-      sage_trac_ticket: 33288
       # We prefix the image name with the SPKG name ("setuptools-") to avoid the error
       # 'Package "sage-docker-..." is already associated with another repository.'
       docker_push_repository: ghcr.io/${{ github.repository }}/setuptools-