diff --git a/.github/actions/Dockerfile b/.github/actions/Dockerfile
index 2647585..78ef159 100644
--- a/.github/actions/Dockerfile
+++ b/.github/actions/Dockerfile
@@ -4,6 +4,5 @@ COPY entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 
 # NOTE: When building locally (from this directory):
-# pushd ../../../qmk_base_container && docker build -t "qmkfm/base_container:latest" . ; popd
-# pushd ../../../qmk_cli && docker build -t "qmkfm/qmk_cli:latest" . ; popd
+# docker pull docker.io/qmkfm/qmk_cli
 # docker build -t "nullbitsco/firmware:latest" . && docker run nullbitsco/firmware
diff --git a/.github/actions/entrypoint.sh b/.github/actions/entrypoint.sh
index e049bf9..6376fa3 100755
--- a/.github/actions/entrypoint.sh
+++ b/.github/actions/entrypoint.sh
@@ -36,13 +36,20 @@ cd holly || exit 1
 append_githash_info
 cd ../
 
+# Set up QMK
 qmk setup -y
 
+# Add VIA userspace (must be done after QMK setup)
+cd / || exit 1
+git clone https://github.com/the-via/qmk_userspace_via
+qmk config user.overlay_dir="$(realpath qmk_userspace_via)"
+cd -
+
 # Compile upstream boards first
 qmk mass-compile -j "$(nproc)" \
     nullbitsco/nibble:all nullbitsco/tidbit:all \
     nullbitsco/scramble/v1:all nullbitsco/scramble/v2:all \
-    nullbitsco/snap:all nullbitsco/holly:all
+    nullbitsco/snap:all nullbitsco/holly:via
 
 # Checkout nullbits rp2040 repo
 git config advice.detachedHead false
diff --git a/.github/workflows/build-fw.yml b/.github/workflows/build-fw.yml
index 9312fa2..aab7557 100644
--- a/.github/workflows/build-fw.yml
+++ b/.github/workflows/build-fw.yml
@@ -16,12 +16,12 @@ jobs:
     name: Build firmware
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build in docker container
         id: docker_build
         uses: ./.github/actions/
       - name: Archive artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: precompiled-firmware-files
           path: |
diff --git a/.github/workflows/release-fw.yml b/.github/workflows/release-fw.yml
index 1532c43..f04d6c2 100644
--- a/.github/workflows/release-fw.yml
+++ b/.github/workflows/release-fw.yml
@@ -13,12 +13,12 @@ jobs:
     name: Build firmware
     steps:
       - name: Check out repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Build in docker container
         id: docker_build
         uses: ./.github/actions/
       - name: Archive artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: precompiled-firmware-files
           path: |