diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml
new file mode 100644
index 00000000..c6b07abb
--- /dev/null
+++ b/.github/workflows/relay.yml
@@ -0,0 +1,46 @@
+#Tabs not spaces, you moron :)
+
+name: Build nestri:relay
+on:
+    pull_request:
+        paths:
+            - "containers/relay.Containerfile"
+            - ".github/workflows/relay.yml"
+    schedule:
+        - cron: 0 0 * * * # At the end of everyday
+    push:
+        branches: [main]
+        paths:
+            - "containers/relay.Containerfile"
+            - ".github/workflows/relay.yml"
+        tags:
+            - v*.*.*
+    release:
+        types: [created]
+
+env:
+    REGISTRY: ghcr.io
+    IMAGE_NAME: nestrilabs/nestri
+    BASE_TAG_PREFIX: relay
+
+jobs:
+    build-docker-pr:
+        name: Build image on PR
+        runs-on: ubuntu-latest
+        if: ${{ github.event_name == 'pull_request' }}
+        steps:
+            -
+              name: Checkout repo
+              uses: actions/checkout@v4
+            - 
+              name: Setup Docker Buildx
+              uses: docker/setup-buildx-action@v3
+            - 
+              name: Build Docker image
+              uses: docker/build-push-action@v5
+              with:
+                file: containers/relay.Containerfile
+                context: ./
+                push: false
+                load: true
+                tags: nestri:relay
\ No newline at end of file
diff --git a/containers/runner.Containerfile b/containers/runner.Containerfile
index 0f70edcd..5de1e13c 100644
--- a/containers/runner.Containerfile
+++ b/containers/runner.Containerfile
@@ -44,7 +44,7 @@ RUN mkdir plugin && \
 
 
 #******************************************************************************
-#                                                                       runtime
+#                                                                                                                             runtime
 #******************************************************************************
 FROM ${BASE_IMAGE} AS runtime
 
@@ -69,14 +69,14 @@ RUN pacman -Syu --noconfirm --needed \
 ENV USER="nestri" \
 	UID=99 \
 	GID=100 \
-	USER_PASSWORD="nestri1234"
+	USER_PWD="nestri1234"
 
 RUN mkdir -p /home/${USER} && \
     groupadd -g ${GID} ${USER} && \
     useradd -d /home/${USER} -u ${UID} -g ${GID} -s /bin/bash ${USER} && \
     chown -R ${USER}:${USER} /home/${USER} && \
     echo "${USER} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
-    echo "${USER}:${USER_PASSWORD}" | chpasswd
+    echo "${USER}:${USER_PWD}" | chpasswd
 
 # Run directory #
 RUN mkdir -p /run/user/${UID} && \