diff --git a/README.md b/README.md
index d6528e65..1f749c94 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ Conformance tests for JSON Schema and its vocabularies may be found
 
 The JSON Schema web site is at http://json-schema.org/
 
-The source for the website is [maintained in a separate repository](https://github.com/json-schema-org/json-schema-org.github.io).
+The source for the website is [maintained in a separate repository](https://github.com/json-schema-org/website).
 
 ## License
 
diff --git a/links.json b/links.json
index 7b1a578f..96a600fd 100644
--- a/links.json
+++ b/links.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
+    "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/links",
     "title": "Link Description Object",
     "allOf": [
@@ -36,7 +36,7 @@
                     "format": "uri-template"
                 },
                 "hrefSchema": {
-                    "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
+                    "$ref": "https://json-schema.org/draft/2019-09/hyper-schema",
                     "default": false
                 },
                 "templatePointers": {
@@ -63,7 +63,7 @@
                     "type": "string"
                 },
                 "targetSchema": {
-                    "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
+                    "$ref": "https://json-schema.org/draft/2019-09/hyper-schema",
                     "default": true
                 },
                 "targetMediaType": {
@@ -71,7 +71,7 @@
                 },
                 "targetHints": { },
                 "headerSchema": {
-                    "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
+                    "$ref": "https://json-schema.org/draft/2019-09/hyper-schema",
                     "default": true
                 },
                 "submissionMediaType": {
@@ -79,7 +79,7 @@
                     "default": "application/json"
                 },
                 "submissionSchema": {
-                    "$recursiveRef": "https://json-schema.org/draft/2019-09/hyper-schema",
+                    "$ref": "https://json-schema.org/draft/2019-09/hyper-schema",
                     "default": true
                 },
                 "$comment": {
diff --git a/meta/applicator.json b/meta/applicator.json
index b17d35c5..80a04ca1 100644
--- a/meta/applicator.json
+++ b/meta/applicator.json
@@ -1,12 +1,10 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/applicator",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/applicator": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Applicator vocabulary meta-schema",
+    "type": ["object", "boolean"],
     "properties": {
         "additionalItems": { "$recursiveRef": "#" },
         "unevaluatedItems": { "$recursiveRef": "#" },
@@ -18,12 +16,7 @@
         },
         "contains": { "$recursiveRef": "#" },
         "additionalProperties": { "$recursiveRef": "#" },
-        "unevaluatedProperties": {
-            "type": "object",
-            "additionalProperties": {
-                "$recursiveRef": "#"
-            }
-        },
+        "unevaluatedProperties": { "$recursiveRef": "#" },
         "properties": {
             "type": "object",
             "additionalProperties": { "$recursiveRef": "#" },
diff --git a/meta/content.json b/meta/content.json
index f6752a8e..7a9af975 100644
--- a/meta/content.json
+++ b/meta/content.json
@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/content",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/content": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Content vocabulary meta-schema",
diff --git a/meta/core.json b/meta/core.json
index b28fc990..2cf1fedd 100644
--- a/meta/core.json
+++ b/meta/core.json
@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/core",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/core": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Core vocabulary meta-schema",
@@ -33,7 +30,6 @@
         },
         "$recursiveAnchor": {
             "type": "boolean",
-            "const": true,
             "default": false
         },
         "$vocabulary": {
diff --git a/meta/format.json b/meta/format.json
index 09bbfdda..87177f35 100644
--- a/meta/format.json
+++ b/meta/format.json
@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/format",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/format": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Format vocabulary meta-schema",
diff --git a/meta/hyper-schema.json b/meta/hyper-schema.json
index 3d230589..cd81bd87 100644
--- a/meta/hyper-schema.json
+++ b/meta/hyper-schema.json
@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/hyper-schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/hyper-schema",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/hyper-schema": true
-    },
     "$recursiveAnchor": true,
 
     "title": "JSON Hyper-Schema Vocabulary Schema",
diff --git a/meta/meta-data.json b/meta/meta-data.json
index da04cff6..28d3e8ab 100644
--- a/meta/meta-data.json
+++ b/meta/meta-data.json
@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/meta-data",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/meta-data": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Meta-data vocabulary meta-schema",
diff --git a/meta/validation.json b/meta/validation.json
index 9f59677b..5356df92 100644
--- a/meta/validation.json
+++ b/meta/validation.json
@@ -1,9 +1,6 @@
 {
     "$schema": "https://json-schema.org/draft/2019-09/schema",
     "$id": "https://json-schema.org/draft/2019-09/meta/validation",
-    "$vocabulary": {
-        "https://json-schema.org/draft/2019-09/vocab/validation": true
-    },
     "$recursiveAnchor": true,
 
     "title": "Validation vocabulary meta-schema",
diff --git a/output/schema.json b/output/schema.json
index 7cf4c4ac..bef85935 100644
--- a/output/schema.json
+++ b/output/schema.json
@@ -46,20 +46,20 @@
         },
         {
           "if": {
-            "oneOf": [
+            "anyOf": [
               {
                 "properties": {
                   "keywordLocation": {
-                    "pattern": ".*/$ref/.*"
+                    "pattern": "/\\$ref/"
                   }
-                }    
+                }
               },
               {
                 "properties": {
                   "keywordLocation": {
-                    "pattern": ".*/$recursiveRef/.*"
+                    "pattern": "/\\$recursiveRef/"
                   }
-                }    
+                }
               }
             ]
           },
@@ -79,8 +79,8 @@
       },
       "required": [ "valid" ]
     },
-    "basic": { "$ref": "#/outputUnit" },
-    "detailed": { "$ref": "#/outputUnit" },
-    "verbose": { "$ref": "#/outputUnit" }
+    "basic": { "$ref": "#/$defs/outputUnit" },
+    "detailed": { "$ref": "#/$defs/outputUnit" },
+    "verbose": { "$ref": "#/$defs/outputUnit" }
   }
 }