diff --git a/archspec/compspec.json b/archspec/compspec.json
index 922c98f..76f2988 100644
--- a/archspec/compspec.json
+++ b/archspec/compspec.json
@@ -1,7 +1,7 @@
 {
     "compatibilities": {
-        "version": "0.0.0",
         "io.archspec.cpu": { 
+             "version": "0.0.0",
              "annotations": [
                  "family",
                  "model",
diff --git a/definition-schema.json b/definition-schema.json
index b2e7561..be69517 100644
--- a/definition-schema.json
+++ b/definition-schema.json
@@ -6,13 +6,13 @@
   "properties": {
     "compatibilities": {
       "type": "object",
-      "properties": {
-        "version": {
-          "$comment": "Version of the metadata namespace",
-          "type": "string"
-        },
-        "patternProperties": {
-          "([\\w]*)": {
+      "patternProperties": {
+        "([\\w]*)": {
+          "properties": {
+            "version": {
+              "$comment": "Version of the metadata namespace",
+              "type": "string"
+            },
             "annotations": {
               "$comment": "Acceptable keys for a given namespace.",
               "type": "array",
diff --git a/schema.json b/schema.json
index bdf64a6..7fe587a 100644
--- a/schema.json
+++ b/schema.json
@@ -6,13 +6,13 @@
   "properties": {
     "compatibilities": {
       "type": "object",
-      "properties": {
-        "version": {
-          "$comment": "Version of the metadata namespace",
-          "type": "string"
-        },
-        "patternProperties": {
-          "([\\w]*)": {
+      "patternProperties": {
+        "([\\w]*)": {
+          "properties": {
+            "version": {
+              "$comment": "Version of the metadata namespace",
+              "type": "string"
+            },
             "annotations": {
               "$comment": "Key value pairs for a given namespace.",
               "type": "array",
diff --git a/supercontainers/compspec.json b/supercontainers/compspec.json
index 19c49a0..26cd064 100644
--- a/supercontainers/compspec.json
+++ b/supercontainers/compspec.json
@@ -1,7 +1,7 @@
 {
     "compatibilities": {
-        "version": "0.0.0",
         "org.supercontainers.mpi": { 
+             "version": "0.0.0",
              "annotations": [
                  "implementation",
                  "portability.optimization",
@@ -9,6 +9,7 @@
              ]
          },
         "org.supercontainers.hardware.gpu": { 
+             "version": "0.0.0",
              "annotations": [
                  "driver.version",
                  "cuda.version",
@@ -16,16 +17,19 @@
              ]
          },
         "org.supercontainers.communication": { 
+             "version": "0.0.0",
              "annotations": [
                  "framework"
              ]
          },
         "org.supercontainers.openmpi": { 
+             "version": "0.0.0",
              "annotations": [
                  "version"
              ]
          },
         "org.supercontainers.libfabric": { 
+             "version": "0.0.0",
              "annotations": [
                  "abi.version"
              ]