diff --git a/deploy/CMakeLists.txt b/deploy/CMakeLists.txt
index 071ae9b200fb8f6e440330f157bd8d6afa5c1502..739f856166a7cac9a459b8d483ab19cf0080a0f0 100644
--- a/deploy/CMakeLists.txt
+++ b/deploy/CMakeLists.txt
@@ -4,6 +4,7 @@ else()
     SET (NOMAD_INSTALL ${CMAKE_INSTALL_PREFIX}/nomad_jobs)
 endif()
 
+set (ASAPO_DOCKER_REPOSITORY yakser)
 configure_files(${CMAKE_CURRENT_SOURCE_DIR}/asapo_services ${CMAKE_CURRENT_BINARY_DIR}/asapo_services)
 configure_files(${CMAKE_CURRENT_SOURCE_DIR}/asapo_services/scripts ${CMAKE_CURRENT_BINARY_DIR}/asapo_services/scripts)
 
diff --git a/deploy/asapo_orchestration_docker/Dockerfile.template b/deploy/asapo_orchestration_docker/Dockerfile
similarity index 64%
rename from deploy/asapo_orchestration_docker/Dockerfile.template
rename to deploy/asapo_orchestration_docker/Dockerfile
index a3edfe710adba7d53f5b24e6d80f9e100c046364..87e56865ceaab1f03cedc23c06b4ef18a52b0e2b 100644
--- a/deploy/asapo_orchestration_docker/Dockerfile.template
+++ b/deploy/asapo_orchestration_docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM $ASAPO_DOCKER_REPOSITORY/asapo-nomad-cluster
+FROM yakser/asapo-nomad-cluster
 
 MAINTAINER DESY IT
 
diff --git a/deploy/asapo_services/Dockerfile.template b/deploy/asapo_services/Dockerfile.in
similarity index 72%
rename from deploy/asapo_services/Dockerfile.template
rename to deploy/asapo_services/Dockerfile.in
index 8a01f49f14073b06cf2afa2bed4983776fcb90f7..cc8861862fd3dc5fd6b78c734c36b21be9d8ddf9 100644
--- a/deploy/asapo_services/Dockerfile.template
+++ b/deploy/asapo_services/Dockerfile.in
@@ -1,4 +1,4 @@
-FROM $ASAPO_DOCKER_REPOSITORY/asapo-nomad-cluster
+FROM @ASAPO_DOCKER_REPOSITORY@/asapo-nomad-cluster
 
 MAINTAINER DESY IT
 
diff --git a/monitoring/monitoring_server/CMakeLists.txt b/monitoring/monitoring_server/CMakeLists.txt
index 4763bb434b6d5dde0e264367b21b9d9fcf4d6a5b..7f0ef4ed1b7b2e688af737c923d7b48313a518b6 100644
--- a/monitoring/monitoring_server/CMakeLists.txt
+++ b/monitoring/monitoring_server/CMakeLists.txt
@@ -6,8 +6,6 @@ ELSE()
     set (exe_name "${TARGET_NAME}")
 ENDIF()
 
-configure_file(docker/Dockerfile docker/Dockerfile COPYONLY)
-
 add_custom_target(${TARGET_NAME} ALL
     COMMAND go build ${GO_OPTS} -o ${CMAKE_CURRENT_BINARY_DIR}/${exe_name} main/main.go
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/asapo_monitoring_server