diff --git a/hack/tfw.sh b/hack/tfw.sh
index 67fba1e..5d11507 100755
--- a/hack/tfw.sh
+++ b/hack/tfw.sh
@@ -14,7 +14,7 @@ BASEIMAGE_PATH="${TAO_PATH}/${BASEIMAGE_REPO}"
 TEST_PATH="${TAO_PATH}/${TEST_REPO}"
 FRONTEND_PATH="${TAO_PATH}/${FRONTEND_REPO}"
 
-BASEIMAGE_NAME="${BASEIMAGE_NAME:-avatao/tutorial-framework}"
+BASEIMAGE_NAME="${BASEIMAGE_NAME:-eu.gcr.io/avatao-challengestore/tutorial-framework}"
 IMAGE_NAME="${IMAGE_NAME:-test-tutorial-framework}"
 TEST_PORT="${TEST_PORT:-8888}"
 AVATAO_SECRET="${AVATAO_SECRET:-secret}"
diff --git a/solvable/Dockerfile b/solvable/Dockerfile
index f2f8e3b..bec1d00 100644
--- a/solvable/Dockerfile
+++ b/solvable/Dockerfile
@@ -1,4 +1,4 @@
-FROM avatao/tutorial-framework
+FROM eu.gcr.io/avatao-challengestore/tutorial-framework
 
 ENV TFW_APP_DIR="/srv/app"                          \
     TFW_LOGIN_APP_DIR="/tmp/source_code_server"     \