diff --git a/services/clsi/config/settings.defaults.cjs b/services/clsi/config/settings.defaults.cjs
index 8ab52e25aa..54e787f3d7 100644
--- a/services/clsi/config/settings.defaults.cjs
+++ b/services/clsi/config/settings.defaults.cjs
@@ -140,7 +140,7 @@ if ((process.env.DOCKER_RUNNER || process.env.SANDBOXED_COMPILES) === 'true') {
       image:
         process.env.TEXLIVE_IMAGE ||
         process.env.TEX_LIVE_DOCKER_IMAGE ||
-        'quay.io/sharelatex/texlive-full:2017.1',
+        process.env.ALL_TEX_LIVE_DOCKER_IMAGES.split(',')[0].trim(),
       env: {
         HOME: '/tmp',
         CLSI: 1,
diff --git a/services/web/app/src/Features/Project/ProjectController.mjs b/services/web/app/src/Features/Project/ProjectController.mjs
index 833643716f..ad80d3fd0a 100644
--- a/services/web/app/src/Features/Project/ProjectController.mjs
+++ b/services/web/app/src/Features/Project/ProjectController.mjs
@@ -565,6 +565,7 @@ const _ProjectController = {
           brandVariationId: 1,
           overleaf: 1,
           tokens: 1,
+          imageName: 1,
         }),
         userIsMemberOfGroupSubscription: sessionUser
           ? (async () =>
@@ -657,6 +658,8 @@ const _ProjectController = {
         user
       )
 
+      if (!project.imageName) await EditorController.promises.setImageName(projectId, Settings.currentImageName)
+
       const privilegeLevel =
         await AuthorizationManager.promises.getPrivilegeLevelForProject(
           userId,