diff --git a/bucket/sapmachine-jre.json b/bucket/sapmachine-jre.json
new file mode 100644
index 000000000..0c1c0ed58
--- /dev/null
+++ b/bucket/sapmachine-jre.json
@@ -0,0 +1,33 @@
+{
+    "description": "SapMachine: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "13.0.2",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-13.0.2/sapmachine-jre-13.0.2_windows-x64_bin.zip",
+            "hash": "b57c18f51a0ab7e34b6f42f9c27c4471af31186774480b468701e594493fae0b"
+        }
+    },
+    "extract_dir": "sapmachine-jre-13.0.2",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
+        "re": "/(?<sap>sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)_windows-x64_bin).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
+            }
+        },
+        "hash": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
+            "find": "^($sha256)\\s"
+        },
+        "extract_dir": "sapmachine-jre-$matchVersion"
+    }
+}
diff --git a/bucket/sapmachine-lts-jre.json b/bucket/sapmachine-lts-jre.json
new file mode 100644
index 000000000..659f822f6
--- /dev/null
+++ b/bucket/sapmachine-lts-jre.json
@@ -0,0 +1,33 @@
+{
+    "description": "SapMachine LTS: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "11.0.6.0.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.6.0.1/sapmachine-jre-11.0.6.0.1_windows-x64_bin.zip",
+            "hash": "0bfce50e63dc118b44673867f2248fe8fd7d7bf7e12497f4ddc275fc39e088eb"
+        }
+    },
+    "extract_dir": "sapmachine-jre-11.0.6.0.1",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
+        "re": "/(?<sap>sapmachine-(?:11[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)_windows-x64_bin).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
+            }
+        },
+        "hash": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
+            "find": "^($sha256)\\s"
+        },
+        "extract_dir": "sapmachine-jre-$matchVersion"
+    }
+}
diff --git a/bucket/sapmachine-lts.json b/bucket/sapmachine-lts.json
index 871c26b02..0734becec 100644
--- a/bucket/sapmachine-lts.json
+++ b/bucket/sapmachine-lts.json
@@ -5,7 +5,7 @@
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/SAP/SapMachine/releases/download//sapmachine-11.0.6.0.1/sapmachine-jdk-11.0.6.0.1_windows-x64_bin.zip",
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.6.0.1/sapmachine-jdk-11.0.6.0.1_windows-x64_bin.zip",
             "hash": "b7c2d070827eb78270a2422c9f7f6805475ef2050ddb2973585aa1a6dd11e51c"
         }
     },
@@ -16,7 +16,7 @@
     },
     "checkver": {
         "url": "https://api.github.com/repos/SAP/SapMachine/releases",
-        "re": "(?<sap>/sapmachine-(?:11[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
+        "re": "/(?<sap>sapmachine-(?:11[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/sapmachine.json b/bucket/sapmachine.json
index ef2f54171..4dc2fa817 100644
--- a/bucket/sapmachine.json
+++ b/bucket/sapmachine.json
@@ -1,22 +1,22 @@
 {
     "description": "SapMachine: An OpenJDK release maintained and supported by SAP",
     "homepage": "https://sap.github.io/SapMachine/",
-    "version": "11.0.6.0.1",
+    "version": "13.0.2",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/SAP/SapMachine/releases/download//sapmachine-11.0.6.0.1/sapmachine-jdk-11.0.6.0.1_windows-x64_bin.zip",
-            "hash": "b7c2d070827eb78270a2422c9f7f6805475ef2050ddb2973585aa1a6dd11e51c"
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-13.0.2/sapmachine-jdk-13.0.2_windows-x64_bin.zip",
+            "hash": "b92730ec4a0bafa33957a57c5b55ee77ab5a0e09347539a34d94326a142ae863"
         }
     },
