diff --git a/linux/alpine/act/runner/Dockerfile b/linux/alpine/act/runner/Dockerfile
index 88724a2..de8f1c8 100644
--- a/linux/alpine/act/runner/Dockerfile
+++ b/linux/alpine/act/runner/Dockerfile
@@ -4,26 +4,27 @@ FROM ${BASEIMAGE}:${TAG}
 
 SHELL [ "/bin/ash", "-o", "pipefail", "-l", "-c" ]
 
+ARG RUNNER=runner
+
 # > Create non-root user
 RUN set -euxo pipefail \
     && printf "Creating non-root user\n" \
-    && addgroup -S ${RUNNER_USER} -g 1000 && adduser -S ${RUNNER_USER} -u 1000 -G ${RUNNER_USER} -s /usr/bin/fish \
+    && addgroup -S ${RUNNER} -g 1000 && adduser -S ${RUNNER} -u 1000 -G ${RUNNER} -s /usr/bin/fish \
     && sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \
     && sed -i /etc/sudoers -re 's/^root.*/root ALL=(ALL:ALL) NOPASSWD: ALL/g' \
     && sed -i /etc/sudoers -re 's/^#includedir.*/## **Removed the include directive** ##"/g' \
-    && echo "${RUNNER_USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
-    && printf "Runner user: $(su - ${RUNNER_USER} -c id)\n" \
-    && printf "Created non-root user $(grep ${RUNNER_USER} /etc/passwd)\n" \
-    && echo "USER=${RUNNER_USER}" | tee -a /etc/environment \
-    && echo "RUNNER_USER=${RUNNER_USER}" | tee -a /etc/environment \
-    && echo "RUNNER_TEMP=/home/${RUNNER_USER}/work/_temp" | tee -a /etc/environment \
-    && mkdir -p "/home/${RUNNER_USER}/work/_temp" \
-    && chown -R ${RUNNER_USER}:${RUNNER_USER} "/home/${RUNNER_USER}/work" \
-    && mkdir -p "/home/${RUNNER_USER}/.ssh" \
-    && chmod 700 "/home/${RUNNER_USER}/.ssh" \
-    && ssh-keyscan github.com | tee "/home/${RUNNER_USER}/.ssh/known_hosts" \
-    && chmod 644 "/home/${RUNNER_USER}/.ssh/known_hosts" \
-    && chown -R ${RUNNER_USER}:${RUNNER_USER} "/home/${RUNNER_USER}/.ssh"
+    && echo "${RUNNER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
+    && printf "Runner user: $(su - ${RUNNER} -c id)\n" \
+    && printf "Created non-root user $(grep ${RUNNER} /etc/passwd)\n" \
+    && sed -i /etc/environment -e "s/USER=root/USER=${RUNNER}/g" \
+    && echo "RUNNER_TEMP=/home/${RUNNER}/work/_temp" | tee -a /etc/environment \
+    && mkdir -p "/home/${RUNNER}/work/_temp" \
+    && chown -R ${RUNNER}:${RUNNER} "/home/${RUNNER}/work" \
+    && mkdir -p "/home/${RUNNER}/.ssh" \
+    && chmod 700 "/home/${RUNNER}/.ssh" \
+    && ssh-keyscan github.com | tee "/home/${RUNNER}/.ssh/known_hosts" \
+    && chmod 644 "/home/${RUNNER}/.ssh/known_hosts" \
+    && chown -R ${RUNNER}:${RUNNER} "/home/${RUNNER}/.ssh"
 
 ARG BUILD_TAG_VERSION="master"
 ARG BUILD_TAG="runner"