diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index abaac40..6b9d6ea 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,8 +33,8 @@ jobs:
       fail-fast: true
       matrix:
         language: [ 'go' ]
-        os: [ 'ubuntu-22.04' ]
-        go-version: [1.23.x]
+        os: [ 'ubuntu-24.04' ]
+        go-version: [1.24.x]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
diff --git a/.github/workflows/dockerfiles.yml b/.github/workflows/dockerfiles.yml
index 70008dc..03920a6 100644
--- a/.github/workflows/dockerfiles.yml
+++ b/.github/workflows/dockerfiles.yml
@@ -24,7 +24,7 @@ jobs:
           [
             "./build/docker/go-tools/Dockerfile",
           ]
-    runs-on: "ubuntu-22.04"
+    runs-on: "ubuntu-24.04"
     name: Lint ${{ matrix.dockerfile }}
     steps:
       - name: Checkout
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 71fadbf..380ff54 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -41,8 +41,8 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        os: [ 'ubuntu-22.04' ]
-        go-version: [1.23.x]
+        os: [ 'ubuntu-24.04' ]
+        go-version: [1.24.x]
     runs-on: ${{ matrix.os }}
     name: Build
     steps:
diff --git a/Makefile b/Makefile
index 9850479..5a4ba61 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ COMPOSE_TOOLS_CMD_BASE=docker compose -f $(COMPOSE_TOOLS_FILE)
 COMPOSE_TOOLS_CMD_UP=$(COMPOSE_TOOLS_CMD_BASE) up --exit-code-from
 COMPOSE_TOOLS_CMD_PULL=$(COMPOSE_TOOLS_CMD_BASE) build
 
-GOVERSION:=1.23
+GOVERSION:=1.24
 
 TARGET_MAX_CHAR_NUM=20
 
diff --git a/go.mod b/go.mod
index aeb1317..c9e9a3c 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,8 @@
 module github.com/obalunenko/strava-api
 
-go 1.23
+go 1.24
+
+toolchain go1.24.0
 
 require (
 	github.com/go-openapi/errors v0.22.0