diff --git a/cloudevents-binding.md b/cloudevents-binding.md
index 43cf296..304e31c 100644
--- a/cloudevents-binding.md
+++ b/cloudevents-binding.md
@@ -102,7 +102,7 @@ Content-Length: nnnn
 
 {
    "context": {
-      "specversion": "0.5.0",
+      "specversion": "0.6.0-draft",
       "id" : "A234-1234-1234",
       "source" : "/staging/tekton/",
       "type" : "dev.cdevents.taskrun.started.0.1.1",
diff --git a/conformance/artifact_deleted.json b/conformance/artifact_deleted.json
index 2cf60d5..e0bf17a 100644
--- a/conformance/artifact_deleted.json
+++ b/conformance/artifact_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.deleted.0.2.0",
diff --git a/conformance/artifact_downloaded.json b/conformance/artifact_downloaded.json
index 160e8cc..80f9297 100644
--- a/conformance/artifact_downloaded.json
+++ b/conformance/artifact_downloaded.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.downloaded.0.2.0",
diff --git a/conformance/artifact_packaged.json b/conformance/artifact_packaged.json
index 736c866..123588f 100644
--- a/conformance/artifact_packaged.json
+++ b/conformance/artifact_packaged.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/artifact_published.json b/conformance/artifact_published.json
index e6bcc65..9315bac 100644
--- a/conformance/artifact_published.json
+++ b/conformance/artifact_published.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/artifact_signed.json b/conformance/artifact_signed.json
index ad14edd..db04da6 100644
--- a/conformance/artifact_signed.json
+++ b/conformance/artifact_signed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/branch_created.json b/conformance/branch_created.json
index 3c99897..38bea8d 100644
--- a/conformance/branch_created.json
+++ b/conformance/branch_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/branch_deleted.json b/conformance/branch_deleted.json
index a22a0f7..fa6ad8d 100644
--- a/conformance/branch_deleted.json
+++ b/conformance/branch_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/build_finished.json b/conformance/build_finished.json
index 357e875..1e19bea 100644
--- a/conformance/build_finished.json
+++ b/conformance/build_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/build_queued.json b/conformance/build_queued.json
index 6b73157..671d2bd 100644
--- a/conformance/build_queued.json
+++ b/conformance/build_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/build_started.json b/conformance/build_started.json
index 0c27608..21104b8 100644
--- a/conformance/build_started.json
+++ b/conformance/build_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/change_abandoned.json b/conformance/change_abandoned.json
index 21f6422..a24b7c3 100644
--- a/conformance/change_abandoned.json
+++ b/conformance/change_abandoned.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/change_created.json b/conformance/change_created.json
index a8ba70e..67355ab 100644
--- a/conformance/change_created.json
+++ b/conformance/change_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/change_merged.json b/conformance/change_merged.json
index 0d294f8..c416756 100644
--- a/conformance/change_merged.json
+++ b/conformance/change_merged.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/change_reviewed.json b/conformance/change_reviewed.json
index 7eaea5d..c2c5d1c 100644
--- a/conformance/change_reviewed.json
+++ b/conformance/change_reviewed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/change_updated.json b/conformance/change_updated.json
index 53b8b1d..1d8b640 100644
--- a/conformance/change_updated.json
+++ b/conformance/change_updated.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/environment_created.json b/conformance/environment_created.json
index 06fb249..5744435 100644
--- a/conformance/environment_created.json
+++ b/conformance/environment_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/environment_deleted.json b/conformance/environment_deleted.json
index 2adc474..5ea1893 100644
--- a/conformance/environment_deleted.json
+++ b/conformance/environment_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/environment_modified.json b/conformance/environment_modified.json
index 31e3baa..90f4d19 100644
--- a/conformance/environment_modified.json
+++ b/conformance/environment_modified.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/incident_detected.json b/conformance/incident_detected.json
index 2b39ade..456d192 100644
--- a/conformance/incident_detected.json
+++ b/conformance/incident_detected.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/monitoring/prod1",
diff --git a/conformance/incident_reported.json b/conformance/incident_reported.json
index e21af48..7de43fa 100644
--- a/conformance/incident_reported.json
+++ b/conformance/incident_reported.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/monitoring/prod1",
diff --git a/conformance/incident_resolved.json b/conformance/incident_resolved.json
index 40b22f9..9e07271 100644
--- a/conformance/incident_resolved.json
+++ b/conformance/incident_resolved.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/monitoring/prod1",
diff --git a/conformance/pipelinerun_finished.json b/conformance/pipelinerun_finished.json
index 7ae8a69..aa7fa80 100644
--- a/conformance/pipelinerun_finished.json
+++ b/conformance/pipelinerun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/pipelinerun_queued.json b/conformance/pipelinerun_queued.json
index 16fde87..2ba2a72 100644
--- a/conformance/pipelinerun_queued.json
+++ b/conformance/pipelinerun_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/pipelinerun_started.json b/conformance/pipelinerun_started.json
index 75be1ef..576c993 100644
--- a/conformance/pipelinerun_started.json
+++ b/conformance/pipelinerun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/repository_created.json b/conformance/repository_created.json
index e8d0e33..5470eed 100644
--- a/conformance/repository_created.json
+++ b/conformance/repository_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/repository_deleted.json b/conformance/repository_deleted.json
index 7d4e5ff..fef2c1a 100644
--- a/conformance/repository_deleted.json
+++ b/conformance/repository_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/repository_modified.json b/conformance/repository_modified.json
index 18dab74..541a667 100644
--- a/conformance/repository_modified.json
+++ b/conformance/repository_modified.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/service_deployed.json b/conformance/service_deployed.json
index 2671e28..709bb79 100644
--- a/conformance/service_deployed.json
+++ b/conformance/service_deployed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/service_published.json b/conformance/service_published.json
index c0e0801..f03ce7e 100644
--- a/conformance/service_published.json
+++ b/conformance/service_published.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/service_removed.json b/conformance/service_removed.json
index 3dfc189..b04278c 100644
--- a/conformance/service_removed.json
+++ b/conformance/service_removed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/service_rolledback.json b/conformance/service_rolledback.json
index f97c7dc..94125ef 100644
--- a/conformance/service_rolledback.json
+++ b/conformance/service_rolledback.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/service_upgraded.json b/conformance/service_upgraded.json
index f8e848f..dc2d363 100644
--- a/conformance/service_upgraded.json
+++ b/conformance/service_upgraded.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/taskrun_finished.json b/conformance/taskrun_finished.json
index fe5f599..c25f9f5 100644
--- a/conformance/taskrun_finished.json
+++ b/conformance/taskrun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/taskrun_started.json b/conformance/taskrun_started.json
index 8768d74..0638910 100644
--- a/conformance/taskrun_started.json
+++ b/conformance/taskrun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testcaserun_finished.json b/conformance/testcaserun_finished.json
index 459543a..8bdd7c8 100644
--- a/conformance/testcaserun_finished.json
+++ b/conformance/testcaserun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testcaserun_queued.json b/conformance/testcaserun_queued.json
index a8a9847..b80a806 100644
--- a/conformance/testcaserun_queued.json
+++ b/conformance/testcaserun_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testcaserun_skipped.json b/conformance/testcaserun_skipped.json
index 6f11ba8..94df0be 100644
--- a/conformance/testcaserun_skipped.json
+++ b/conformance/testcaserun_skipped.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.skipped.0.2.0",
diff --git a/conformance/testcaserun_started.json b/conformance/testcaserun_started.json
index 7b24d53..d1a4eaa 100644
--- a/conformance/testcaserun_started.json
+++ b/conformance/testcaserun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testoutput_published.json b/conformance/testoutput_published.json
index 7ffdbe4..c712b27 100644
--- a/conformance/testoutput_published.json
+++ b/conformance/testoutput_published.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testsuiterun_finished.json b/conformance/testsuiterun_finished.json
index 8496f29..c91d8fe 100644
--- a/conformance/testsuiterun_finished.json
+++ b/conformance/testsuiterun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testsuiterun_queued.json b/conformance/testsuiterun_queued.json
index 5f7b471..d3d9709 100644
--- a/conformance/testsuiterun_queued.json
+++ b/conformance/testsuiterun_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/testsuiterun_started.json b/conformance/testsuiterun_started.json
index 9949cd8..30e6e3f 100644
--- a/conformance/testsuiterun_started.json
+++ b/conformance/testsuiterun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
diff --git a/conformance/ticket_closed.json b/conformance/ticket_closed.json
index 6341dad..ad8fcb1 100644
--- a/conformance/ticket_closed.json
+++ b/conformance/ticket_closed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
     "source": "/ticketing/system",
     "type": "dev.cdevents.ticket.closed.0.2.0",
diff --git a/conformance/ticket_created.json b/conformance/ticket_created.json
index 82b1ce8..c413b8f 100644
--- a/conformance/ticket_created.json
+++ b/conformance/ticket_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
     "source": "/ticketing/system",
     "type": "dev.cdevents.ticket.created.0.2.0",
diff --git a/conformance/ticket_updated.json b/conformance/ticket_updated.json
index c83e1ee..96fe1da 100644
--- a/conformance/ticket_updated.json
+++ b/conformance/ticket_updated.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
     "source": "/ticketing/system",
     "type": "dev.cdevents.ticket.updated.0.2.0",
diff --git a/custom/conformance.json b/custom/conformance.json
index e2622a0..60dc135 100644
--- a/custom/conformance.json
+++ b/custom/conformance.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdeventsx.mytool-resource.created.0.1.0",
diff --git a/custom/schema.json b/custom/schema.json
index e121655..9765905 100644
--- a/custom/schema.json
+++ b/custom/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/custom",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/custom",
   "properties": {
     "context": {
       "properties": {
diff --git a/links.md b/links.md
index db05321..2a35fff 100644
--- a/links.md
+++ b/links.md
@@ -129,7 +129,7 @@ between CDEvents.
 ```json
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "505b31c2-8bc8-47b3-a1a0-269d7a8530ac",
     "source": "dev/jenkins",
     "type": "dev.cdevents.testsuite.finished.0.1.1",
@@ -163,7 +163,7 @@ systems to act accordingly based off the ending notation.
 ```json
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "7ff3f526-1a0e-4d35-8a4c-7d6295e97359",
     "source": "/event/source/123",
@@ -198,7 +198,7 @@ further, we can allow for a path link between `pipelinerun.queued` to the
 ```json
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "chainId": "7ff3f526-1a0e-4d35-8a4c-7d6295e97359",
     "source": "/event/source/123",
@@ -367,7 +367,7 @@ help explain the overall flow using payloads from CDEvents.
 ```json
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "chainId": "d0be0005-cca7-4175-8fe3-f64d2f27bc01",
     "id": "38a09112-a1ab-4c26-94c4-edfc234ef631",
     "source": "/event/source/123",
@@ -417,7 +417,7 @@ sender generates this id.
 ```json
 {
   "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "chainId": "d0be0005-cca7-4175-8fe3-f64d2f27bc01",
     "id": "AA6945F8-B0F1-48DD-B658-25ACF95BD2F5",
     "source": "/event/source/123",
diff --git a/schemas/artifactdeleted.json b/schemas/artifactdeleted.json
index fa20fd8..8e45138 100644
--- a/schemas/artifactdeleted.json
+++ b/schemas/artifactdeleted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/artifact-deleted-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/artifact-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/artifactdownloaded.json b/schemas/artifactdownloaded.json
index 9a50be1..58e8935 100644
--- a/schemas/artifactdownloaded.json
+++ b/schemas/artifactdownloaded.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/artifact-downloaded-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/artifact-downloaded-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/artifactpackaged.json b/schemas/artifactpackaged.json
index be6cb4a..504d900 100644
--- a/schemas/artifactpackaged.json
+++ b/schemas/artifactpackaged.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/artifact-packaged-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/artifact-packaged-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/artifactpublished.json b/schemas/artifactpublished.json
index 06f12e6..8000522 100644
--- a/schemas/artifactpublished.json
+++ b/schemas/artifactpublished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/artifact-published-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/artifact-published-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/artifactsigned.json b/schemas/artifactsigned.json
index f0d565b..15798d1 100644
--- a/schemas/artifactsigned.json
+++ b/schemas/artifactsigned.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/artifact-signed-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/artifact-signed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/branchcreated.json b/schemas/branchcreated.json
index 5a3c664..0e09174 100644
--- a/schemas/branchcreated.json
+++ b/schemas/branchcreated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/branch-created-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/branch-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/branchdeleted.json b/schemas/branchdeleted.json
index bd2c1b6..dd4cdd3 100644
--- a/schemas/branchdeleted.json
+++ b/schemas/branchdeleted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/branch-deleted-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/branch-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/buildfinished.json b/schemas/buildfinished.json
index 56e27b1..3dfcf5e 100644
--- a/schemas/buildfinished.json
+++ b/schemas/buildfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/build-finished-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/build-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/buildqueued.json b/schemas/buildqueued.json
index eb9b951..314bea3 100644
--- a/schemas/buildqueued.json
+++ b/schemas/buildqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/build-queued-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/build-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/buildstarted.json b/schemas/buildstarted.json
index 78b21e4..5669b72 100644
--- a/schemas/buildstarted.json
+++ b/schemas/buildstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/build-started-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/build-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changeabandoned.json b/schemas/changeabandoned.json
index 023fb0f..576cab8 100644
--- a/schemas/changeabandoned.json
+++ b/schemas/changeabandoned.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/change-abandoned-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/change-abandoned-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changecreated.json b/schemas/changecreated.json
index f3d8d68..95e93eb 100644
--- a/schemas/changecreated.json
+++ b/schemas/changecreated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/change-created-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/change-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changemerged.json b/schemas/changemerged.json
index 51efa04..dacb822 100644
--- a/schemas/changemerged.json
+++ b/schemas/changemerged.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/change-merged-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/change-merged-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changereviewed.json b/schemas/changereviewed.json
index 3a1883c..f4c900b 100644
--- a/schemas/changereviewed.json
+++ b/schemas/changereviewed.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/change-reviewed-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/change-reviewed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changeupdated.json b/schemas/changeupdated.json
index f73fca6..38ddb92 100644
--- a/schemas/changeupdated.json
+++ b/schemas/changeupdated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/change-updated-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/change-updated-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/environmentcreated.json b/schemas/environmentcreated.json
index 87b8b89..9dca186 100644
--- a/schemas/environmentcreated.json
+++ b/schemas/environmentcreated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/environment-created-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/environment-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/environmentdeleted.json b/schemas/environmentdeleted.json
index ab27220..c253934 100644
--- a/schemas/environmentdeleted.json
+++ b/schemas/environmentdeleted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/environment-deleted-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/environment-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/environmentmodified.json b/schemas/environmentmodified.json
index 9ca5611..2cf3175 100644
--- a/schemas/environmentmodified.json
+++ b/schemas/environmentmodified.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/environment-modified-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/environment-modified-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/incidentdetected.json b/schemas/incidentdetected.json
index c1be24a..f268f5c 100644
--- a/schemas/incidentdetected.json
+++ b/schemas/incidentdetected.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/incident-detected-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/incident-detected-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/incidentreported.json b/schemas/incidentreported.json
index 0d04e24..192fc8c 100644
--- a/schemas/incidentreported.json
+++ b/schemas/incidentreported.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/incident-reported-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/incident-reported-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/incidentresolved.json b/schemas/incidentresolved.json
index 90173a2..edaf13d 100644
--- a/schemas/incidentresolved.json
+++ b/schemas/incidentresolved.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/incident-resolved-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/incident-resolved-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/links/embeddedlinkend.json b/schemas/links/embeddedlinkend.json
index 6fac354..f9a4bf4 100644
--- a/schemas/links/embeddedlinkend.json
+++ b/schemas/links/embeddedlinkend.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/embeddedlinkend",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/embeddedlinkend",
   "properties": {
     "linkType": {
       "type": "string",
diff --git a/schemas/links/embeddedlinkpath.json b/schemas/links/embeddedlinkpath.json
index 8a50599..d783aa4 100644
--- a/schemas/links/embeddedlinkpath.json
+++ b/schemas/links/embeddedlinkpath.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/embeddedlinkpath",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/embeddedlinkpath",
   "properties": {
     "linkType": {
       "type": "string",
diff --git a/schemas/links/embeddedlinkrelation.json b/schemas/links/embeddedlinkrelation.json
index ff9738c..aa5d438 100644
--- a/schemas/links/embeddedlinkrelation.json
+++ b/schemas/links/embeddedlinkrelation.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/embeddedlinkrelation",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/embeddedlinkrelation",
   "properties": {
     "linkType": {
       "type": "string",
diff --git a/schemas/links/embeddedlinksarray.json b/schemas/links/embeddedlinksarray.json
index 6ccf480..2e6f6a8 100644
--- a/schemas/links/embeddedlinksarray.json
+++ b/schemas/links/embeddedlinksarray.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/embeddedlinksarray",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/embeddedlinksarray",
   "type": "array",
   "items": {
     "anyOf": [
diff --git a/schemas/links/linkend.json b/schemas/links/linkend.json
index e9235a7..6bc3904 100644
--- a/schemas/links/linkend.json
+++ b/schemas/links/linkend.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/linkend",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/linkend",
   "properties": {
     "chainId": {
       "description": "This represents the full lifecycles of a series of events in CDEvents",
diff --git a/schemas/links/linkpath.json b/schemas/links/linkpath.json
index 197a083..53da853 100644
--- a/schemas/links/linkpath.json
+++ b/schemas/links/linkpath.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/linkpath",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/linkpath",
   "properties": {
     "chainId": {
       "type": "string",
diff --git a/schemas/links/linkrelation.json b/schemas/links/linkrelation.json
index 31a04a5..d597264 100644
--- a/schemas/links/linkrelation.json
+++ b/schemas/links/linkrelation.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/linkrelation",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/linkrelation",
   "properties": {
     "chainId": {
       "description": "This represents the full lifecycles of a series of events in CDEvents",
diff --git a/schemas/links/linkstart.json b/schemas/links/linkstart.json
index 118b92a..1a60021 100644
--- a/schemas/links/linkstart.json
+++ b/schemas/links/linkstart.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/links/linkstart",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/links/linkstart",
   "properties": {
     "chainId": {
       "description": "This represents the full lifecycles of a series of events in CDEvents",
diff --git a/schemas/pipelinerunfinished.json b/schemas/pipelinerunfinished.json
index d20ec0e..433eb69 100644
--- a/schemas/pipelinerunfinished.json
+++ b/schemas/pipelinerunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/pipelinerun-finished-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/pipelinerun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunqueued.json b/schemas/pipelinerunqueued.json
index 90dd8ac..18d9067 100644
--- a/schemas/pipelinerunqueued.json
+++ b/schemas/pipelinerunqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/pipelinerun-queued-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/pipelinerun-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunstarted.json b/schemas/pipelinerunstarted.json
index 95712f8..1a2425e 100644
--- a/schemas/pipelinerunstarted.json
+++ b/schemas/pipelinerunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/pipelinerun-started-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/pipelinerun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/repositorycreated.json b/schemas/repositorycreated.json
index 27a994c..8583295 100644
--- a/schemas/repositorycreated.json
+++ b/schemas/repositorycreated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/repository-created-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/repository-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/repositorydeleted.json b/schemas/repositorydeleted.json
index 47d2588..09c4b7e 100644
--- a/schemas/repositorydeleted.json
+++ b/schemas/repositorydeleted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/repository-deleted-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/repository-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/repositorymodified.json b/schemas/repositorymodified.json
index e90b5fb..f4b5ea9 100644
--- a/schemas/repositorymodified.json
+++ b/schemas/repositorymodified.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/repository-modified-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/repository-modified-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/servicedeployed.json b/schemas/servicedeployed.json
index 4f580ee..0832019 100644
--- a/schemas/servicedeployed.json
+++ b/schemas/servicedeployed.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/service-deployed-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/service-deployed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/servicepublished.json b/schemas/servicepublished.json
index 74a1349..6baeb47 100644
--- a/schemas/servicepublished.json
+++ b/schemas/servicepublished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/service-published-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/service-published-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/serviceremoved.json b/schemas/serviceremoved.json
index c190979..b0cd26e 100644
--- a/schemas/serviceremoved.json
+++ b/schemas/serviceremoved.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/service-removed-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/service-removed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/servicerolledback.json b/schemas/servicerolledback.json
index 1e29cd3..b6acb00 100644
--- a/schemas/servicerolledback.json
+++ b/schemas/servicerolledback.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/service-rolledback-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/service-rolledback-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/serviceupgraded.json b/schemas/serviceupgraded.json
index 34bdcfd..5021561 100644
--- a/schemas/serviceupgraded.json
+++ b/schemas/serviceupgraded.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/service-upgraded-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/service-upgraded-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/taskrunfinished.json b/schemas/taskrunfinished.json
index 53e7f4a..580e707 100644
--- a/schemas/taskrunfinished.json
+++ b/schemas/taskrunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/taskrun-finished-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/taskrun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/taskrunstarted.json b/schemas/taskrunstarted.json
index 18304a7..84bfc33 100644
--- a/schemas/taskrunstarted.json
+++ b/schemas/taskrunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/taskrun-started-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/taskrun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunfinished.json b/schemas/testcaserunfinished.json
index 45a7b40..02712d0 100644
--- a/schemas/testcaserunfinished.json
+++ b/schemas/testcaserunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testcaserun-finished-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testcaserun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunqueued.json b/schemas/testcaserunqueued.json
index c753d62..06d15c2 100644
--- a/schemas/testcaserunqueued.json
+++ b/schemas/testcaserunqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testcaserun-queued-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testcaserun-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunskipped.json b/schemas/testcaserunskipped.json
index 1ebb480..2a09673 100644
--- a/schemas/testcaserunskipped.json
+++ b/schemas/testcaserunskipped.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testcaserun-skipped-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testcaserun-skipped-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunstarted.json b/schemas/testcaserunstarted.json
index a64a01d..72f4c7f 100644
--- a/schemas/testcaserunstarted.json
+++ b/schemas/testcaserunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testcaserun-started-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testcaserun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testoutputpublished.json b/schemas/testoutputpublished.json
index 6e1b441..c29b20a 100644
--- a/schemas/testoutputpublished.json
+++ b/schemas/testoutputpublished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/test-output-published-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/test-output-published-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunfinished.json b/schemas/testsuiterunfinished.json
index 15916ae..044c1f8 100644
--- a/schemas/testsuiterunfinished.json
+++ b/schemas/testsuiterunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testsuiterun-finished-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testsuiterun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunqueued.json b/schemas/testsuiterunqueued.json
index e0454d3..d894d29 100644
--- a/schemas/testsuiterunqueued.json
+++ b/schemas/testsuiterunqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testsuiterun-queued-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testsuiterun-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunstarted.json b/schemas/testsuiterunstarted.json
index b435a6f..5154c47 100644
--- a/schemas/testsuiterunstarted.json
+++ b/schemas/testsuiterunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/testsuiterun-started-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/testsuiterun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/ticketclosed.json b/schemas/ticketclosed.json
index 1e5950b..b3fdde4 100644
--- a/schemas/ticketclosed.json
+++ b/schemas/ticketclosed.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/ticket-closed-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/ticket-closed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/ticketcreated.json b/schemas/ticketcreated.json
index 0b8c047..f001d69 100644
--- a/schemas/ticketcreated.json
+++ b/schemas/ticketcreated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/ticket-created-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/ticket-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/ticketupdated.json b/schemas/ticketupdated.json
index d21b5d5..d731b4d 100644
--- a/schemas/ticketupdated.json
+++ b/schemas/ticketupdated.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0/schema/ticket-updated-event",
+  "$id": "https://cdevents.dev/0.6.0-draft/schema/ticket-updated-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/spec.md b/spec.md
index 71b7d2d..0927ed4 100644
--- a/spec.md
+++ b/spec.md
@@ -370,7 +370,7 @@ This is an example of a full CDEvent context, rendered in JSON format:
 ```json
 {
     "context": {
-    "specversion": "0.5.0",
+    "specversion": "0.6.0-draft",
     "id" : "A234-1234-1234",
     "source" : "/staging/tekton/",
     "type" : "dev.cdevents.taskrun.started.0.2.0",
@@ -447,7 +447,7 @@ The following example shows `context` and `subject` together, rendered as JSON.
 ```json
 {
    "context": {
-      "specversion": "0.5.0",
+      "specversion": "0.6.0-draft",
       "id" : "A234-1234-1234",
       "source" : "/staging/tekton/",
       "type" : "dev.cdevents.taskrun.started.0.2.0",
diff --git a/version.txt b/version.txt
index 8f0916f..07b4364 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.5.0
+0.6.0-draft