diff --git a/cloudevents-binding.md b/cloudevents-binding.md
index 8c3656f4..b3af8650 100644
--- a/cloudevents-binding.md
+++ b/cloudevents-binding.md
@@ -102,7 +102,7 @@ Content-Length: nnnn
 
 {
    "context": {
-      "version": "0.3.0",
+      "version": "0.4.0-draft",
       "id" : "A234-1234-1234",
       "source" : "/staging/tekton/",
       "type" : "dev.cdevents.taskrun.started",
diff --git a/examples/artifact_packaged.json b/examples/artifact_packaged.json
index e4d1d611..c88744fa 100644
--- a/examples/artifact_packaged.json
+++ b/examples/artifact_packaged.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.packaged.0.1.1",
diff --git a/examples/artifact_published.json b/examples/artifact_published.json
index 90bc837f..43d94b74 100644
--- a/examples/artifact_published.json
+++ b/examples/artifact_published.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.published.0.1.1",
diff --git a/examples/artifact_signed.json b/examples/artifact_signed.json
index 203c6df6..de0a31d3 100644
--- a/examples/artifact_signed.json
+++ b/examples/artifact_signed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.signed.0.1.0",
diff --git a/examples/branch_created.json b/examples/branch_created.json
index d4a6fb5c..35256a4e 100644
--- a/examples/branch_created.json
+++ b/examples/branch_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.branch.created.0.1.2",
diff --git a/examples/branch_deleted.json b/examples/branch_deleted.json
index d22e0b9d..cc4760b5 100644
--- a/examples/branch_deleted.json
+++ b/examples/branch_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.branch.deleted.0.1.2",
diff --git a/examples/build_finished.json b/examples/build_finished.json
index 161230b9..72db1245 100644
--- a/examples/build_finished.json
+++ b/examples/build_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.build.finished.0.1.1",
diff --git a/examples/build_queued.json b/examples/build_queued.json
index bde06bd2..94e027b5 100644
--- a/examples/build_queued.json
+++ b/examples/build_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.build.queued.0.1.1",
diff --git a/examples/build_started.json b/examples/build_started.json
index 98ccc8d5..b94974e4 100644
--- a/examples/build_started.json
+++ b/examples/build_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.build.started.0.1.1",
diff --git a/examples/change_abandoned.json b/examples/change_abandoned.json
index f6bfed44..6ff1e5c8 100644
--- a/examples/change_abandoned.json
+++ b/examples/change_abandoned.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.abandoned.0.1.2",
diff --git a/examples/change_created.json b/examples/change_created.json
index 696f7243..2382fec4 100644
--- a/examples/change_created.json
+++ b/examples/change_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.created.0.1.2",
diff --git a/examples/change_merged.json b/examples/change_merged.json
index a8419c7a..df502c11 100644
--- a/examples/change_merged.json
+++ b/examples/change_merged.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.merged.0.1.2",
diff --git a/examples/change_reviewed.json b/examples/change_reviewed.json
index f9ac5b1d..4d942a10 100644
--- a/examples/change_reviewed.json
+++ b/examples/change_reviewed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.reviewed.0.1.2",
diff --git a/examples/change_updated.json b/examples/change_updated.json
index e2375feb..aafe5232 100644
--- a/examples/change_updated.json
+++ b/examples/change_updated.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.updated.0.1.2",
diff --git a/examples/environment_created.json b/examples/environment_created.json
index 49154a6f..1e34350d 100644
--- a/examples/environment_created.json
+++ b/examples/environment_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.environment.created.0.1.1",
diff --git a/examples/environment_deleted.json b/examples/environment_deleted.json
index 82ed4432..ed9477e8 100644
--- a/examples/environment_deleted.json
+++ b/examples/environment_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.environment.deleted.0.1.1",
diff --git a/examples/environment_modified.json b/examples/environment_modified.json
index 5e5611e4..63af7049 100644
--- a/examples/environment_modified.json
+++ b/examples/environment_modified.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.environment.modified.0.1.1",
diff --git a/examples/incident_detected.json b/examples/incident_detected.json
index 351dfd22..cd08d5a7 100644
--- a/examples/incident_detected.json
+++ b/examples/incident_detected.json
@@ -1,6 +1,6 @@
 {
   "context": {
-      "version": "0.3.0",
+      "version": "0.4.0-draft",
       "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
       "source": "/monitoring/prod1",
       "type": "dev.cdevents.incident.detected.0.1.0",
diff --git a/examples/incident_reported.json b/examples/incident_reported.json
index 6b983b86..4524ebdd 100644
--- a/examples/incident_reported.json
+++ b/examples/incident_reported.json
@@ -1,6 +1,6 @@
 {
   "context": {
-      "version": "0.3.0",
+      "version": "0.4.0-draft",
       "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
       "source": "/monitoring/prod1",
       "type": "dev.cdevents.incident.reported.0.1.0",
diff --git a/examples/incident_resolved.json b/examples/incident_resolved.json
index b6e8d05f..01ac6ac3 100644
--- a/examples/incident_resolved.json
+++ b/examples/incident_resolved.json
@@ -1,6 +1,6 @@
 {
   "context": {
-      "version": "0.3.0",
+      "version": "0.4.0-draft",
       "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
       "source": "/monitoring/prod1",
       "type": "dev.cdevents.incident.resolved.0.1.0",
diff --git a/examples/pipelinerun_finished.json b/examples/pipelinerun_finished.json
index bee10e64..9b79b12d 100644
--- a/examples/pipelinerun_finished.json
+++ b/examples/pipelinerun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.pipelinerun.finished.0.1.1",
diff --git a/examples/pipelinerun_queued.json b/examples/pipelinerun_queued.json
index b62aad41..8c8db447 100644
--- a/examples/pipelinerun_queued.json
+++ b/examples/pipelinerun_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.pipelinerun.queued.0.1.1",
diff --git a/examples/pipelinerun_started.json b/examples/pipelinerun_started.json
index 0c5f0f91..f1e5b2fe 100644
--- a/examples/pipelinerun_started.json
+++ b/examples/pipelinerun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.pipelinerun.started.0.1.1",
diff --git a/examples/repository_created.json b/examples/repository_created.json
index 798acc22..6f538fe5 100644
--- a/examples/repository_created.json
+++ b/examples/repository_created.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.repository.created.0.1.1",
diff --git a/examples/repository_deleted.json b/examples/repository_deleted.json
index 00284a6d..d79fe66b 100644
--- a/examples/repository_deleted.json
+++ b/examples/repository_deleted.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.repository.deleted.0.1.1",
diff --git a/examples/repository_modified.json b/examples/repository_modified.json
index bc58418f..cae05758 100644
--- a/examples/repository_modified.json
+++ b/examples/repository_modified.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.repository.modified.0.1.1",
diff --git a/examples/service_deployed.json b/examples/service_deployed.json
index 1e3b9ec1..2acdf239 100644
--- a/examples/service_deployed.json
+++ b/examples/service_deployed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.deployed.0.1.1",
diff --git a/examples/service_published.json b/examples/service_published.json
index a74462b8..5022b7ca 100644
--- a/examples/service_published.json
+++ b/examples/service_published.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.published.0.1.1",
diff --git a/examples/service_removed.json b/examples/service_removed.json
index 9e7caef9..b2b9595b 100644
--- a/examples/service_removed.json
+++ b/examples/service_removed.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.removed.0.1.1",
diff --git a/examples/service_rolledback.json b/examples/service_rolledback.json
index 6e5fc218..8b95386e 100644
--- a/examples/service_rolledback.json
+++ b/examples/service_rolledback.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.rolledback.0.1.1",
diff --git a/examples/service_upgraded.json b/examples/service_upgraded.json
index 39b0b310..55690e1b 100644
--- a/examples/service_upgraded.json
+++ b/examples/service_upgraded.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.upgraded.0.1.1",
diff --git a/examples/taskrun_finished.json b/examples/taskrun_finished.json
index 92170557..427d6a98 100644
--- a/examples/taskrun_finished.json
+++ b/examples/taskrun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.taskrun.finished.0.1.1",
diff --git a/examples/taskrun_started.json b/examples/taskrun_started.json
index 8bb99e62..e67391c6 100644
--- a/examples/taskrun_started.json
+++ b/examples/taskrun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.taskrun.started.0.1.1",
diff --git a/examples/testcaserun_finished.json b/examples/testcaserun_finished.json
index 54b82b61..27b7387f 100644
--- a/examples/testcaserun_finished.json
+++ b/examples/testcaserun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.finished.0.1.0",
diff --git a/examples/testcaserun_queued.json b/examples/testcaserun_queued.json
index e4aa43ed..a8fd288a 100644
--- a/examples/testcaserun_queued.json
+++ b/examples/testcaserun_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.queued.0.1.0",
diff --git a/examples/testcaserun_started.json b/examples/testcaserun_started.json
index 3cfd2b83..ea48aace 100644
--- a/examples/testcaserun_started.json
+++ b/examples/testcaserun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.started.0.1.0",
diff --git a/examples/testoutput_published.json b/examples/testoutput_published.json
index c318745e..86a8ccf1 100644
--- a/examples/testoutput_published.json
+++ b/examples/testoutput_published.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testoutput.published.0.1.0",
diff --git a/examples/testsuiterun_finished.json b/examples/testsuiterun_finished.json
index f76f3bb7..52ad44c9 100644
--- a/examples/testsuiterun_finished.json
+++ b/examples/testsuiterun_finished.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testsuiterun.finished.0.1.0",
diff --git a/examples/testsuiterun_queued.json b/examples/testsuiterun_queued.json
index 8938a4de..abab9178 100644
--- a/examples/testsuiterun_queued.json
+++ b/examples/testsuiterun_queued.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testsuiterun.queued.0.1.0",
diff --git a/examples/testsuiterun_started.json b/examples/testsuiterun_started.json
index e9cba337..61caadd0 100644
--- a/examples/testsuiterun_started.json
+++ b/examples/testsuiterun_started.json
@@ -1,6 +1,6 @@
 {
   "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
     "source": "/event/source/123",
     "type": "dev.cdevents.testsuiterun.started.0.1.0",
diff --git a/schemas/artifactpackaged.json b/schemas/artifactpackaged.json
index a0051fb3..27aca12b 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.3.0/schema/artifact-packaged-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/artifact-packaged-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/artifactpublished.json b/schemas/artifactpublished.json
index 5dc27f47..fc56f008 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.3.0/schema/artifact-published-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/artifact-published-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/artifactsigned.json b/schemas/artifactsigned.json
index 86c6c68f..2b33d9a3 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.3.0/schema/artifact-signed-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/artifact-signed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/branchcreated.json b/schemas/branchcreated.json
index 2785ff83..91bc0625 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.3.0/schema/branch-created-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/branch-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/branchdeleted.json b/schemas/branchdeleted.json
index 2d7d9c62..bd5e0d61 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.3.0/schema/branch-deleted-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/branch-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/buildfinished.json b/schemas/buildfinished.json
index 1bfba2d3..e84ac9c4 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.3.0/schema/build-finished-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/build-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/buildqueued.json b/schemas/buildqueued.json
index 0f9796d7..999c07b4 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.3.0/schema/build-queued-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/build-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/buildstarted.json b/schemas/buildstarted.json
index 14bd9b4b..27a9ab78 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.3.0/schema/build-started-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/build-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changeabandoned.json b/schemas/changeabandoned.json
index 3e09871d..55b6d05b 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.3.0/schema/change-abandoned-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/change-abandoned-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changecreated.json b/schemas/changecreated.json
index d12ae4c0..bb156b32 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.3.0/schema/change-created-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/change-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changemerged.json b/schemas/changemerged.json
index dba358aa..311d7e17 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.3.0/schema/change-merged-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/change-merged-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changereviewed.json b/schemas/changereviewed.json
index 09895a4d..1192ce26 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.3.0/schema/change-reviewed-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/change-reviewed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/changeupdated.json b/schemas/changeupdated.json
index 380adcbc..8e88e91f 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.3.0/schema/change-updated-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/change-updated-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/environmentcreated.json b/schemas/environmentcreated.json
index 4e2748f7..908a292d 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.3.0/schema/environment-created-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/environment-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/environmentdeleted.json b/schemas/environmentdeleted.json
index 642b2540..7c98e8ac 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.3.0/schema/environment-deleted-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/environment-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/environmentmodified.json b/schemas/environmentmodified.json
index 995df8b1..c75db4c2 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.3.0/schema/environment-modified-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/environment-modified-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/incidentdetected.json b/schemas/incidentdetected.json
index 2d3c6d13..140e43f4 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.3.0/schema/incident-detected-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/incident-detected-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/incidentreported.json b/schemas/incidentreported.json
index 7dc11ac4..cc0286c6 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.3.0/schema/incident-reported-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/incident-reported-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/incidentresolved.json b/schemas/incidentresolved.json
index c409cf6f..2b4ae49d 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.3.0/schema/incident-resolved-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/incident-resolved-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunfinished.json b/schemas/pipelinerunfinished.json
index cc759b9e..b63e1210 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.3.0/schema/pipeline-run-finished-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/pipeline-run-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunqueued.json b/schemas/pipelinerunqueued.json
index 18e11305..5077f798 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.3.0/schema/pipeline-run-queued-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/pipeline-run-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunstarted.json b/schemas/pipelinerunstarted.json
index d58024b0..122c1621 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.3.0/schema/pipeline-run-started-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/pipeline-run-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/repositorycreated.json b/schemas/repositorycreated.json
index 45a8e2cb..be351657 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.3.0/schema/repository-created-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/repository-created-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/repositorydeleted.json b/schemas/repositorydeleted.json
index b9f45517..4d10d11b 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.3.0/schema/repository-deleted-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/repository-deleted-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/repositorymodified.json b/schemas/repositorymodified.json
index 5a837d12..b6e0049f 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.3.0/schema/repository-modified-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/repository-modified-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/servicedeployed.json b/schemas/servicedeployed.json
index 90f2fb67..2b4dfd96 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.3.0/schema/service-deployed-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/service-deployed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/servicepublished.json b/schemas/servicepublished.json
index 997f9a9c..090e7dc2 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.3.0/schema/service-published-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/service-published-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/serviceremoved.json b/schemas/serviceremoved.json
index 862f1473..59006bab 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.3.0/schema/service-removed-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/service-removed-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/servicerolledback.json b/schemas/servicerolledback.json
index ae9aeeda..50d2f50e 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.3.0/schema/service-rolledback-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/service-rolledback-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/serviceupgraded.json b/schemas/serviceupgraded.json
index 29818419..9edf90ae 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.3.0/schema/service-upgraded-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/service-upgraded-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/taskrunfinished.json b/schemas/taskrunfinished.json
index 810e38fc..5e6b547e 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.3.0/schema/task-run-finished-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/task-run-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/taskrunstarted.json b/schemas/taskrunstarted.json
index bbf6b2a9..7873dd40 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.3.0/schema/task-run-started-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/task-run-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunfinished.json b/schemas/testcaserunfinished.json
index 1d70623b..47da6948 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.3.0/schema/test-case-run-finished-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-case-run-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunqueued.json b/schemas/testcaserunqueued.json
index 4045dd91..d3379bd2 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.3.0/schema/test-case-run-queued-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-case-run-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunstarted.json b/schemas/testcaserunstarted.json
index 60b9b5b1..09444e07 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.3.0/schema/test-case-run-started-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-case-run-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testoutputpublished.json b/schemas/testoutputpublished.json
index 5573fb73..952011de 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.3.0/schema/test-output-published-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-output-published-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunfinished.json b/schemas/testsuiterunfinished.json
index 41d88cc7..29049fd3 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.3.0/schema/test-suite-finished-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-suite-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunqueued.json b/schemas/testsuiterunqueued.json
index 3b2819ab..3d255d51 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.3.0/schema/test-suite-run-queued-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-suite-run-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunstarted.json b/schemas/testsuiterunstarted.json
index c689b2d7..a9166ef2 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.3.0/schema/test-suite-run-started-event",
+  "$id": "https://cdevents.dev/0.4.0-draft/schema/test-suite-run-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/spec.md b/spec.md
index c01235bb..0c748c4e 100644
--- a/spec.md
+++ b/spec.md
@@ -269,7 +269,7 @@ This is an example of a full CDEvent context, rendered in JSON format:
 ```json
 {
     "context": {
-    "version": "0.3.0",
+    "version": "0.4.0-draft",
     "id" : "A234-1234-1234",
     "source" : "/staging/tekton/",
     "type" : "dev.cdevents.taskrun.started",
@@ -354,7 +354,7 @@ The following example shows `context` and `subject` together, rendered as JSON.
 ```json
 {
    "context": {
-      "version": "0.3.0",
+      "version": "0.4.0-draft",
       "id" : "A234-1234-1234",
       "source" : "/staging/tekton/",
       "type" : "dev.cdevents.taskrun.started",
diff --git a/version.txt b/version.txt
index 0d91a54c..18e17a3c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.3.0
+0.4.0-draft