-    "extract_dir": "sapmachine-jdk-11.0.6.0.1",
+    "extract_dir": "sapmachine-jdk-13.0.2",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
     },
     "checkver": {
         "url": "https://api.github.com/repos/SAP/SapMachine/releases",
-        "re": "(?<sap>/sapmachine-(?:[\\d.]+)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
+        "re": "/(?<sap>sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/sapmachine11-jre.json b/bucket/sapmachine11-jre.json
new file mode 100644
index 000000000..d7175735a
--- /dev/null
+++ b/bucket/sapmachine11-jre.json
@@ -0,0 +1,33 @@
+{
+    "description": "SapMachine 11: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "11.0.6.0.1",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.6.0.1/sapmachine-jre-11.0.6.0.1_windows-x64_bin.zip",
+            "hash": "0bfce50e63dc118b44673867f2248fe8fd7d7bf7e12497f4ddc275fc39e088eb"
+        }
+    },
+    "extract_dir": "sapmachine-jre-11.0.6.0.1",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
+        "re": "/(?<sap>sapmachine-(?:11[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)_windows-x64_bin).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
+            }
+        },
+        "hash": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
+            "find": "^($sha256)\\s"
+        },
+        "extract_dir": "sapmachine-jre-$matchVersion"
+    }
+}
diff --git a/bucket/sapmachine11.json b/bucket/sapmachine11.json
index 371a6f021..69e1f6e00 100644
--- a/bucket/sapmachine11.json
+++ b/bucket/sapmachine11.json
@@ -1,23 +1,22 @@
 {
     "description": "SapMachine 11: An OpenJDK release maintained and supported by SAP",
     "homepage": "https://sap.github.io/SapMachine/",
-    "version": "11.0.7-5-ea",
+    "version": "11.0.6.0.1",
     "license": "GPL-2.0-only WITH Classpath-exception-2.0",
     "architecture": {
         "64bit": {
-            "url": "https://github.com/SAP/SapMachine/releases/download//sapmachine-11.0.7%2B5/sapmachine-jdk-11.0.7-ea.5_windows-x64_bin.zip",
-            "hash": "76e9b696cf3f581c146a465ce226f65d3202856b10c5e3cd71e4919eddd58618"
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.6.0.1/sapmachine-jdk-11.0.6.0.1_windows-x64_bin.zip",
+            "hash": "b7c2d070827eb78270a2422c9f7f6805475ef2050ddb2973585aa1a6dd11e51c"
         }
     },
-    "extract_dir": "sapmachine-jdk-11.0.7",
+    "extract_dir": "sapmachine-jdk-11.0.6.0.1",
     "env_add_path": "bin",
     "env_set": {
         "JAVA_HOME": "$dir"
     },
     "checkver": {
         "url": "https://api.github.com/repos/SAP/SapMachine/releases",
-        "re": "(?<sap>/sapmachine-(?:11[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)(?:(?<dash>-)(?<ea>ea)\\.(?<build>[\\d]+))?_windows-x64_bin).zip",
-        "replace": "${version}${dash}${build}${dash}${ea}"
+        "re": "/(?<sap>sapmachine-(?:11[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/sapmachine12-jre.json b/bucket/sapmachine12-jre.json
new file mode 100644
index 000000000..f34d161e1
--- /dev/null
+++ b/bucket/sapmachine12-jre.json
@@ -0,0 +1,17 @@
+{
+    "description": "SapMachine 11: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "12.0.2",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-12.0.2/sapmachine-jre-12.0.2_windows-x64_bin.zip",
+            "hash": "d5ff306ec684b5b0edefc581b5ec49620e00de6cb6a591e465f6557dc15b2ba8"
+        }
+    },
+    "extract_dir": "sapmachine-jre-12.0.2",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    }
+}
diff --git a/bucket/sapmachine12.json b/bucket/sapmachine12.json
new file mode 100644
index 000000000..df48d54b8
--- /dev/null
+++ b/bucket/sapmachine12.json
@@ -0,0 +1,17 @@
+{
+    "description": "SapMachine 11: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "12.0.2",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/sapmachine-12.0.2/sapmachine-jdk-12.0.2_windows-x64_bin.zip",
+            "hash": "6b2d360412ad2d998be257bea4b2fbaaa95fda6e1f6cfdbd2d1d6108220f03ab"
+        }
+    },
+    "extract_dir": "sapmachine-jdk-12.0.2",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    }
+}
diff --git a/bucket/sapmachine13-jre.json b/bucket/sapmachine13-jre.json
new file mode 100644
index 000000000..16603af6d
--- /dev/null
+++ b/bucket/sapmachine13-jre.json
@@ -0,0 +1,33 @@
+{
+    "description": "SapMachine 13: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "13.0.2",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download//sapmachine-13.0.2/sapmachine-jre-13.0.2_windows-x64_bin.zip",
+            "hash": "b57c18f51a0ab7e34b6f42f9c27c4471af31186774480b468701e594493fae0b"
+        }
+    },
+    "extract_dir": "sapmachine-jre-13.0.2",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
+        "re": "(?<sap>/sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)_windows-x64_bin).zip"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
+            }
+        },
+        "hash": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
+            "find": "^($sha256)\\s"
+        },
+        "extract_dir": "sapmachine-jre-$matchVersion"
+    }
+}
diff --git a/bucket/sapmachine13.json b/bucket/sapmachine13.json
index 43b8af766..131a72402 100644
--- a/bucket/sapmachine13.json
+++ b/bucket/sapmachine13.json
@@ -16,8 +16,7 @@
     },
     "checkver": {
         "url": "https://api.github.com/repos/SAP/SapMachine/releases",
-        "re": "(?<sap>/sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)(?:(?<dash>-)(?<ea>ea)\\.(?<build>[\\d]+))?_windows-x64_bin).zip",
-        "replace": "${version}${dash}${build}${dash}${ea}"
+        "re": "(?<sap>/sapmachine-(?:13[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jdk-(?<version>[\\d.]+)_windows-x64_bin).zip"
     },
     "autoupdate": {
         "architecture": {
diff --git a/bucket/sapmachine14-jre.json b/bucket/sapmachine14-jre.json
new file mode 100644
index 000000000..4f2c5c846
--- /dev/null
+++ b/bucket/sapmachine14-jre.json
@@ -0,0 +1,34 @@
+{
+    "description": "SapMachine 14: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "14-36-ea",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download//sapmachine-14%2B36/sapmachine-jre-14-ea.36_windows-x64_bin.zip",
+            "hash": "f32a6653a5d01a685ca000d1fbc5548303af1909ce8dd9be36fced207ea955bb"
+        }
+    },
+    "extract_dir": "sapmachine-jre-14",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
+        "re": "(?<sap>/sapmachine-(?:14[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)(?:(?<dash>-)(?<ea>ea)\\.(?<build>[\\d]+))?_windows-x64_bin).zip",
+        "replace": "${version}${dash}${build}${dash}${ea}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
+            }
+        },
+        "hash": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
+            "find": "^($sha256)\\s"
+        },
+        "extract_dir": "sapmachine-jre-$matchVersion"
+    }
+}
diff --git a/bucket/sapmachine15-jre.json b/bucket/sapmachine15-jre.json
new file mode 100644
index 000000000..c2cc2da6c
--- /dev/null
+++ b/bucket/sapmachine15-jre.json
@@ -0,0 +1,34 @@
+{
+    "description": "SapMachine 15: An OpenJDK release maintained and supported by SAP",
+    "homepage": "https://sap.github.io/SapMachine/",
+    "version": "15-11-ea",
+    "license": "GPL-2.0-only WITH Classpath-exception-2.0",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/SAP/SapMachine/releases/download//sapmachine-15%2B11/sapmachine-jre-15-ea.11_windows-x64_bin.zip",
+            "hash": "11c131708c1b57eaf929177cccbe6df8476810e2851793e29b144667bd6d3c8d"
+        }
+    },
+    "extract_dir": "sapmachine-jre-15",
+    "env_add_path": "bin",
+    "env_set": {
+        "JAVA_HOME": "$dir"
+    },
+    "checkver": {
+        "url": "https://api.github.com/repos/SAP/SapMachine/releases",
+        "re": "(?<sap>/sapmachine-(?:15[\\d.]*)(?:\\%2B|\\+)?(?:[\\d]*)/sapmachine-jre-(?<version>[\\d.]+)(?:(?<dash>-)(?<ea>ea)\\.(?<build>[\\d]+))?_windows-x64_bin).zip",
+        "replace": "${version}${dash}${build}${dash}${ea}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.zip"
+            }
+        },
+        "hash": {
+            "url": "https://github.com/SAP/SapMachine/releases/download/$matchSap.sha256.txt",
+            "find": "^($sha256)\\s"
+        },
+        "extract_dir": "sapmachine-jre-$matchVersion"
+    }
+}