diff --git a/app/_hub/kong-inc/correlation-id/1.0.x.md b/app/_hub/kong-inc/correlation-id/_1.0.x.md
similarity index 100%
rename from app/_hub/kong-inc/correlation-id/1.0.x.md
rename to app/_hub/kong-inc/correlation-id/_1.0.x.md
diff --git a/app/_hub/kong-inc/correlation-id/versions.yml b/app/_hub/kong-inc/correlation-id/versions.yml
index 8b8c4b784126..f10acb0de02f 100644
--- a/app/_hub/kong-inc/correlation-id/versions.yml
+++ b/app/_hub/kong-inc/correlation-id/versions.yml
@@ -1,3 +1,14 @@
-- release: 2.0.x
-- release: 1.0.x
-- release: 0.1.x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.1.x: _1.0.x
+
+overrides:
+  2.8.x: 2.0.2
+  2.7.x: 2.0.2
+  2.6.x: 2.0.2
+  2.5.x: 0.4.4
+  2.4.x: 2.0.2
+  2.3.x: 2.0.2
+  2.2.x: 2.0.1
+  2.1.x: 2.0.1
diff --git a/app/_hub/kong-inc/datadog/3.0.x.md b/app/_hub/kong-inc/datadog/_3.0.x.md
similarity index 100%
rename from app/_hub/kong-inc/datadog/3.0.x.md
rename to app/_hub/kong-inc/datadog/_3.0.x.md
diff --git a/app/_hub/kong-inc/datadog/3.1.x.md b/app/_hub/kong-inc/datadog/_3.1.x.md
similarity index 100%
rename from app/_hub/kong-inc/datadog/3.1.x.md
rename to app/_hub/kong-inc/datadog/_3.1.x.md
diff --git a/app/_hub/kong-inc/datadog/versions.yml b/app/_hub/kong-inc/datadog/versions.yml
index 5a08650ca4b6..b4a4731fc5f1 100644
--- a/app/_hub/kong-inc/datadog/versions.yml
+++ b/app/_hub/kong-inc/datadog/versions.yml
@@ -1,4 +1,19 @@
-- release: 3.1.x
-- release: 3.0.x
-- release: 1.0-x
-- release: 0.1-x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.6.x: _3.1.x
+  2.5.x: _3.1.x
+  2.4.x: _3.0.x
+  2.3.x: _3.0.x
+  2.2.x: _3.0.x
+  2.1.x: _3.0.x
+
+overrides:
+  2.8.x: 3.1.1
+  2.7.x: 3.1.0
+  2.6.x: 3.0.1
+  2.5.x: 3.0.1
+  2.4.x: 3.0.1
+  2.3.x: 3.0.1
+  2.2.x: 3.0.1
+  2.1.x: 3.0.1
diff --git a/app/_hub/kong-inc/file-log/2.0.x.md b/app/_hub/kong-inc/file-log/_2.0.x.md
similarity index 100%
rename from app/_hub/kong-inc/file-log/2.0.x.md
rename to app/_hub/kong-inc/file-log/_2.0.x.md
diff --git a/app/_hub/kong-inc/file-log/versions.yml b/app/_hub/kong-inc/file-log/versions.yml
index bc466d57ec2e..35b5148d9896 100644
--- a/app/_hub/kong-inc/file-log/versions.yml
+++ b/app/_hub/kong-inc/file-log/versions.yml
@@ -1,3 +1,16 @@
-- release: 2.0.x
-- release: 1.0.x
-- release: 0.1-x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.3.x: _2.0.x
+  2.2.x: _2.0.x
+  2.1.x: _2.0.x
+
+overrides:
+  2.8.x: 2.1.0
+  2.7.x: 2.1.0
+  2.6.x: 2.1.0
+  2.5.x: 2.1.0
+  2.4.x: 2.1.0
+  2.3.x: 2.0.2
+  2.2.x: 2.0.2
+  2.1.x: 2.0.2
diff --git a/app/_hub/kong-inc/forward-proxy/1.0.5.md b/app/_hub/kong-inc/forward-proxy/_1.0.5.md
similarity index 100%
rename from app/_hub/kong-inc/forward-proxy/1.0.5.md
rename to app/_hub/kong-inc/forward-proxy/_1.0.5.md
diff --git a/app/_hub/kong-inc/forward-proxy/1.1.x.md b/app/_hub/kong-inc/forward-proxy/_1.1.x.md
similarity index 100%
rename from app/_hub/kong-inc/forward-proxy/1.1.x.md
rename to app/_hub/kong-inc/forward-proxy/_1.1.x.md
diff --git a/app/_hub/kong-inc/forward-proxy/versions.yml b/app/_hub/kong-inc/forward-proxy/versions.yml
index 973e1e6a0dd0..0a2339bf8c9b 100644
--- a/app/_hub/kong-inc/forward-proxy/versions.yml
+++ b/app/_hub/kong-inc/forward-proxy/versions.yml
@@ -1,9 +1,20 @@
-- release: 1.2.x
-- release: 1.1.x
-- release: 1.0.5
-- release: 0.36-x
-- release: 0.35-x
-- release: 0.34-x
-- release: 0.33-x
-- release: 0.32-x
-- release: 0.31-x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.7.x: _1.1.x
+  2.6.x: _1.0.5
+  2.5.x: _1.0.5
+  2.4.x: _1.0.5
+  2.3.x: _1.0.5
+  2.2.x: _1.0.5
+  2.1.x: _1.0.5
+
+overrides:
+  2.8.x: 1.2.0
+  2.7.x: 1.1.0
+  2.6.x: 1.0.5
+  2.5.x: 1.0.5
+  2.4.x: 1.0.5
+  2.3.x: 1.0.4
+  2.2.x: 1.0.4
+  2.1.x: 1.0.4
diff --git a/app/_hub/kong-inc/jwt-signer/1.3-x.md b/app/_hub/kong-inc/jwt-signer/_1.3-x.md
similarity index 100%
rename from app/_hub/kong-inc/jwt-signer/1.3-x.md
rename to app/_hub/kong-inc/jwt-signer/_1.3-x.md
diff --git a/app/_hub/kong-inc/jwt-signer/2.2.x.md b/app/_hub/kong-inc/jwt-signer/_2.2.x.md
similarity index 100%
rename from app/_hub/kong-inc/jwt-signer/2.2.x.md
rename to app/_hub/kong-inc/jwt-signer/_2.2.x.md
diff --git a/app/_hub/kong-inc/jwt-signer/2.4.x.md b/app/_hub/kong-inc/jwt-signer/_2.4.x.md
similarity index 100%
rename from app/_hub/kong-inc/jwt-signer/2.4.x.md
rename to app/_hub/kong-inc/jwt-signer/_2.4.x.md
diff --git a/app/_hub/kong-inc/jwt-signer/versions.yml b/app/_hub/kong-inc/jwt-signer/versions.yml
index 4d18d87ced56..b53bfe793b14 100644
--- a/app/_hub/kong-inc/jwt-signer/versions.yml
+++ b/app/_hub/kong-inc/jwt-signer/versions.yml
@@ -1,7 +1,19 @@
-- release: 2.7.x
-- release: 2.3.x
-- release: 1.3.x
-- release: 0.36-x
-- release: 0.35-x
-- release: 0.34-x
-- release: 0.33-x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.6.x: _2.4.x
+  2.5.x: _2.4.x
+  2.4.x: _2.2.x
+  2.3.x: _2.2.x
+  2.2.x: _2.2.x
+  2.1.x: _1.3-x
+
+overrides:
+  2.8.x: 1.9.1
+  2.7.x: 1.9.0
+  2.6.x: 1.8.0
+  2.5.x: 1.7.0
+  2.4.x: 1.7.0
+  2.3.x: 1.7.0
+  2.2.x: 1.7.0
+  2.1.x: 1.7.0
diff --git a/app/_hub/kong-inc/kafka-log/0.1.x.md b/app/_hub/kong-inc/kafka-log/_0.1.x.md
similarity index 100%
rename from app/_hub/kong-inc/kafka-log/0.1.x.md
rename to app/_hub/kong-inc/kafka-log/_0.1.x.md
diff --git a/app/_hub/kong-inc/kafka-log/0.2.x.md b/app/_hub/kong-inc/kafka-log/_0.2.x.md
similarity index 100%
rename from app/_hub/kong-inc/kafka-log/0.2.x.md
rename to app/_hub/kong-inc/kafka-log/_0.2.x.md
diff --git a/app/_hub/kong-inc/kafka-log/0.3.x.md b/app/_hub/kong-inc/kafka-log/_0.3.x.md
similarity index 100%
rename from app/_hub/kong-inc/kafka-log/0.3.x.md
rename to app/_hub/kong-inc/kafka-log/_0.3.x.md
diff --git a/app/_hub/kong-inc/kafka-log/versions.yml b/app/_hub/kong-inc/kafka-log/versions.yml
index 0d46db4aa615..451183e6e35b 100644
--- a/app/_hub/kong-inc/kafka-log/versions.yml
+++ b/app/_hub/kong-inc/kafka-log/versions.yml
@@ -1,4 +1,20 @@
-- release: 0.4.x
-- release: 0.3.x
-- release: 0.2.x
-- release: 0.1.x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.7.x: _0.3.x
+  2.6.x: _0.2.x
+  2.5.x: _0.1.x
+  2.4.x: _0.1.x
+  2.3.x: _0.1.x
+  2.2.x: _0.1.x
+  2.1.x: _0.1.x
+
+overrides:
+  2.8.x: 0.4.0
+  2.7.x: 0.3.0
+  2.6.x: 0.2.0
+  2.5.x: 0.1.1
+  2.4.x: 0.1.1
+  2.3.x: 0.1.1
+  2.2.x: 0.1.1
+  2.1.x: 0.1.0
diff --git a/app/_hub/kong-inc/kafka-upstream/0.1.x.md b/app/_hub/kong-inc/kafka-upstream/_0.1.x.md
similarity index 100%
rename from app/_hub/kong-inc/kafka-upstream/0.1.x.md
rename to app/_hub/kong-inc/kafka-upstream/_0.1.x.md
diff --git a/app/_hub/kong-inc/kafka-upstream/0.2.x.md b/app/_hub/kong-inc/kafka-upstream/_0.2.x.md
similarity index 100%
rename from app/_hub/kong-inc/kafka-upstream/0.2.x.md
rename to app/_hub/kong-inc/kafka-upstream/_0.2.x.md
diff --git a/app/_hub/kong-inc/kafka-upstream/0.3.x.md b/app/_hub/kong-inc/kafka-upstream/_0.3.x.md
similarity index 100%
rename from app/_hub/kong-inc/kafka-upstream/0.3.x.md
rename to app/_hub/kong-inc/kafka-upstream/_0.3.x.md
diff --git a/app/_hub/kong-inc/kafka-upstream/versions.yml b/app/_hub/kong-inc/kafka-upstream/versions.yml
index 0d46db4aa615..130b2acf811f 100644
--- a/app/_hub/kong-inc/kafka-upstream/versions.yml
+++ b/app/_hub/kong-inc/kafka-upstream/versions.yml
@@ -1,4 +1,20 @@
-- release: 0.4.x
-- release: 0.3.x
-- release: 0.2.x
-- release: 0.1.x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.7.x: _0.3.x
+  2.6.x: _0.2.x
+  2.5.x: _0.1.x
+  2.4.x: _0.1.x
+  2.3.x: _0.1.x
+  2.2.x: _0.1.x
+  2.1.x: _0.1.x
+
+overrides:
+  2.8.x: 0.4.0
+  2.7.x: 0.3.0
+  2.6.x: 0.2.0
+  2.5.x: 0.0.2
+  2.4.x: 0.0.2
+  2.3.x: 0.0.2
+  2.2.x: 0.0.2
+  2.1.x: 0.0.2
diff --git a/app/_hub/kong-inc/openid-connect/2.0.x.md b/app/_hub/kong-inc/openid-connect/_2.0.x.md
similarity index 100%
rename from app/_hub/kong-inc/openid-connect/2.0.x.md
rename to app/_hub/kong-inc/openid-connect/_2.0.x.md
diff --git a/app/_hub/kong-inc/openid-connect/2.1.x.md b/app/_hub/kong-inc/openid-connect/_2.1.x.md
similarity index 100%
rename from app/_hub/kong-inc/openid-connect/2.1.x.md
rename to app/_hub/kong-inc/openid-connect/_2.1.x.md
diff --git a/app/_hub/kong-inc/openid-connect/2.2.x.md b/app/_hub/kong-inc/openid-connect/_2.2.x.md
similarity index 100%
rename from app/_hub/kong-inc/openid-connect/2.2.x.md
rename to app/_hub/kong-inc/openid-connect/_2.2.x.md
diff --git a/app/_hub/kong-inc/openid-connect/versions.yml b/app/_hub/kong-inc/openid-connect/versions.yml
index 653311260c89..bc049b7d2f93 100644
--- a/app/_hub/kong-inc/openid-connect/versions.yml
+++ b/app/_hub/kong-inc/openid-connect/versions.yml
@@ -1,11 +1,20 @@
-- release: 2.3.x
-- release: 2.2.x
-- release: 2.1.x
-- release: 2.0.x
-- release: 1.5.x
-- release: 1.3-x
-- release: 0.35-x
-- release: 0.34-x
-- release: 0.33-x
-- release: 0.32-x
-- release: 0.31-x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.7.x: _2.2.x
+  2.6.x: _2.1.x
+  2.5.x: _2.0.x
+  2.4.x: _2.0.x
+  2.3.x: _2.0.x
+  2.2.x: _2.0.x
+  2.1.x: _2.0.x
+
+overrides:
+  2.8.x: 2.3.0
+  2.7.x: 2.2.0
+  2.6.x: 2.1.1
+  2.5.x: 1.8.7
+  2.4.x: 1.8.5
+  2.3.x: 1.8.5
+  2.2.x: 1.9.1
+  2.1.x: 1.9.1
diff --git a/app/_hub/kong-inc/upstream-tls/0.35-x.md b/app/_hub/kong-inc/upstream-tls/0.35-x.md
deleted file mode 100644
index c5aebad48c0c..000000000000
--- a/app/_hub/kong-inc/upstream-tls/0.35-x.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-
-name: Upstream TLS
-publisher: Kong Inc.
-version: 0.35-x
-
-desc: Add TLS to your Services
-description: |
-  Enable TLS on upstream traffic by providing Kong with a list of trusted
-  certificates.
-
-enterprise: true
-type: plugin
-categories:
-  - authentication
-
-kong_version_compatibility:
-    enterprise_edition:
-      compatible:
-        - 0.35-x
-
-params:
-  name: upstream-tls
-  config:
-    - name: verify_mode
-      required: false
-      default: "`none`"
-      description: |
-        Sets the certification verification mode flags. `peer` enables client
-        peer validation. `none` disables client peer validation.
-    - name: verify_depth
-      required: false
-      default: "`4`"
-      description: |
-       Set the maximum validation chain depth
-    - name: trusted_certificates
-      required: true
-      default: 
-      description: |
-        PEM-encoded public certificate authorities of the upstream
-
----
-
-Upstream TLS can be added on top of an existing Service by executing the 
-following request on your Kong server:
-
-```bash
-$ curl -X POST http://kong:8001/services/1e6507e9-5c72-4dc2-9a3a-5131c4c5bea6/plugins \
-    --form "name=upstream-tls" \
-    --form "config.verify_mode=peer" \
-    --form "config.trusted_certificates=@path_to_cert.pem" \
-    --form "config.verify_depth=2"
-```
-
-`service`: the `id` or `name` of the Service that this plugin configuration will target.
-
-It can also be applied globally (for every Route, Service, or API) using the
-`http://kong:8001/plugins/` endpoint.
-
-### Known Issues
-
-Only one root CA cert can be used to verify against the upstream. If you upload a pem file with multiple certs it must be the first certificate in your uploaded pem file.
diff --git a/app/_hub/kong-inc/upstream-tls/_index.md b/app/_hub/kong-inc/upstream-tls/_index.md
deleted file mode 100644
index cc27fce7c5d8..000000000000
--- a/app/_hub/kong-inc/upstream-tls/_index.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-name: Upstream TLS
-publisher: Kong Inc.
-version: 0.36-x
-desc: Add TLS to your Services
-description: |
-  Enable TLS on upstream traffic by providing Kong with a list of trusted
-  certificates.
-  <div class="alert alert-warning">
-    <p><strong>This plugin is deprecated in Kong Gateway version 1.3, and removed in version 1.5.</strong></p>
-    <br>
-    <p><strong>Starting with <a href="https://docs.konghq.com/gateway/changelog/#changes-2">Kong 1.3.0.0</a>:</strong></p>
-    <p>To configure Upstream TLS, use the NGINX directives <code>proxy_ssl_trusted_certificate</code>, <code>proxy_ssl_verify</code>, and <code>proxy_ssl_verify_depth</code> instead of the Upstream TLS plugin. Instructions on how to inject NGINX directives to Kong can be found <a href="https://docs.konghq.com/2.1.x/configuration/#injecting-nginx-directives">here</a>. This plugin is <strong>only functional for Kong Gateway versions 0.35 and 0.36</strong>.</p>
-  </div>
-enterprise: true
-type: plugin
-kong_version_compatibility:
-  enterprise_edition:
-    compatible:
-      - 2.8.x
-      - 2.7.x
-      - 2.6.x
-      - 2.5.x
-      - 0.36-x
-      - 0.35-x
-params:
-  name: upstream-tls
-  config:
-    - name: verify_mode
-      required: false
-      default: '`none`'
-      description: |
-        Sets the certification verification mode flags. `peer` enables client
-        peer validation. `none` disables client peer validation.
-    - name: verify_depth
-      required: false
-      default: '`4`'
-      description: |
-        Set the maximum validation chain depth
-    - name: trusted_certificates
-      required: true
-      default: null
-      description: |
-        PEM-encoded public certificate authorities of the upstream
----
-
-In Enterprise versions 0.35 and 0.36, Upstream TLS can be added on top of an existing Service by executing the
-following request on your Kong server:
-
-```bash
-$ curl -X POST http://kong:8001/services/1e6507e9-5c72-4dc2-9a3a-5131c4c5bea6/plugins \
-    --form "name=upstream-tls" \
-    --form "config.verify_mode=peer" \
-    --form "config.trusted_certificates=@path_to_cert.pem" \
-    --form "config.verify_depth=2"
-```
-
-`service`: the `id` or `name` of the Service that this plugin configuration will target.
-
-It can also be applied globally (for every Route, Service, or API) using the
-`http://kong:8001/plugins/` endpoint.
-
-### Known Issues
-
-PATCH requests to the `trust_certificates` configuration will not take affect until Kong is reloaded. This can be accomplished with the `kong reload` command.
diff --git a/app/_hub/kong-inc/upstream-tls/versions.yml b/app/_hub/kong-inc/upstream-tls/versions.yml
deleted file mode 100644
index bbc2a7c8db92..000000000000
--- a/app/_hub/kong-inc/upstream-tls/versions.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-- release: 0.36-x
-- release: 0.35-x
diff --git a/app/_hub/kong-inc/vault-auth/0.2.2.md b/app/_hub/kong-inc/vault-auth/_0.2.2.md
similarity index 100%
rename from app/_hub/kong-inc/vault-auth/0.2.2.md
rename to app/_hub/kong-inc/vault-auth/_0.2.2.md
diff --git a/app/_hub/kong-inc/vault-auth/0.3.0.md b/app/_hub/kong-inc/vault-auth/_0.3.0.md
similarity index 100%
rename from app/_hub/kong-inc/vault-auth/0.3.0.md
rename to app/_hub/kong-inc/vault-auth/_0.3.0.md
diff --git a/app/_hub/kong-inc/vault-auth/versions.yml b/app/_hub/kong-inc/vault-auth/versions.yml
index 0177b0d8cbfa..b79b5cac43f2 100644
--- a/app/_hub/kong-inc/vault-auth/versions.yml
+++ b/app/_hub/kong-inc/vault-auth/versions.yml
@@ -1,8 +1,20 @@
-- release: 0.4.1
-- release: 0.4.0
-- release: 0.3.0
-- release: 0.2.2
-- release: 0.2.1
-- release: 0.2.0
-- release: 0.1.2
-- release: 0.1.0
+strategy: gateway
+delegate_releases: true
+sources:
+  2.7.x: _0.3.0
+  2.6.x: _0.2.2
+  2.5.x: _0.2.2
+  2.4.x: _0.2.2
+  2.3.x: _0.2.2
+  2.2.x: _0.2.2
+  2.1.x: _0.2.2
+
+overrides:
+  2.8.x: 0.4.1
+  2.7.x: 0.3.0
+  2.6.x: 0.2.2
+  2.5.x: 0.2.2
+  2.4.x: 0.2.2
+  2.3.x: 1.0.0
+  2.2.x: 1.0.0
+  2.1.x: 1.0.0
diff --git a/app/_hub/kong-inc/zipkin/1.1.x.md b/app/_hub/kong-inc/zipkin/_1.1.x.md
similarity index 100%
rename from app/_hub/kong-inc/zipkin/1.1.x.md
rename to app/_hub/kong-inc/zipkin/_1.1.x.md
diff --git a/app/_hub/kong-inc/zipkin/1.2.x.md b/app/_hub/kong-inc/zipkin/_1.2.x.md
similarity index 100%
rename from app/_hub/kong-inc/zipkin/1.2.x.md
rename to app/_hub/kong-inc/zipkin/_1.2.x.md
diff --git a/app/_hub/kong-inc/zipkin/1.3.x.md b/app/_hub/kong-inc/zipkin/_1.3.x.md
similarity index 100%
rename from app/_hub/kong-inc/zipkin/1.3.x.md
rename to app/_hub/kong-inc/zipkin/_1.3.x.md
diff --git a/app/_hub/kong-inc/zipkin/1.4.x.md b/app/_hub/kong-inc/zipkin/_1.4.x.md
similarity index 100%
rename from app/_hub/kong-inc/zipkin/1.4.x.md
rename to app/_hub/kong-inc/zipkin/_1.4.x.md
diff --git a/app/_hub/kong-inc/zipkin/versions.yml b/app/_hub/kong-inc/zipkin/versions.yml
index 139840d07629..9cf024722165 100644
--- a/app/_hub/kong-inc/zipkin/versions.yml
+++ b/app/_hub/kong-inc/zipkin/versions.yml
@@ -1,7 +1,19 @@
-- release: 1.5.x
-- release: 1.4.x
-- release: 1.3.x
-- release: 1.2.x
-- release: 1.1.x
-- release: 1.0.x
-- release: 0.1-x
+strategy: gateway
+delegate_releases: true
+sources:
+  2.6.x: _1.4.x
+  2.5.x: _1.4.x
+  2.4.x: _1.3.x
+  2.3.x: _1.2.x
+  2.2.x: _1.1.x
+  2.1.x: _1.1.x
+
+overrides:
+  2.8.x: 1.5.0
+  2.7.x: 1.2.1
+  2.6.x: 1.4.1
+  2.5.x: 1.4.1
+  2.4.x: 1.3.0
+  2.3.x: 1.2.0
+  2.2.x: 1.1.0
+  2.1.x: 1.1.0