diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 08526ef52a..c8c25dbc32 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -96,7 +96,7 @@ jobs:
           fetch-tags: true
 
       - name: Setup SDK pipeline
-        uses: Fortinbra/RaspberryPiPicoBuild@v7
+        uses: Fortinbra/RaspberryPiPicoBuild@v8
 
       - name: Download a Build Artifact
         uses: actions/download-artifact@v4.1.2
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c0f3bac56..8154172445 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,9 +4,9 @@ if(WIN32)
 else()
     set(USERHOME $ENV{HOME})
 endif()
-set(sdkVersion 2.1.1)
+set(sdkVersion 2.2.0)
 set(toolchainVersion 14_2_Rel1)
-set(picotoolVersion 2.1.1)
+set(picotoolVersion 2.2.0)
 set(picoVscode ${USERHOME}/.pico-sdk/cmake/pico-vscode.cmake)
 if (EXISTS ${picoVscode})
     include(${picoVscode})