diff --git a/server-ce/config/settings.js b/server-ce/config/settings.js
index dc8e747804..f8ce1db846 100644
--- a/server-ce/config/settings.js
+++ b/server-ce/config/settings.js
@@ -496,13 +496,7 @@ if (process.env.SANDBOXED_COMPILES === 'true') {
     dockerRunner: true,
     docker: {
       image: process.env.TEX_LIVE_DOCKER_IMAGE,
-      env: {
-        HOME: '/tmp',
-        PATH:
-          process.env.COMPILER_PATH ||
-          '/usr/local/bin:/usr/bin:/bin',
-      },
-      user: 'www-data',
+      user:  process.env.TEX_LIVE_DOCKER_USER || 'www-data',
     }
   }
 
diff --git a/services/clsi/app/js/DockerRunner.js b/services/clsi/app/js/DockerRunner.js
index 77622c46a2..af907f6241 100644
--- a/services/clsi/app/js/DockerRunner.js
+++ b/services/clsi/app/js/DockerRunner.js
@@ -229,10 +229,9 @@ const DockerRunner = {
       }
     }
     // set the path based on the image year
-    const match = image.match(/:([0-9]+)\.[0-9]+/)
+    const match = image.match(/:([0-9]+)\.[0-9]+|:TL([0-9]+)/)
     // the rolling build does not follow our <year>.<version>.<patch> convention
-    const year = match ? match[1] : 'rolling'
-
+    const year = match ? match[1] || match[2] : 'rolling'
     env.PATH = `/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/texlive/${year}/bin/x86_64-linux/`
     const options = {
       Cmd: command,
diff --git a/services/web/app/src/Features/Project/ProjectOptionsHandler.js b/services/web/app/src/Features/Project/ProjectOptionsHandler.js
index c0c11c396c..5d0001bcf4 100644
--- a/services/web/app/src/Features/Project/ProjectOptionsHandler.js
+++ b/services/web/app/src/Features/Project/ProjectOptionsHandler.js
@@ -24,7 +24,6 @@ const ProjectOptionsHandler = {
     if (!imageName || !Array.isArray(settings.allowedImageNames)) {
       return
     }
-    imageName = imageName.toLowerCase()
     const isAllowed = settings.allowedImageNames.find(
       allowed => imageName === allowed.imageName
     )
@@ -32,7 +31,7 @@ const ProjectOptionsHandler = {
       throw new Error(`invalid imageName: ${imageName}`)
     }
     const conditions = { _id: projectId }
-    const update = { imageName: settings.imageRoot + '/' + imageName }
+    const update = { imageName: imageName }
     return Project.updateOne(conditions, update, {})
   },
 
diff --git a/services/web/config/settings.defaults.js b/services/web/config/settings.defaults.js
index c6e354628a..b1ba222c1b 100644
--- a/services/web/config/settings.defaults.js
+++ b/services/web/config/settings.defaults.js
@@ -1073,6 +1073,15 @@ module.exports = {
   managedUsers: {
     enabled: false,
   },
+
+  allowedImageNames: process.env.SANDBOXED_COMPILES === 'true'
+    ? parseTextExtensions(process.env.ALL_TEX_LIVE_DOCKER_IMAGES)
+        .map((imageName, index) => ({
+          imageName,
+          imageDesc: parseTextExtensions(process.env.ALL_TEX_LIVE_DOCKER_IMAGE_NAMES)[index]
+            || imageName.split(':')[1],
+        }))
+    : undefined,
 }
 
 module.exports.mergeWith = function (overrides) {