diff --git a/Create-Container.ps1 b/Create-Container.ps1
new file mode 100644
index 0000000..22f9432
--- /dev/null
+++ b/Create-Container.ps1
@@ -0,0 +1,15 @@
+$lines=(docker container ls --all -f "name=c_quick_bench")
+
+$ok_msg="You can run the container: docker start c_quick_bench"
+
+if($lines.Length -eq 2) {
+    Write-Host $ok_msg
+} else {
+    Write-Host "Creating c_quick_bench"
+    docker create -v "$(pwd)/data:/data" -v "//var/run/docker.sock:/var/run/docker.sock" --env-file "$(pwd)\local.env" -e "BENCH_ROOT=$(pwd)" -p 4000:4000 --name c_quick_bench -it fredtingaud/bench-runner ./start-quick-bench
+    if($?) {
+        Write-Host $ok_msg
+    } else {
+        Write-Host "Could not create container."
+    }
+}
diff --git a/build-bench b/build-bench
index 5674196..9a09916 100755
--- a/build-bench
+++ b/build-bench
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run -p 4000:4000 -v $PWD/data:/data -v /var/run/docker.sock:/var/run/docker.sock --env-file local.env -e BENCH_ROOT=$PWD -it fredtingaud/bench-runner ./start-build-bench
+docker run --rm -p 4000:4000 -v $PWD/data:/data -v /var/run/docker.sock:/var/run/docker.sock --env-file local.env -e BENCH_ROOT=$PWD -it fredtingaud/bench-runner ./start-build-bench
diff --git a/quick-bench b/quick-bench
index 8fa9e42..f0a8a06 100755
--- a/quick-bench
+++ b/quick-bench
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run -p 4000:4000 -v $PWD/data:/data -v /var/run/docker.sock:/var/run/docker.sock --env-file local.env -e BENCH_ROOT=$PWD -it fredtingaud/bench-runner ./start-quick-bench
+docker run --rm -p 4000:4000 -v $PWD/data:/data -v /var/run/docker.sock:/var/run/docker.sock --env-file local.env -e BENCH_ROOT=$PWD -it fredtingaud/bench-runner ./start-quick-bench