diff --git a/doc/policy_tutorial/POLICY_IMPLEMENTATION.md b/doc/policy_tutorial/POLICY_IMPLEMENTATION.md
index 26004ea87..d3c5e1d4a 100644
--- a/doc/policy_tutorial/POLICY_IMPLEMENTATION.md
+++ b/doc/policy_tutorial/POLICY_IMPLEMENTATION.md
@@ -29,7 +29,7 @@ And while we are changing the schema, we might as well provide a neat summary an
 The new configuration schema looks like this:
 ```json
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "hello_world",
   "summary": "Parameter converter and secret checker",
   "description": [
diff --git a/doc/policy_tutorial/POLICY_SCAFFOLD.md b/doc/policy_tutorial/POLICY_SCAFFOLD.md
index 852cbb415..56eeb624c 100644
--- a/doc/policy_tutorial/POLICY_SCAFFOLD.md
+++ b/doc/policy_tutorial/POLICY_SCAFFOLD.md
@@ -53,7 +53,7 @@ The source code of the policy in the directory src/gateway/apicast/policy/hello_
 * aplicast-policy.json: The APIcast gateway is configured using a JSON document. Policies requiring configuration also use this JSON document. The apicast-policy.json file is a JSON schema file where configuration properties for the policy can be defined. The next section looks into configuration properties and this file in more detail.
 ```json
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "hello_world",
   "summary": "TODO: write policy summary",
   "description": [
diff --git a/doc/policy_tutorial/apicast/gateway/src/apicast/policy/hello_world/apicast-policy.json b/doc/policy_tutorial/apicast/gateway/src/apicast/policy/hello_world/apicast-policy.json
index 9978e1ae9..df27cbd7b 100644
--- a/doc/policy_tutorial/apicast/gateway/src/apicast/policy/hello_world/apicast-policy.json
+++ b/doc/policy_tutorial/apicast/gateway/src/apicast/policy/hello_world/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "hello_world",
   "summary": "Parameter converter and secret checker",
   "description": [
diff --git a/examples/policies/ngx-example/1.0.0/apicast-policy.json b/examples/policies/ngx-example/1.0.0/apicast-policy.json
index c89c7955f..e3a698770 100644
--- a/examples/policies/ngx-example/1.0.0/apicast-policy.json
+++ b/examples/policies/ngx-example/1.0.0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Ngx example policy",
   "summary": "Sets request headers",
   "description":
diff --git a/examples/scaffold/policy/gateway/src/apicast/policy/{{policy.file}}/apicast-policy.json b/examples/scaffold/policy/gateway/src/apicast/policy/{{policy.file}}/apicast-policy.json
index 184575b5f..9e4fb6a29 100644
--- a/examples/scaffold/policy/gateway/src/apicast/policy/{{policy.file}}/apicast-policy.json
+++ b/examples/scaffold/policy/gateway/src/apicast/policy/{{policy.file}}/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "{{ policy.name }}",
   "summary": "{{ policy.summary }}",
   "description": [
diff --git a/gateway/src/apicast/policy/3scale_batcher/apicast-policy.json b/gateway/src/apicast/policy/3scale_batcher/apicast-policy.json
index 40ed9c0a5..fec08b1dc 100644
--- a/gateway/src/apicast/policy/3scale_batcher/apicast-policy.json
+++ b/gateway/src/apicast/policy/3scale_batcher/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "3scale Batcher",
   "summary": "Caches auths from 3scale backend and batches reports.",
   "description":
diff --git a/gateway/src/apicast/policy/3scale_referrer/apicast-policy.json b/gateway/src/apicast/policy/3scale_referrer/apicast-policy.json
index ca5288176..4065f4b69 100644
--- a/gateway/src/apicast/policy/3scale_referrer/apicast-policy.json
+++ b/gateway/src/apicast/policy/3scale_referrer/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "3scale Referrer",
   "summary": "Sends the 'Referer' to 3scale backend so it can be validated.",
   "description": "Sends the 'Referer' to 3scale backend for validation.",
diff --git a/gateway/src/apicast/policy/apicast/apicast-policy.json b/gateway/src/apicast/policy/apicast/apicast-policy.json
index fa6e76f43..78bd91543 100644
--- a/gateway/src/apicast/policy/apicast/apicast-policy.json
+++ b/gateway/src/apicast/policy/apicast/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "3scale APIcast",
   "summary": "Main functionality of APIcast to work with the 3scale API manager.",
   "description":
diff --git a/gateway/src/apicast/policy/caching/apicast-policy.json b/gateway/src/apicast/policy/caching/apicast-policy.json
index aa7808abb..c30e28e77 100644
--- a/gateway/src/apicast/policy/caching/apicast-policy.json
+++ b/gateway/src/apicast/policy/caching/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "3scale Auth Caching",
   "summary": "Controls how to cache authorizations returned by the 3scale backend.",
   "description":
diff --git a/gateway/src/apicast/policy/camel/apicast-policy.json b/gateway/src/apicast/policy/camel/apicast-policy.json
index b279e6a44..2a80a858d 100644
--- a/gateway/src/apicast/policy/camel/apicast-policy.json
+++ b/gateway/src/apicast/policy/camel/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Camel Service",
   "summary": "Adds an Camel proxy to the service.",
   "description": [
diff --git a/gateway/src/apicast/policy/content_caching/apicast-policy.json b/gateway/src/apicast/policy/content_caching/apicast-policy.json
index a5c4d7346..c690eed87 100644
--- a/gateway/src/apicast/policy/content_caching/apicast-policy.json
+++ b/gateway/src/apicast/policy/content_caching/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Content caching",
   "summary": "Option to enable content caching on responses.",
   "description": [
diff --git a/gateway/src/apicast/policy/cors/apicast-policy.json b/gateway/src/apicast/policy/cors/apicast-policy.json
index da1201eca..5e3d6e560 100644
--- a/gateway/src/apicast/policy/cors/apicast-policy.json
+++ b/gateway/src/apicast/policy/cors/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "CORS Request Handling",
   "summary": "Enables CORS (Cross Origin Resource Sharing) request handling.",
   "description":
diff --git a/gateway/src/apicast/policy/custom_metrics/apicast-policy.json b/gateway/src/apicast/policy/custom_metrics/apicast-policy.json
index ec6b71632..0dfb2aa09 100644
--- a/gateway/src/apicast/policy/custom_metrics/apicast-policy.json
+++ b/gateway/src/apicast/policy/custom_metrics/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Custom Metrics",
   "summary": "Custom metrics on Nginx post actions ",
   "description": [
diff --git a/gateway/src/apicast/policy/default_credentials/apicast-policy.json b/gateway/src/apicast/policy/default_credentials/apicast-policy.json
index cf1d04ba9..56c89d01c 100644
--- a/gateway/src/apicast/policy/default_credentials/apicast-policy.json
+++ b/gateway/src/apicast/policy/default_credentials/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Anonymous Access",
   "summary": "Provides default credentials for unauthenticated requests.",
   "description":
diff --git a/gateway/src/apicast/policy/echo/apicast-policy.json b/gateway/src/apicast/policy/echo/apicast-policy.json
index 411d17f8c..3d3963c66 100644
--- a/gateway/src/apicast/policy/echo/apicast-policy.json
+++ b/gateway/src/apicast/policy/echo/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Echo",
   "summary": "Prints the request back to the client and optionally sets a status code.",
   "description":
diff --git a/gateway/src/apicast/policy/fapi/apicast-policy.json b/gateway/src/apicast/policy/fapi/apicast-policy.json
index 2e7ac6f66..a17975fa6 100644
--- a/gateway/src/apicast/policy/fapi/apicast-policy.json
+++ b/gateway/src/apicast/policy/fapi/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "The Financial-grade API (FAPI)",
   "summary": "Support FAPI profiles",
   "description": ["This policy adding support for Financial-grade API (API) profiles"
diff --git a/gateway/src/apicast/policy/grpc/apicast-policy.json b/gateway/src/apicast/policy/grpc/apicast-policy.json
index 9941d462c..e69e4ada4 100644
--- a/gateway/src/apicast/policy/grpc/apicast-policy.json
+++ b/gateway/src/apicast/policy/grpc/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "HTTP2 Endpoint",
   "summary": "Main functionality to enable HTTP2 endpoint reply.",
   "description":
diff --git a/gateway/src/apicast/policy/headers/apicast-policy.json b/gateway/src/apicast/policy/headers/apicast-policy.json
index 5d2cd4ece..a162eea28 100644
--- a/gateway/src/apicast/policy/headers/apicast-policy.json
+++ b/gateway/src/apicast/policy/headers/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Header Modification",
   "summary": "Allows to include custom headers.",
   "description":
diff --git a/gateway/src/apicast/policy/http_proxy/apicast-policy.json b/gateway/src/apicast/policy/http_proxy/apicast-policy.json
index 217ff8fc9..fd078266e 100644
--- a/gateway/src/apicast/policy/http_proxy/apicast-policy.json
+++ b/gateway/src/apicast/policy/http_proxy/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Proxy Service",
   "summary": "Adds an HTTP proxy to the service.",
   "description": [
diff --git a/gateway/src/apicast/policy/ip_check/apicast-policy.json b/gateway/src/apicast/policy/ip_check/apicast-policy.json
index 00e9d0956..09317305a 100644
--- a/gateway/src/apicast/policy/ip_check/apicast-policy.json
+++ b/gateway/src/apicast/policy/ip_check/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "IP Check",
   "summary": "Accepts or denies a request based on the IP.",
   "description": [
diff --git a/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json b/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json
index 6d6e0bcbf..520586939 100644
--- a/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json
+++ b/gateway/src/apicast/policy/jwt_claim_check/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "JWT Claim Check",
   "summary": "Allow or deny traffic based on a JWT claim",
   "description": [
diff --git a/gateway/src/apicast/policy/jwt_parser/apicast-policy.json b/gateway/src/apicast/policy/jwt_parser/apicast-policy.json
index ff4a11bc6..a1a5685c9 100644
--- a/gateway/src/apicast/policy/jwt_parser/apicast-policy.json
+++ b/gateway/src/apicast/policy/jwt_parser/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "JWT Parser",
   "summary": "Parse JWT",
   "description": ["This policy parse JWT token from Authorization header"],
diff --git a/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json b/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json
index 0638e031f..91971191e 100644
--- a/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json
+++ b/gateway/src/apicast/policy/keycloak_role_check/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "RH-SSO/Keycloak Role Check",
   "summary": "Adds role check with Keycloak.",
   "description": [
diff --git a/gateway/src/apicast/policy/liquid_context_debug/apicast-policy.json b/gateway/src/apicast/policy/liquid_context_debug/apicast-policy.json
index e66ebb962..2fd7911ca 100644
--- a/gateway/src/apicast/policy/liquid_context_debug/apicast-policy.json
+++ b/gateway/src/apicast/policy/liquid_context_debug/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Liquid Context Debug",
   "summary": "Inspects the available liquid context.",
   "description": [
diff --git a/gateway/src/apicast/policy/logging/apicast-policy.json b/gateway/src/apicast/policy/logging/apicast-policy.json
index 8fa7eb63d..5a95ac892 100644
--- a/gateway/src/apicast/policy/logging/apicast-policy.json
+++ b/gateway/src/apicast/policy/logging/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Logging",
   "summary": "Controls logging.",
   "description": [
diff --git a/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json b/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json
index d85c586ca..e75dbf72a 100644
--- a/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json
+++ b/gateway/src/apicast/policy/maintenance_mode/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Maintenance Mode",
   "summary": "Rejects incoming requests. Useful for maintenance periods.",
   "description": [
diff --git a/gateway/src/apicast/policy/manifest-schema.json b/gateway/src/apicast/policy/manifest-schema.json
index d99e02d40..00d7c64f6 100644
--- a/gateway/src/apicast/policy/manifest-schema.json
+++ b/gateway/src/apicast/policy/manifest-schema.json
@@ -1,11 +1,11 @@
 {
-  "$id": "http://apicast.io/policy-v1.1/schema#manifest",
+  "$id": "http://apicast.io/policy-v1.1/schema",
   "type": "object",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {
     "schema": {
       "$id": "#/definitions/schema",
-      "$ref": "http://json-schema.org/draft-07/schema#",
+      "$schema": "http://json-schema.org/draft-07/schema#",
       "default": {}
     },
     "version": {
diff --git a/gateway/src/apicast/policy/nginx_filters/apicast-policy.json b/gateway/src/apicast/policy/nginx_filters/apicast-policy.json
index 5dc8694bc..567a3e1dc 100644
--- a/gateway/src/apicast/policy/nginx_filters/apicast-policy.json
+++ b/gateway/src/apicast/policy/nginx_filters/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Nginx Filter",
   "summary": "Skip nginx filters on certain headers",
   "description": [
diff --git a/gateway/src/apicast/policy/oauth_mtls/apicast-policy.json b/gateway/src/apicast/policy/oauth_mtls/apicast-policy.json
index fde4b9117..d92268a6b 100644
--- a/gateway/src/apicast/policy/oauth_mtls/apicast-policy.json
+++ b/gateway/src/apicast/policy/oauth_mtls/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "OAuth 2.0 Mutual TLS Client Authentication",
   "summary": "Configure OAuth 2.0 Mutual TLS Client Authentication.",
   "description": ["This policy executes OAuth 2.0 Mutual TLS Client Authentication ",
diff --git a/gateway/src/apicast/policy/on_failed/apicast-policy.json b/gateway/src/apicast/policy/on_failed/apicast-policy.json
index 3f3d13943..c4e590d54 100644
--- a/gateway/src/apicast/policy/on_failed/apicast-policy.json
+++ b/gateway/src/apicast/policy/on_failed/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "On fail",
   "summary": "Block request if any policy fails",
   "description": "When a policy fails, this policy allows to set an error message back to the user and stop processing the request to the upstream API.",
diff --git a/gateway/src/apicast/policy/payload_limits/apicast-policy.json b/gateway/src/apicast/policy/payload_limits/apicast-policy.json
index 57439f686..4afa720c2 100644
--- a/gateway/src/apicast/policy/payload_limits/apicast-policy.json
+++ b/gateway/src/apicast/policy/payload_limits/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Response/Request content limits",
   "summary": "Limit request or response base on the size of the content",
   "description": [
diff --git a/gateway/src/apicast/policy/rate_limit/apicast-policy.json b/gateway/src/apicast/policy/rate_limit/apicast-policy.json
index 536981ff4..3678c0319 100644
--- a/gateway/src/apicast/policy/rate_limit/apicast-policy.json
+++ b/gateway/src/apicast/policy/rate_limit/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Edge Limiting",
   "summary": "Adds rate limit.",
   "description": ["This policy adds rate limit."],
diff --git a/gateway/src/apicast/policy/rate_limit_headers/apicast-policy.json b/gateway/src/apicast/policy/rate_limit_headers/apicast-policy.json
index 825e248b7..df0b15d0c 100644
--- a/gateway/src/apicast/policy/rate_limit_headers/apicast-policy.json
+++ b/gateway/src/apicast/policy/rate_limit_headers/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Rate Limits Headers",
   "summary": "Set rate limit headers on response",
   "description":
diff --git a/gateway/src/apicast/policy/request_unbuffered/apicast-policy.json b/gateway/src/apicast/policy/request_unbuffered/apicast-policy.json
index 9b26e5ea7..c8f347286 100644
--- a/gateway/src/apicast/policy/request_unbuffered/apicast-policy.json
+++ b/gateway/src/apicast/policy/request_unbuffered/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Request Unbuffered",
   "summary": "Disable request buffering",
   "description": [
diff --git a/gateway/src/apicast/policy/retry/apicast-policy.json b/gateway/src/apicast/policy/retry/apicast-policy.json
index 98579c060..789cc11c0 100644
--- a/gateway/src/apicast/policy/retry/apicast-policy.json
+++ b/gateway/src/apicast/policy/retry/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Retry",
   "summary": "Allows to retry requests to the upstream",
   "description": "Allows to retry requests to the upstream",
diff --git a/gateway/src/apicast/policy/rewrite_url_captures/apicast-policy.json b/gateway/src/apicast/policy/rewrite_url_captures/apicast-policy.json
index 0fe784494..db9f3a9c4 100644
--- a/gateway/src/apicast/policy/rewrite_url_captures/apicast-policy.json
+++ b/gateway/src/apicast/policy/rewrite_url_captures/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "URL Rewriting with Captures",
   "summary": "Captures arguments in a URL and rewrites the URL using them.",
   "description":
diff --git a/gateway/src/apicast/policy/routing/apicast-policy.json b/gateway/src/apicast/policy/routing/apicast-policy.json
index 7df1bb066..ca1e855ed 100644
--- a/gateway/src/apicast/policy/routing/apicast-policy.json
+++ b/gateway/src/apicast/policy/routing/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Routing",
   "summary": "Allows to modify the upstream URL of the request.",
   "description": [
diff --git a/gateway/src/apicast/policy/soap/apicast-policy.json b/gateway/src/apicast/policy/soap/apicast-policy.json
index e0d201276..29f1849a6 100644
--- a/gateway/src/apicast/policy/soap/apicast-policy.json
+++ b/gateway/src/apicast/policy/soap/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "SOAP",
   "summary": "Adds support for a small subset of SOAP.",
   "description":
diff --git a/gateway/src/apicast/policy/statuscode_overwrite/apicast-policy.json b/gateway/src/apicast/policy/statuscode_overwrite/apicast-policy.json
index 575e7cdbf..4372cf85d 100644
--- a/gateway/src/apicast/policy/statuscode_overwrite/apicast-policy.json
+++ b/gateway/src/apicast/policy/statuscode_overwrite/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "HTTP Status Code Overwrite",
   "summary": "Modify the HTTP status code returned by the upstream",
   "description": [
diff --git a/gateway/src/apicast/policy/tls/apicast-policy.json b/gateway/src/apicast/policy/tls/apicast-policy.json
index 1cc1eace8..76935d96c 100644
--- a/gateway/src/apicast/policy/tls/apicast-policy.json
+++ b/gateway/src/apicast/policy/tls/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "TLS Termination",
   "summary": "Configure TLS termination certificates",
   "description": [
diff --git a/gateway/src/apicast/policy/tls_validation/apicast-policy.json b/gateway/src/apicast/policy/tls_validation/apicast-policy.json
index 5c499c38c..c2e4a3f2e 100644
--- a/gateway/src/apicast/policy/tls_validation/apicast-policy.json
+++ b/gateway/src/apicast/policy/tls_validation/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "TLS Client Certificate Validation",
   "summary": "Validate certificates provided by the client during TLS handshake (HTTPS).",
   "description": [
diff --git a/gateway/src/apicast/policy/token_introspection/apicast-policy.json b/gateway/src/apicast/policy/token_introspection/apicast-policy.json
index 2880a24cd..c7a31263b 100644
--- a/gateway/src/apicast/policy/token_introspection/apicast-policy.json
+++ b/gateway/src/apicast/policy/token_introspection/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/poolicy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "OAuth 2.0 Token Introspection",
   "summary": "Configures OAuth 2.0 Token Introspection.",
   "description": ["This policy executes OAuth 2.0 Token Introspection ",
diff --git a/gateway/src/apicast/policy/upstream/apicast-policy.json b/gateway/src/apicast/policy/upstream/apicast-policy.json
index 986d00f32..6b40db004 100644
--- a/gateway/src/apicast/policy/upstream/apicast-policy.json
+++ b/gateway/src/apicast/policy/upstream/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Upstream",
   "summary": "Allows to modify the upstream URL of the request based on its path.",
   "description":
diff --git a/gateway/src/apicast/policy/upstream_connection/apicast-policy.json b/gateway/src/apicast/policy/upstream_connection/apicast-policy.json
index e047b6c8a..004fedaf0 100644
--- a/gateway/src/apicast/policy/upstream_connection/apicast-policy.json
+++ b/gateway/src/apicast/policy/upstream_connection/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Upstream Connection",
   "summary": "Allows to configure several options for the connections to the upstream",
   "description": "Allows to configure several options for the connections to the upstream",
diff --git a/gateway/src/apicast/policy/upstream_mtls/apicast-policy.json b/gateway/src/apicast/policy/upstream_mtls/apicast-policy.json
index db577e18a..fdaf43c08 100644
--- a/gateway/src/apicast/policy/upstream_mtls/apicast-policy.json
+++ b/gateway/src/apicast/policy/upstream_mtls/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Upstream Mutual TLS",
   "summary": "Certificates to be used with the upstream API",
   "description": "With this policy a new TLS connection with the upstream API will be used with the certificates set in the config",
diff --git a/gateway/src/apicast/policy/url_rewriting/apicast-policy.json b/gateway/src/apicast/policy/url_rewriting/apicast-policy.json
index de3a9beab..fcf611d97 100644
--- a/gateway/src/apicast/policy/url_rewriting/apicast-policy.json
+++ b/gateway/src/apicast/policy/url_rewriting/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "URL Rewriting",
   "summary": "Allows to modify the path of a request.",
   "description":
diff --git a/gateway/src/apicast/policy/websocket/apicast-policy.json b/gateway/src/apicast/policy/websocket/apicast-policy.json
index 5f3f68444..5f92728ae 100644
--- a/gateway/src/apicast/policy/websocket/apicast-policy.json
+++ b/gateway/src/apicast/policy/websocket/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1.1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1.1/schema",
   "name": "Websocket",
   "summary": "Allows websocket connection pass through.",
   "description": [
diff --git a/spec/fixtures/policies/test/1.0.0-0/apicast-policy.json b/spec/fixtures/policies/test/1.0.0-0/apicast-policy.json
index 33be53be9..5ec5c729e 100644
--- a/spec/fixtures/policies/test/1.0.0-0/apicast-policy.json
+++ b/spec/fixtures/policies/test/1.0.0-0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Example policy",
   "summary": "An example policy to be used in unit tests.",
   "version": "1.0.0-0",
diff --git a/spec/fixtures/policies/test/2.0.0-0/apicast-policy.json b/spec/fixtures/policies/test/2.0.0-0/apicast-policy.json
index 58400f604..8c7166abf 100644
--- a/spec/fixtures/policies/test/2.0.0-0/apicast-policy.json
+++ b/spec/fixtures/policies/test/2.0.0-0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Example policy",
   "summary": "An example policy to be used in unit tests.",
   "version": "2.0.0-0",
diff --git a/t/fixtures/policies/deny/1.0.0/apicast-policy.json b/t/fixtures/policies/deny/1.0.0/apicast-policy.json
index ef06cfa19..658d5192f 100644
--- a/t/fixtures/policies/deny/1.0.0/apicast-policy.json
+++ b/t/fixtures/policies/deny/1.0.0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Deny policy",
   "summary": "A policy that denies requests. To be used in integration tests.",
   "version": "1.0.0",
diff --git a/t/fixtures/policies/error_policy/1.0.0/apicast-policy.json b/t/fixtures/policies/error_policy/1.0.0/apicast-policy.json
index b418022f7..f66a93721 100644
--- a/t/fixtures/policies/error_policy/1.0.0/apicast-policy.json
+++ b/t/fixtures/policies/error_policy/1.0.0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Example policy",
   "summary": "An example policy to be used in integration tests. It just raises an error",
   "version": "1.0.0",
diff --git a/t/fixtures/policies/example_policy/1.0.0/apicast-policy.json b/t/fixtures/policies/example_policy/1.0.0/apicast-policy.json
index f6c02fddf..cc99f02f0 100644
--- a/t/fixtures/policies/example_policy/1.0.0/apicast-policy.json
+++ b/t/fixtures/policies/example_policy/1.0.0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Example policy",
   "summary": "An example policy to be used in integration tests.",
   "version": "1.0.0",
diff --git a/t/fixtures/policies_endpoint_test/policies/example1/1.0.0/apicast-policy.json b/t/fixtures/policies_endpoint_test/policies/example1/1.0.0/apicast-policy.json
index 9f662bfef..96c5149a9 100644
--- a/t/fixtures/policies_endpoint_test/policies/example1/1.0.0/apicast-policy.json
+++ b/t/fixtures/policies_endpoint_test/policies/example1/1.0.0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Example policy 1",
   "summary": "Just an example.",
   "version": "1.0.0",
diff --git a/t/fixtures/policies_endpoint_test/policies/example2/1.0.0/apicast-policy.json b/t/fixtures/policies_endpoint_test/policies/example2/1.0.0/apicast-policy.json
index 185b5baed..703cebaf7 100644
--- a/t/fixtures/policies_endpoint_test/policies/example2/1.0.0/apicast-policy.json
+++ b/t/fixtures/policies_endpoint_test/policies/example2/1.0.0/apicast-policy.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "http://apicast.io/policy-v1/schema#manifest#",
+  "$schema": "http://apicast.io/policy-v1/schema",
   "name": "Example policy 2",
   "summary": "Just an example with a version mismatch.",
   "version": "2.0.0",