diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile
index 727b9d63..93d7b550 100644
--- a/scripts/docker/Makefile
+++ b/scripts/docker/Makefile
@@ -1,7 +1,7 @@
 build-all:
-	docker build -t danceos/fail-base fail-base --build-arg CACHE_DATE="$(shell date)"
-	docker build -t danceos/fail-generic-tracing fail-generic-tracing
-	docker build -t danceos/fail-demo fail-demo --build-arg CACHE_DATE="$(shell date)"
+	docker build -t fail-base fail-base --build-arg CACHE_DATE="$(shell date)"
+	docker build -t fail-generic-tracing fail-generic-tracing
+	docker build -t fail-demo fail-demo --build-arg CACHE_DATE="$(shell date)"
 
 run-all: .compose ssh
 
diff --git a/scripts/docker/docker-compose.yaml b/scripts/docker/docker-compose.yaml
index c058b5e7..e8283021 100644
--- a/scripts/docker/docker-compose.yaml
+++ b/scripts/docker/docker-compose.yaml
@@ -13,7 +13,7 @@ services:
       - fail-network
 
   fail-demo:
-    image: danceos/fail-demo
+    image: fail-demo
     container_name: fail-demo
     ports:
       - "5000:5000" # Result Browser
diff --git a/scripts/docker/fail-demo/Dockerfile b/scripts/docker/fail-demo/Dockerfile
index b18e12d7..d1127dd6 100644
--- a/scripts/docker/fail-demo/Dockerfile
+++ b/scripts/docker/fail-demo/Dockerfile
@@ -3,7 +3,7 @@
 # generic-tracing experiment was already built and the binaries are in
 # place (~fail/bin/*)
 
-FROM danceos/fail-generic-tracing
+FROM fail-generic-tracing
 
 LABEL org.opencontainers.image.authors="Christian Dietrich <stettberger@dokucode.de>"
 
diff --git a/scripts/docker/fail-generic-tracing/Dockerfile b/scripts/docker/fail-generic-tracing/Dockerfile
index 0f307b90..a996d44e 100644
--- a/scripts/docker/fail-generic-tracing/Dockerfile
+++ b/scripts/docker/fail-generic-tracing/Dockerfile
@@ -1,6 +1,6 @@
 # Inherit from docker container that has the fail source code prepared,
 # including all tools which are needed to build FAIL*
-FROM danceos/fail-base
+FROM fail-base
 
 LABEL org.opencontainers.image.authors="Christian Dietrich <stettberger@dokucode.de>"