diff --git a/.github/workflows/autolabeller.yml b/.github/workflows/autolabeller.yml
index 22a1c604..4fb3dddd 100644
--- a/.github/workflows/autolabeller.yml
+++ b/.github/workflows/autolabeller.yml
@@ -10,6 +10,10 @@ on:
       - ready_for_review
       - edited
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   validate:
     name: Validate PR title
@@ -24,16 +28,16 @@ jobs:
         with:
             #TODO: fix all emojis
           types: |-
-            ✨ feat
-            🐛 fix
-            🔨 chore
-            📝 docs
-            ✅ test
-            🕵🏽‍♂️ security
-            🚮 remove
-            ♻️ revert
-            🏎️ perf
-            💫 style
+            feat
+            fix
+            chore
+            docs
+            test
+            security
+            remove
+            revert
+            perf
+            style
             deprecate
             refactor
             ci
@@ -41,6 +45,8 @@ jobs:
           requireScope: false
           # Ensures the subject start with an uppercase character.
           subjectPattern: ^([A-Z]).+$
+          headerPattern: '^\s*.*?\s(\w*)(?:\(([\w$.\-*/ ]*)\))?: (.*)$'
+          headerPatternCorrespondence: type, scope, subject
           subjectPatternError: |
             The subject "{subject}" found in the pull request title "{title}"
             didn't match the configured pattern. Please ensure that the subject
diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml
new file mode 100644
index 00000000..b8723fd7
--- /dev/null
+++ b/.github/workflows/relay.yml
@@ -0,0 +1,93 @@
+#Tabs not spaces, you moron :)
+
+name: CI for netris:relay
+
+on:
+    pull_request:
+        paths:
+            - "relay.Dockerfile"
+            - ".github/workflows/relay.yml"
+    schedule:
+        - cron: 0 0 * * * # At the end of everyday
+    push:
+        branches: [main]
+        paths:
+            - "relay.Dockerfile"
+            - ".github/workflows/relay.yml"
+        tags:
+            - v*.*.*
+    release:
+        types: [created]
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.event.pull_request.number || github.ref }}
+    cancel-in-progress: true
+
+env:
+    REGISTRY: ghcr.io
+    IMAGE_NAME: wanjohiryan/netris
+    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: relay.Dockerfile
+                context: ./
+                push: false
+                load: true
+                tags: netris:relay
+
+    build-docker-main:
+        name: Build image on merge
+        if: ${{github.ref == 'refs/heads/main'}}
+        runs-on: ubuntu-latest
+        permissions:
+            contents: read
+            packages: write
+        steps:
+            -
+              name: Checkout repo
+              uses: actions/checkout@v4
+            - 
+              name: Log into registry ${{ env.REGISTRY }}
+              uses: docker/login-action@v3
+              with:
+                registry: ${{ env.REGISTRY }}
+                username: ${{ github.actor }}
+                password: ${{ secrets.GITHUB_TOKEN }}
+            - 
+              name: Extract Container metadata
+              id: meta
+              uses: docker/metadata-action@v5
+              with:
+                images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/${{ env.BASE_TAG_PREFIX }}
+                #
+                #tag on release, and a nightly build for 'dev'
+                tags: |
+                  type=raw,value=nightly,enable={{is_default_branch}}
+                  type=ref,event=tag
+                  type=semver,pattern={{version}}
+                  type=semver,pattern={{major}}.{{minor}}
+                  type=semver,pattern={{major}}
+            - 
+              name: Build Docker image
+              uses: docker/build-push-action@v5
+              with:
+                file: relay.Dockerfile
+                context: ./
+                push: true
+                tags: ${{ steps.meta.outputs.tags }}
+                labels: ${{ steps.meta.outputs.labels }}
\ No newline at end of file
diff --git a/relay.Dockerfile b/relay.Dockerfile
new file mode 100644
index 00000000..af8ff2c4
--- /dev/null
+++ b/relay.Dockerfile
@@ -0,0 +1,23 @@
+#Git clone kixelated's moq-rs then build the moq-relay and push it to the final image
+#Copied from https://github.com/kixelated/moq-rs/blob/main/Dockerfile
+FROM rust:bookworm as builder
+
+WORKDIR /build
+
+RUN apt-get install -y git
+
+RUN git clone https://github.com/kixelated/moq-rs .
+
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/build/target \
+    cargo build --release && cp /build/target/release/moq-* /usr/local/cargo/bin
+
+FROM debian:bookworm-slim
+
+RUN apt-get update && \
+	apt-get install -y --no-install-recommends ca-certificates curl libssl3 && \
+	rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder /usr/local/cargo/bin/moq-relay /usr/local/bin
+
+CMD ["moq-relay"]
\ No newline at end of file