diff --git a/services/clsi/config/settings.defaults.js b/services/clsi/config/settings.defaults.js
index b1b6e5352b..6135118bcc 100644
--- a/services/clsi/config/settings.defaults.js
+++ b/services/clsi/config/settings.defaults.js
@@ -103,7 +103,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 e236ff44f8..63e7395755 100644
--- a/services/web/app/src/Features/Project/ProjectController.mjs
+++ b/services/web/app/src/Features/Project/ProjectController.mjs
@@ -531,6 +531,7 @@ const _ProjectController = {
           collaberator_refs: 1, // used for link sharing analytics
           pendingEditor_refs: 1, // used for link sharing analytics
           reviewer_refs: 1,
+          imageName: 1,
         }),
         userIsMemberOfGroupSubscription: sessionUser
           ? (async () =>
@@ -606,6 +607,8 @@ const _ProjectController = {
       )
       const imageNames = ProjectHelper.getAllowedImagesForUser(user)
 
+      if (!project.imageName) await EditorController.promises.setImageName(projectId, Settings.currentImageName)
+
       const privilegeLevel =
         await AuthorizationManager.promises.getPrivilegeLevelForProject(
           userId,