diff --git a/app/coffee/DockerRunner.coffee b/app/coffee/DockerRunner.coffee
index f48e904..69a3df9 100644
--- a/app/coffee/DockerRunner.coffee
+++ b/app/coffee/DockerRunner.coffee
@@ -39,8 +39,8 @@ module.exports = DockerRunner =
 			image = Settings.clsi.docker.image
 
 		if Settings.texliveImageNameOveride?
-			tag = image.split(":")[1]
-			image = "#{Settings.texliveImageNameOveride}:#{tag}"
+			img = image.split("/")
+			image = "#{Settings.texliveImageNameOveride}/#{img[2]}"
 
 		options      = DockerRunner._getContainerOptions(command, image, volumes, timeout, environment)
 		fingerprint  = DockerRunner._fingerprintContainer(options)
diff --git a/test/unit/coffee/DockerRunnerTests.coffee b/test/unit/coffee/DockerRunnerTests.coffee
index 456f52b..307ffde 100644
--- a/test/unit/coffee/DockerRunnerTests.coffee
+++ b/test/unit/coffee/DockerRunnerTests.coffee
@@ -138,13 +138,13 @@ describe "DockerRunner", ->
 		
 		describe "with image override", ->
 			beforeEach ->
-				@Settings.texliveImageNameOveride = "overrideimage/here"
+				@Settings.texliveImageNameOveride = "overrideimage.com/something"
 				@DockerRunner._runAndWaitForContainer = sinon.stub().callsArgWith(3, null, @output = "mock-output")
 				@DockerRunner.run @project_id, @command, @directory, @image, @timeout, @env, @callback
 
 			it "should use the override and keep the tag", ->
 				image = @DockerRunner._getContainerOptions.args[0][1]
-				image.should.equal "overrideimage/here:2016.2"
+				image.should.equal "overrideimage.com/something/image:2016.2"
 
 	describe "_runAndWaitForContainer", ->
 		beforeEach ->