diff --git a/base/register.sh b/base/register.sh
index 0517204..4001dfc 100755
--- a/base/register.sh
+++ b/base/register.sh
@@ -91,7 +91,7 @@ fi
 if [ -n "${RUNNER_TOKEN:-}" ]; then
     set -x
     ./config.sh \
-        --name $(hostname) \
+        --name ${RUNNER_NAME:-$(hostname)} \
         --token ${RUNNER_TOKEN} \
         --url ${registration_url} \
         --work ${RUNNER_WORKDIR} \
diff --git a/docs/runner-token.md b/docs/runner-token.md
index db0ae2e..cbb2caa 100644
--- a/docs/runner-token.md
+++ b/docs/runner-token.md
@@ -15,6 +15,7 @@ podman run \
     --env GITHUB_OWNER=redhat-actions \
     --env GITHUB_REPOSITORY=openshift-actions-runner \
     --env RUNNER_LABELS="local,podman" \
+    --env RUNNER_NAME=redhat-actions-runner-0
     --rm -v runner:/persistence \
     --entrypoint='' \
     quay.io/redhat-github-actions/runner:latest \