diff --git a/bucket/openjdk.json b/bucket/openjdk.json
index d62816d34..0240f8ae5 100644
--- a/bucket/openjdk.json
+++ b/bucket/openjdk.json
@@ -9,7 +9,7 @@
             "hash": "fc7d9eee3c09ea6548b00ca25dbf34a348b3942c815405a1428e0bfef268d08d"
         }
     },
-    "extract_dir": "jdk-11.0.2",
+    "extract_dir": "jdk-12.0.1",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -26,6 +26,7 @@
         },
         "hash": {
             "url": "$url.sha256"
-        }
+        },
+        "extract_dir": "jdk-$matchVersion"
     }
 }
diff --git a/bucket/openjdk12.json b/bucket/openjdk12.json
index 65fac5734..e4533134f 100644
--- a/bucket/openjdk12.json
+++ b/bucket/openjdk12.json
@@ -9,7 +9,7 @@
             "hash": "fc7d9eee3c09ea6548b00ca25dbf34a348b3942c815405a1428e0bfef268d08d"
         }
     },
-    "extract_dir": "jdk-12",
+    "extract_dir": "jdk-12.0.1",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
@@ -26,6 +26,7 @@
         },
         "hash": {
             "url": "$url.sha256"
-        }
+        },
+        "extract_dir": "jdk-$matchVersion"
     }
 }
diff --git a/bucket/openjdk13.json b/bucket/openjdk13.json
index 849cddff7..3290c6328 100644
--- a/bucket/openjdk13.json
+++ b/bucket/openjdk13.json
@@ -26,6 +26,7 @@
         },
         "hash": {
             "url": "$url.sha256"
-        }
+        },
+        "extract_dir": "jdk-$matchVersion"
     }
 }
diff --git a/bucket/oraclejdk12.json b/bucket/oraclejdk12.json
index 8d1dd6229..d142e4c2c 100644
--- a/bucket/oraclejdk12.json
+++ b/bucket/oraclejdk12.json
@@ -1,5 +1,5 @@
 {
-    "description": "Oracle JDK 11",
+    "description": "Oracle JDK 12",
     "homepage": "https://www.oracle.com/technetwork/java/javase/overview/index.html",
     "version": "12.0.1-12",
     "license": "https://www.oracle.com/technetwork/java/javase/terms/license/javase-license.html",