diff --git a/.github/actions/build_arm64/Dockerfile b/.github/actions/build_arm64/Dockerfile
index 4509a80..7f3ab6a 100644
--- a/.github/actions/build_arm64/Dockerfile
+++ b/.github/actions/build_arm64/Dockerfile
@@ -1,10 +1,10 @@
-FROM golang:1.23-bullseye
+FROM golang:1.23-bookworm
 
 RUN \
     dpkg --add-architecture arm64 && \
     apt-get update && \
     apt-get install -y ca-certificates openssl zip curl jq \
-    gcc-10-aarch64-linux-gnu gcc-aarch64-linux-gnu libsqlite3-dev:arm64 && \
+    gcc-12-aarch64-linux-gnu gcc-aarch64-linux-gnu libsqlite3-dev:arm64 && \
     update-ca-certificates && \
     rm -rf /var/lib/apt
 
diff --git a/.github/actions/build_x86_64/Dockerfile b/.github/actions/build_x86_64/Dockerfile
index adf9159..07ae1f5 100644
--- a/.github/actions/build_x86_64/Dockerfile
+++ b/.github/actions/build_x86_64/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23-bullseye
+FROM golang:1.23-bookworm
 
 RUN \
     apt-get update && \
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 659f48f..aa91a2e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -20,7 +20,7 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
-                go: [1.21.x]
+                go: [1.23.x]
 
         steps:
             - name: Install GCC (Ubuntu)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 346486b..11ad020 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,29 +47,43 @@ jobs:
             CGO_ENABLED: 1
             GOOS: linux
             GOARCH: arm64
-            CC: "/usr/bin/aarch64-linux-gnu-gcc-11"
+            CC: "/usr/bin/aarch64-linux-gnu-gcc-13"
         steps:
-            # Patch azure archives for [amd64, i386] use only and add
-            # arm64 ports (derived from ryankurte/action-apt)
+            # Update sources to split out amd64 vs arm64 since arm64 is not supported on all mirrors
+            # adaped from https://github.com/shamil-mubarakshin/tests-repository/blob/main/.github/workflows/run-ubuntu-matrix.yml
             - name: Update sources for arm64
               shell: bash
               run: |
                   sudo dpkg --add-architecture arm64
-                  echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse" | sudo tee /etc/apt/sources.list
-                  echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-                  echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-                  echo "deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse" | sudo tee -a /etc/apt/sources.list
-                  echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted universe" | sudo tee -a /etc/apt/sources.list
-                  echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted universe" | sudo tee -a /etc/apt/sources.list
-                  echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-backports main restricted universe"| sudo tee -a /etc/apt/sources.list
-                  echo "deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted universe" | sudo tee -a /etc/apt/sources.list
+                  cat <<EOF > deb822sources
+                  Types: deb
+                  URIs: http://archive.ubuntu.com/ubuntu/
+                  Suites: noble noble-updates
+                  Components: main restricted universe
+                  Architectures: amd64
+
+                  Types: deb
+                  URIs: http://security.ubuntu.com/ubuntu/
+                  Suites: noble-security
+                  Components: main restricted universe
+                  Architectures: amd64
+
+                  Types: deb
+                  URIs: http://azure.ports.ubuntu.com/ubuntu-ports/
+                  Suites: noble noble-updates
+                  Components: main restricted multiverse universe
+                  Architectures: arm64
+
+                  EOF
+
+                  sudo mv deb822sources /etc/apt/sources.list.d/ubuntu.sources
 
             - name: Install GCC and SQLite for Arm64
               shell: bash
               run: |
                   sudo apt-get update
                   DEBIAN_FRONTEND=noninteractive sudo apt-get install -y \
-                    gcc-11-aarch64-linux-gnu \
+                    gcc-13-aarch64-linux-gnu \
                     libsqlite3-dev:arm64 \
                     file
             - name: Install Go