diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 26e9a492094..a85f335a4f0 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -123,18 +123,16 @@ jobs:
   linux:
     if: github.repository == 'awslabs/aws-sdk-swift' || github.event_name == 'pull_request'
     runs-on: ${{ matrix.runner }}
-    container: swift:${{ matrix.version }}-${{ matrix.os }}
+    container: swift:${{ matrix.swift }}
     strategy:
       fail-fast: false
       matrix:
         runner:
           - ubuntu-24.04
           - ubuntu-24.04-arm
-        os:
-          - jammy
-        version:
-          - "5.9"
-          - "6.2"
+        swift:
+          - 5.9-jammy
+          - 6.2-noble
     env:
       ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
@@ -163,10 +161,10 @@ jobs:
           path: |
             ~/Library/Caches/org.swift.swiftpm
             ~/.cache/org.swift.swiftpm
-          key: 1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
+          key: 1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
           restore-keys: |
-            1-${{ runner.os }}-swift-${{ matrix.version }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
-            1-${{ runner.os }}-swift-${{ matrix.version }}-spm-
+            1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-${{ hashFiles('Package.swift', 'AWSSDKSwiftCLI/Package.swift') }}
+            1-${{ runner.os }}-swift-${{ matrix.swift }}-spm-
       - name: Setup Java
         uses: actions/setup-java@v4
         with: