diff --git a/runner/Dockerfile b/runner/Dockerfile
index 720b41ec..1913a491 100644
--- a/runner/Dockerfile
+++ b/runner/Dockerfile
@@ -116,6 +116,9 @@ COPY entrypoint.sh /
 ENV PATH="${PATH}:${HOME}/.local/bin"
 ENV ImageOS=ubuntu20
 
+RUN echo "PATH=${PATH}" > /etc/environment \
+    && echo "ImageOS=${ImageOS}" >> /etc/environment
+
 USER runner
 
 ENTRYPOINT ["/usr/local/bin/dumb-init", "--"]
diff --git a/runner/Dockerfile.dindrunner b/runner/Dockerfile.dindrunner
index 00ad5e1f..c1c06e49 100644
--- a/runner/Dockerfile.dindrunner
+++ b/runner/Dockerfile.dindrunner
@@ -118,6 +118,9 @@ VOLUME /var/lib/docker
 ENV PATH="${PATH}:${HOME}/.local/bin"
 ENV ImageOS=ubuntu20
 
+RUN echo "PATH=${PATH}" > /etc/environment \
+    && echo "ImageOS=${ImageOS}" >> /etc/environment
+
 # No group definition, as that makes it harder to run docker.
 USER runner