diff --git a/.github/workflows/runner.yml b/.github/workflows/runner.yml
new file mode 100644
index 00000000..279a9d94
--- /dev/null
+++ b/.github/workflows/runner.yml
@@ -0,0 +1,47 @@
+#Tabs not spaces, you moron :)
+
+name: Build nestri:runner
+
+on:
+    pull_request:
+        paths:
+            - "containers/runner.Containerfile"
+            - ".github/workflows/runner.yml"
+    schedule:
+        - cron: 0 0 * * * # At the end of everyday
+    push:
+        branches: [main]
+        paths:
+            - "containers/runner.Containerfile"
+            - ".github/workflows/runner.yml"
+        tags:
+            - v*.*.*
+    release:
+        types: [created]
+
+env:
+    REGISTRY: ghcr.io
+    IMAGE_NAME: nestrilabs/nestri
+    BASE_TAG_PREFIX: runner
+
+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/runner.Containerfile
+                context: ./
+                push: false
+                load: true
+                tags: nestri:runner
\ No newline at end of file
diff --git a/containers/Containerfile.master b/containers/master.Containerfile
similarity index 100%
rename from containers/Containerfile.master
rename to containers/master.Containerfile
diff --git a/containers/Containerfile.relay b/containers/relay.Containerfile
similarity index 100%
rename from containers/Containerfile.relay
rename to containers/relay.Containerfile
diff --git a/containers/Containerfile.runner b/containers/runner.Containerfile
similarity index 100%
rename from containers/Containerfile.runner
rename to containers/runner.Containerfile