diff --git a/tox.ini b/tox.ini
index 31c9441b0b6..1de5af78246 100644
--- a/tox.ini
+++ b/tox.ini
@@ -148,7 +148,7 @@ passenv =
     docker:       DOCKER_PUSH_REPOSITORY
                   # If set, we symlink this file into {envdir}/.docker/; this can be used for providing credentials for pushing
     docker:       DOCKER_CONFIG_FILE
-    docker-incremental: FROM_DOCKER_REPO
+    docker-incremental: FROM_DOCKER_REPOSITORY
     docker-incremental: FROM_DOCKER_TARGET
     docker-incremental: FROM_DOCKER_TAG
     local:        MAKE
@@ -457,7 +457,7 @@ setenv =
     # Resulting full image:tag name
     #
     docker:             FULL_BASE_IMAGE_AND_TAG={env:ARCH_IMAGE_PREFIX:}{env:BASE_IMAGE}{env:ARCH_IMAGE_SUFFIX:}:{env:ARCH_TAG_PREFIX:}{env:BASE_TAG}{env:ARCH_TAG_SUFFIX:}
-    docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPO:ghcr.io/sagemath/sage/sage-}$(echo {envname} | sed 's/-incremental//')-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
+    docker-incremental: FULL_BASE_IMAGE_AND_TAG={env:FROM_DOCKER_REPOSITORY:ghcr.io/sagemath/sage/}sage-$(echo {envname} | sed 's/-incremental//')-{env:FROM_DOCKER_TARGET:with-targets}:{env:FROM_DOCKER_TAG:dev}
     docker-incremental: SYSTEM=none
     #
     docker-nobootstrap: BOOTSTRAP=./bootstrap -D