diff --git a/Makefile b/Makefile
index 23e4828..da9b45a 100644
--- a/Makefile
+++ b/Makefile
@@ -32,11 +32,12 @@ help:
 	@echo "	ARCH=${ARCH}"
 
 docker:
-	@echo Starting Docker with ARCH=$(ARCH)
-	@echo "ARCH=${ARCH}" > .env.${ARCH}
-	docker-compose --env-file .env.${ARCH}  up -d
-	docker-compose --env-file .env.${ARCH}  run --entrypoint bash shell
+	@echo Starting Docker
+	docker-compose up -d
+	@make shell
 
+shell:
+	docker-compose exec -e debian_chroot=${ARCH} -e ARCH=${ARCH} shell bash
 
 ################################################################
 # Download
diff --git a/docker-compose.yml b/docker-compose.yml
index 7013690..3ede801 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,14 +14,16 @@ services:
 
   shell:
     image: danceos/fail-ci-build
+    container_name: shell
     stdin_open: true # docker run -i
     restart: "no"
     tty: true        # docker run -t
-    entrypoint: ["echo", "Service foo disabled"]
+    entrypoint: ["bash", "-c", "while :; do :; done & kill -STOP $$! && wait $$!"]
     links:
       - db
-    environment:
-      - ARCH=${ARCH}
+    working_dir: /home/fail/fail-targets
     volumes:
-      - .:/home/fail/fail
+      - .:/home/fail/fail-targets
+      - ./fail:/home/fail/fail
+