diff --git a/.github/workflows/asdf2devbox.yaml b/.github/workflows/asdf2devbox.yaml
index 15162d7f88..cf71577847 100644
--- a/.github/workflows/asdf2devbox.yaml
+++ b/.github/workflows/asdf2devbox.yaml
@@ -4,6 +4,8 @@ on:
   pull_request:
     paths:
       - ".tool-versions"
+      - "scripts/asdf2devbox.py"
+      - ".github/workflows/asdf2devbox.yaml"
 jobs:
   asdf2devbox:
     runs-on: ubuntu-latest
diff --git a/devbox.json b/devbox.json
index 85c5e0e6de..6097eb7e62 100644
--- a/devbox.json
+++ b/devbox.json
@@ -37,9 +37,9 @@
     "yq-go":                             "4.44.2",
     "postgresql":                        "latest",
     "cloudfoundry-cli":                  "8.7.11",
-    "google-cloud-sdk":                  "latest",
     "ginkgo":                            "2.20.0",
-    "temurin-bin-17":                    "latest",
+    "google-cloud-sdk":                  "latest",
+    "temurin-bin-21":                    "latest",
     "ruby":                              "latest"
   },
   "shell": {
diff --git a/devbox.lock b/devbox.lock
index 4d6ccce6c3..c454e4f222 100644
--- a/devbox.lock
+++ b/devbox.lock
@@ -1928,51 +1928,51 @@
         }
       }
     },
-    "temurin-bin-17@latest": {
-      "last_modified": "2024-07-07T07:43:47Z",
-      "resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#temurin-bin-17",
+    "temurin-bin-21@latest": {
+      "last_modified": "2024-07-31T08:48:38Z",
+      "resolved": "github:NixOS/nixpkgs/c3392ad349a5227f4a3464dce87bcc5046692fce#temurin-bin-21",
       "source": "devbox-search",
-      "version": "17.0.11",
+      "version": "21.0.3",
       "systems": {
         "aarch64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/2d6rfr7i5zk5w8zvfmd1r2l09pmzgz0c-temurin-bin-17.0.11",
+              "path": "/nix/store/an74vw8d3n04g223h5rs6nn8rv5a2pdm-temurin-bin-21.0.3",
               "default": true
             }
           ],
-          "store_path": "/nix/store/2d6rfr7i5zk5w8zvfmd1r2l09pmzgz0c-temurin-bin-17.0.11"
+          "store_path": "/nix/store/an74vw8d3n04g223h5rs6nn8rv5a2pdm-temurin-bin-21.0.3"
         },
         "aarch64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/xk5an6bvr31255wswn1xamx0lvsfn7pf-temurin-bin-17.0.11",
+              "path": "/nix/store/kn70i47biavh790xrsym6hv3qq6w1kv5-temurin-bin-21.0.3",
               "default": true
             }
           ],
-          "store_path": "/nix/store/xk5an6bvr31255wswn1xamx0lvsfn7pf-temurin-bin-17.0.11"
+          "store_path": "/nix/store/kn70i47biavh790xrsym6hv3qq6w1kv5-temurin-bin-21.0.3"
         },
         "x86_64-darwin": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/scinqaw1rmfddmmxprnym4ccn5k94c6l-temurin-bin-17.0.11",
+              "path": "/nix/store/qlcv8f0dqfxmdqkd7bi1y1n1vfplbk8l-temurin-bin-21.0.3",
               "default": true
             }
           ],
-          "store_path": "/nix/store/scinqaw1rmfddmmxprnym4ccn5k94c6l-temurin-bin-17.0.11"
+          "store_path": "/nix/store/qlcv8f0dqfxmdqkd7bi1y1n1vfplbk8l-temurin-bin-21.0.3"
         },
         "x86_64-linux": {
           "outputs": [
             {
               "name": "out",
-              "path": "/nix/store/8a3b40b63waavsyvdv1y822rv7lqm6kj-temurin-bin-17.0.11",
+              "path": "/nix/store/xnkkwdy3pgfpgh061njl2hrrq2bm0xl2-temurin-bin-21.0.3",
               "default": true
             }
           ],
-          "store_path": "/nix/store/8a3b40b63waavsyvdv1y822rv7lqm6kj-temurin-bin-17.0.11"
+          "store_path": "/nix/store/xnkkwdy3pgfpgh061njl2hrrq2bm0xl2-temurin-bin-21.0.3"
         }
       }
     },
diff --git a/scripts/asdf2devbox.py b/scripts/asdf2devbox.py
index 49759d6eb6..34712f9d95 100755
--- a/scripts/asdf2devbox.py
+++ b/scripts/asdf2devbox.py
@@ -11,7 +11,10 @@
 def get_installed_version(package):
     with open(os.path.join(script_dir, '..', 'devbox.json'), 'r') as f:
         data = json.load(f)
-        return data['packages'][package]
+        try:
+            return data['packages'][package]
+        except KeyError:
+            return None
 
 # Read the .tool-versions file and process each line
 if __name__ == "__main__":
@@ -27,7 +30,7 @@ def get_installed_version(package):
                 "credhub": "credhub-cli",
                 "gcloud": "google-cloud-sdk",
                 "golang": "go",
-                "java": "temurin-bin-17",
+                "java": "temurin-bin-21",
                 "make": "gnumake",
                 "yq": "yq-go"
             }