diff --git a/adoptium/marketplace/json/21/index.json b/adoptium/marketplace/json/21/index.json
new file mode 100644
index 0000000..c0dec5a
--- /dev/null
+++ b/adoptium/marketplace/json/21/index.json
@@ -0,0 +1,5 @@
+{
+	"schema_version": "1.0.0",
+	"indexes": [],
+	"releases": ["jdk_21_0_1_12_openj9_0_42_0_0.json"]
+}
\ No newline at end of file
diff --git a/adoptium/marketplace/json/21/index.json.sig b/adoptium/marketplace/json/21/index.json.sig
new file mode 100644
index 0000000..7b30653
Binary files /dev/null and b/adoptium/marketplace/json/21/index.json.sig differ
diff --git a/adoptium/marketplace/json/21/jdk_21_0_1_12_openj9_0_42_0_0.json b/adoptium/marketplace/json/21/jdk_21_0_1_12_openj9_0_42_0_0.json
new file mode 100644
index 0000000..1b78036
--- /dev/null
+++ b/adoptium/marketplace/json/21/jdk_21_0_1_12_openj9_0_42_0_0.json
@@ -0,0 +1,179 @@
+{
+	"releases": [{
+		"release_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/tag/jdk-21.0.1%2B12_openj9-0.42.0",
+		"release_name": "jdk-21.0.1+12_openj9-0.42.0",
+		"last_updated_timestamp": "2024-01-31T14:49:01Z",
+		"binaries": [{
+			"os": "aix",
+			"architecture": "ppc64",
+			"image_type": "jdk",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jdk_ppc64_aix_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64_aix_21.0.1.0.tar.gz",
+				"sha265sum": "1870fa59f3d4c8e1163bf49f5f61b46f7641a12bb95f9d19f2f4c5e1b1238876",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64_aix_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64_aix_21.0.1.0.tap.zip"
+		}, {
+			"os": "aix",
+			"architecture": "ppc64",
+			"image_type": "jre",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jre_ppc64_aix_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_ppc64_aix_21.0.1.0.tar.gz",
+				"sha265sum": "6199549977aaaa780c846f82742aaed93b8e5900081b27851bb6d3491b54333e",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_ppc64_aix_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64_aix_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "aarch64",
+			"image_type": "jdk",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jdk_aarch64_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_aarch64_linux_21.0.1.0.tar.gz",
+				"sha265sum": "c409f681221b875da6574c562902cc0d719480cb2b9a826a9ee9d12c03f4ced8",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_aarch64_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_aarch64_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "aarch64",
+			"image_type": "jre",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jre_aarch64_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_aarch64_linux_21.0.1.0.tar.gz",
+				"sha265sum": "c1308869c8e933f1b1a3c6301649eadf15bab3f43527999c14161d88b3111162",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_aarch64_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_aarch64_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "ppc64le",
+			"image_type": "jdk",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jdk_ppc64le_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64le_linux_21.0.1.0.tar.gz",
+				"sha265sum": "21ed1dca0c374c360e7c825c61992ddcba08cb2523d9e78e093be44e31771f45",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64le_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64le_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "ppc64le",
+			"image_type": "jre",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jre_ppc64le_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_ppc64le_linux_21.0.1.0.tar.gz",
+				"sha265sum": "3eea96cc7293d8bf536035c6ebfd46de63659eb35dffac0090a5450620799e7f",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_ppc64le_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_ppc64le_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "s390x",
+			"image_type": "jdk",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jdk_s390x_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_s390x_linux_21.0.1.0.tar.gz",
+				"sha265sum": "66a7b601fa48824789c71d72ae38e1f5bbcca27b849e4be586789e3e77eb7a70",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_s390x_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_s390x_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "s390x",
+			"image_type": "jre",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jre_s390x_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_s390x_linux_21.0.1.0.tar.gz",
+				"sha265sum": "1eb09d3ff35e651a0e985bd205b154a064d3c0ba6fdf3e6b2a83d844e726a5bd",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_s390x_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_s390x_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "x64",
+			"image_type": "jdk",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jdk_x64_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_x64_linux_21.0.1.0.tar.gz",
+				"sha265sum": "33276aef8ff8e6e3b2a89bbe4ebdfe3df8056191a2d78c133764ac165caaa327",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_x64_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_x64_linux_21.0.1.0.tap.zip"
+		}, {
+			"os": "linux",
+			"architecture": "x64",
+			"image_type": "jre",
+			"jvm_impl": "openj9",
+			"package": {
+				"name": "ibm-semeru-certified-jre_x64_linux_21.0.1.0.tar.gz",
+				"link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_x64_linux_21.0.1.0.tar.gz",
+				"sha265sum": "b9092dc9a9ad78e5c7675120436495428c558b0b5b54658dc3f4a5a71edf2b04",
+				"sha256sum_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jre_x64_linux_21.0.1.0.tar.gz.sha256.txt"
+			},
+			"timestamp": "2024-01-31T14:49:01Z",
+			"scm_ref": "v0.42.0-release",
+			"openjdk_scm_ref": "v0.42.0-release",
+			"distribution": "semeru",
+			"aqavit_results_link": "https://github.com/ibmruntimes/semeru21-certified-binaries/releases/download/jdk-21.0.1%2B12_openj9-0.42.0/ibm-semeru-certified-jdk_x64_linux_21.0.1.0.tap.zip"
+		}],
+		"vendor": "ibm",
+		"openjdk_version_data": {
+			"major": 21,
+			"minor": 0,
+			"security": 1,
+			"patch": null,
+			"pre": null,
+			"build": 12,
+			"optional": null,
+			"openjdk_version": "21.0.1+12"
+		}
+	}]
+}
\ No newline at end of file
diff --git a/adoptium/marketplace/json/21/jdk_21_0_1_12_openj9_0_42_0_0.json.sig b/adoptium/marketplace/json/21/jdk_21_0_1_12_openj9_0_42_0_0.json.sig
new file mode 100644
index 0000000..f50d233
Binary files /dev/null and b/adoptium/marketplace/json/21/jdk_21_0_1_12_openj9_0_42_0_0.json.sig differ
diff --git a/adoptium/marketplace/json/index.json b/adoptium/marketplace/json/index.json
index 7148c31..5894905 100644
--- a/adoptium/marketplace/json/index.json
+++ b/adoptium/marketplace/json/index.json
@@ -1,5 +1,5 @@
 {
 	"schema_version": "1.0.0",
-	"indexes": ["11/index.json", "17/index.json"],
+	"indexes": ["11/index.json", "17/index.json", "21/index.json"],
 	"releases": []
 }
\ No newline at end of file
diff --git a/adoptium/marketplace/json/index.json.sig b/adoptium/marketplace/json/index.json.sig
index 231d98d..aaf8304 100644
Binary files a/adoptium/marketplace/json/index.json.sig and b/adoptium/marketplace/json/index.json.sig differ