diff --git a/ci-wrappers.sh b/ci-wrappers.sh
index 73273658df68844505d92586c3b7381992ffc217..64168469fff4964c65c5f2c5f1f513b12502cc49 100644
--- a/ci-wrappers.sh
+++ b/ci-wrappers.sh
@@ -296,7 +296,7 @@ github-runner-repo() (
   _check_variables GITHUBORG
   local workdir
   workdir=$(mktemp --directory "/tmp/ghrunner-${GITHUBORG}_${PWD##*/}_XXXXXX")
-  docker run -d --restart always --name ghrunner_$(echo "$workdir" | cut -d '-' -f 2) \
+  docker run -d --rm --restart always --name ghrunner_$(echo "$workdir" | cut -d '-' -f 2) \
     -e RUNNER_NAME_PREFIX="${GITHUBORG}-${PWD##*/}-runner" \
     -e ACCESS_TOKEN="${GITHUBTOKEN}" \
     -e RUNNER_SCOPE="repo" \
@@ -312,7 +312,7 @@ github-runner-org() (
   _check_variables GITHUBORG
   local workdir
   workdir=$(mktemp --directory "/tmp/ghrunner-${GITHUBORG}_XXXXXX")
-  docker run -d --restart always --name ghrunner_$(echo "$workdir" | cut -d '-' -f 2) \
+  docker run -d --rm --restart always --name ghrunner_$(echo "$workdir" | cut -d '-' -f 2) \
     -e RUNNER_NAME_PREFIX="${GITHUBORG}-${PWD##*/}-runner" \
     -e ACCESS_TOKEN="${GITHUBTOKEN}" \
     -e RUNNER_SCOPE="org" \
@@ -323,3 +323,7 @@ github-runner-org() (
     -v "${workdir}":"${workdir}" \
     myoung34/github-runner:latest
 )
+
+github-runner-remove-all() (
+ docker rm $(docker ps -a|grep myoung34/github-runner|cut -f 1 -d ' ')
+)