diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 03fe2ae..f783786 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -19,16 +19,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # Build native on both ubuntu 22.04
+          # Build native on both ubuntu 22.04 and 24.04
           - os: ubuntu-22.04
+          - os: ubuntu-24.04
 
     runs-on: ${{ matrix.os }}
     steps:
       # Checkout code
       - uses: actions/checkout@v3
 
-      # Perform Phoenix Pro installation process
-      - name: Add Phoenix Pro to local apt
+      # Perform Phoenix 6 installation process
+      - name: Add Phoenix 6 to local apt
         run: |
           sudo curl -s --compressed -o /usr/share/keyrings/ctr-pubkey.gpg "https://deb.ctr-electronics.com/ctr-pubkey.gpg"
           sudo curl -s --compressed -o /etc/apt/sources.list.d/ctr2026.list "https://deb.ctr-electronics.com/ctr2026.list"
@@ -56,19 +57,19 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # 64-bit arm on bullseye
-          - arch: aarch64
-            distro: bullseye
           # 64-bit arm on bookworm
+          - arch: aarch64
+            distro: bookworm
+          # 64-bit arm on trixie
           - arch: none
             distro: none
-            base_image: arm64v8/debian:bookworm
-          # 64-bit arm on ubuntu 20.04
-          - arch: aarch64
-            distro: ubuntu20.04
+            base_image: --platform=linux/arm64 arm64v8/debian:trixie
           # 64-bit arm on ubuntu 22.04
           - arch: aarch64
             distro: ubuntu22.04
+          # 64-bit arm on ubuntu 24.04
+          - arch: aarch64
+            distro: ubuntu24.04
 
     runs-on: ubuntu-latest
 
@@ -77,7 +78,7 @@ jobs:
     - uses: actions/checkout@v3
 
     # Do all the same steps as the above code, but all at once under the architecture
-    - uses: uraimo/run-on-arch-action@v2
+    - uses: uraimo/run-on-arch-action@v3
       name: Build on arch
       with:
         arch: ${{ matrix.arch }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ce79df..567f078 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.6)
 project(Phoenix6-Example)
 
-# Use C++17
-set(CMAKE_CXX_STANDARD 17)
+# Use C++20
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Set compiler flags
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20")
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Og")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 
diff --git a/main.cpp b/main.cpp
index 3e9a4dd..5ad3f78 100644
--- a/main.cpp
+++ b/main.cpp
@@ -12,7 +12,7 @@ class Robot : public RobotBase {
 private:
     /* This can be a CANivore name, CANivore serial number,
      * SocketCAN interface, or "*" to select any CANivore. */
-    static constexpr char const *CANBUS = CANBus("*");
+    static constexpr CANBus CANBUS{"*"};
 
     /* devices */
     hardware::TalonFX leftLeader{0, CANBUS};