diff --git a/app/coffee/DockerRunner.coffee b/app/coffee/DockerRunner.coffee
index 635243f..f48e904 100644
--- a/app/coffee/DockerRunner.coffee
+++ b/app/coffee/DockerRunner.coffee
@@ -38,6 +38,10 @@ module.exports = DockerRunner =
 		if !image?
 			image = Settings.clsi.docker.image
 
+		if Settings.texliveImageNameOveride?
+			tag = image.split(":")[1]
+			image = "#{Settings.texliveImageNameOveride}:#{tag}"
+
 		options      = DockerRunner._getContainerOptions(command, image, volumes, timeout, environment)
 		fingerprint  = DockerRunner._fingerprintContainer(options)
 		options.name = name = "project-#{project_id}-#{fingerprint}"
diff --git a/app/coffee/RequestParser.coffee b/app/coffee/RequestParser.coffee
index d375e9e..7824616 100644
--- a/app/coffee/RequestParser.coffee
+++ b/app/coffee/RequestParser.coffee
@@ -69,7 +69,7 @@ module.exports = RequestParser =
 			sanitizedRootResourcePath = RequestParser._sanitizePath(rootResourcePath)
 			response.rootResourcePath = RequestParser._checkPath(sanitizedRootResourcePath)
 			
-			if settings.texliveImageNameOveride?
+			if settings.texliveImageNameOveride? and compile.options?.imageName?
 				tag = compile.options.imageName.split(":")[1]
 				response.imageName = "#{settings.texliveImageNameOveride}:#{tag}"