diff --git a/.github/workflows/_test_bare_metal.yml b/.github/workflows/_test_bare_metal.yml
index b9f974c..df24d6a 100644
--- a/.github/workflows/_test_bare_metal.yml
+++ b/.github/workflows/_test_bare_metal.yml
@@ -7,8 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ macos-14, macos-13, macos-12, ubuntu-22.04, ubuntu-20.04, windows-latest, arm-4core-linux ]
-        go-version: [ '1.22', '1.21' ]
+        runs-on: [ macos-15, macos-14, macos-13, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, arm-4core-linux ]
+        go-version: [ '1.23', '1.22' ]
         include:
           # Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go version)
           - go-version: '1.22'
diff --git a/.github/workflows/_test_containerized.yml b/.github/workflows/_test_containerized.yml
index 8a07a99..55fb12a 100644
--- a/.github/workflows/_test_containerized.yml
+++ b/.github/workflows/_test_containerized.yml
@@ -13,27 +13,21 @@ jobs:
           - golang:{0}-alpine
           - golang:{0}-bookworm
           - golang:{0}-bullseye
-          - golang:{0}-buster
           # RPM-based image
           - amazonlinux:2 # pretty popular on AWS workloads
-        go-version: [ "1.23-rc", "1.22", "1.21" ]
+          - amazonlinux:2023
+        go-version: [ "1.23", "1.22" ]
         include:
           # Test with DD_APPSEC_WAF_LOG_LEVEL (only latest go, without any particular tag)
-          - go-version: '1.23-rc'
+          - go-version: '1.23'
             waf-log-level: TRACE
         exclude:
-          # Prune inexistent build images (debian buster is on LTS but won't get new go version images)
-          - go-version: '1.21'
-            image: golang:{0}-buster
-           # Prune inexistent build images (debian buster is on LTS but won't get new go version images)
-          - go-version: '1.22'
-            image: golang:{0}-buster
-          # Prune inexistent build images (debian buster is on LTS but won't get new go version images)
-          - go-version: '1.23-rc'
-            image: golang:{0}-buster
           # The amazonlinux:2 variant is only relevant for the default go version yum ships (currently 1.22)
-          - go-version: '1.21'
+          - go-version: '1.23'
             image: amazonlinux:2
+          # The amazonlinux:2023 variant is only relevant for the default go version yum ships (currently 1.22)
+          - go-version: '1.23'
+            image: amazonlinux:2023
     name: ${{ matrix.arch }} ${{ format(matrix.image, matrix.go-version) }} go${{ matrix.go-version }}${{ matrix.waf-log-level && format(' (DD_APPSEC_WAF_LOG_LEVEL={0})', matrix.waf-log-level) || '' }}
     # We use ARM runners when needed to avoid the performance hit of QEMU
     runs-on: ${{ matrix.arch == 'amd64' && 'ubuntu-latest' || 'arm-4core-linux' }}