diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ec500de46b..71bae321be 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
-    "name": "Swift 6.0-Ubuntu 22.04",
-    "image": "swift:6.0-jammy",
+    "name": "Swift 6.1-Ubuntu 24.04",
+    "image": "swift:6.1-noble",
     "features": {
         "ghcr.io/devcontainers/features/common-utils:2": {
             "installZsh": "false",
@@ -22,7 +22,7 @@
                 "lldb.library": "/usr/lib/liblldb.so"
             },
             "extensions": [
-                "sswg.swift-lang",
+                "swiftlang.swift-vscode",
                 "vadimcn.vscode-lldb",
                 "eamodio.gitlens",
                 "github.vscode-github-actions"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 730398682b..2124c65ae9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -36,12 +36,7 @@ jobs:
         {
           "include": [
             {
-              "os": "ubuntu-latest",
-              "language": "swift",
-              "swift": "latest"
-            },
-            {
-              "os": "macos-latest",
+              "os": "macos-15",
               "language": "swift",
               "swift": "latest"
             }
@@ -76,7 +71,7 @@ jobs:
               "swift": "5.9"
             },
             {
-              "os": "macos-latest",
+              "os": "macos-15",
               "swift": "latest"
             }
           ]
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index c35d596b08..3cc47c1ac3 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,7 +1,9 @@
 {
   "recommendations": [
-    "sswg.swift-lang",
+    "swiftlang.swift-vscode",
     "vadimcn.vscode-lldb",
+    "eamodio.gitlens",
+    "github.vscode-github-actions",
     "ms-vscode-remote.vscode-remote-extensionpack"
   ]
 }
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 95d1406df3..55282e2a13 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,7 +1,7 @@
 {
   "configurations": [
     {
-      "type": "swift-lldb",
+      "type": "swift",
       "request": "launch",
       "args": [],
       "cwd": "${workspaceFolder:MetaCodable}",
@@ -10,7 +10,7 @@
       "preLaunchTask": "swift: Build Debug ProtocolGen"
     },
     {
-      "type": "swift-lldb",
+      "type": "swift",
       "request": "launch",
       "args": [],
       "cwd": "${workspaceFolder:MetaCodable}",