diff --git a/.github/workflows/backport-trigger.yml b/.github/workflows/backport-trigger.yml
index 613e5fb..ee06412 100644
--- a/.github/workflows/backport-trigger.yml
+++ b/.github/workflows/backport-trigger.yml
@@ -27,4 +27,7 @@ jobs:
           fetch-depth: 0
 
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
+        uses: korthout/backport-action@be567af183754f6a5d831ae90f648954763f17f5 # v3
+        with:
+          github_token: ${{ secrets.UPBOUND_GITHUB_BOT_TOKEN }}
+          github_workspace: ${{ github.workspace }}
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 4d25ac1..ad037e6 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -25,4 +25,7 @@ jobs:
           fetch-depth: 0
 
       - name: Open Backport PR
-        uses: zeebe-io/backport-action@0193454f0c5947491d348f33a275c119f30eb736 # v3.2.1
+        uses: korthout/backport-action@be567af183754f6a5d831ae90f648954763f17f5 # v3
+        with:
+          github_token: ${{ secrets.UPBOUND_GITHUB_BOT_TOKEN }}
+          github_workspace: ${{ github.workspace }}
diff --git a/examples/cluster/cloudplatform/v1beta1/projectserviceidentity.yaml b/examples/cloudplatform/cluster/v1beta1/projectserviceidentity.yaml
similarity index 100%
rename from examples/cluster/cloudplatform/v1beta1/projectserviceidentity.yaml
rename to examples/cloudplatform/cluster/v1beta1/projectserviceidentity.yaml
diff --git a/examples/cluster/cloudplatform/v1beta1/serviceaccount.yaml b/examples/cloudplatform/cluster/v1beta1/serviceaccount.yaml
similarity index 100%
rename from examples/cluster/cloudplatform/v1beta1/serviceaccount.yaml
rename to examples/cloudplatform/cluster/v1beta1/serviceaccount.yaml
diff --git a/examples/namespaced/cloudplatform/v1beta1/projectserviceidentity.yaml b/examples/cloudplatform/namespaced/v1beta1/projectserviceidentity.yaml
similarity index 100%
rename from examples/namespaced/cloudplatform/v1beta1/projectserviceidentity.yaml
rename to examples/cloudplatform/namespaced/v1beta1/projectserviceidentity.yaml
diff --git a/examples/namespaced/cloudplatform/v1beta1/serviceaccount.yaml b/examples/cloudplatform/namespaced/v1beta1/serviceaccount.yaml
similarity index 100%
rename from examples/namespaced/cloudplatform/v1beta1/serviceaccount.yaml
rename to examples/cloudplatform/namespaced/v1beta1/serviceaccount.yaml
diff --git a/examples/cluster/gcp/.gitignore b/examples/cluster/gcp/.gitignore
deleted file mode 100644
index 4a424df..0000000
--- a/examples/cluster/gcp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-secret.yaml
diff --git a/examples/cluster/compute/v1beta1/healthcheck.yaml b/examples/compute/cluster/v1beta1/healthcheck.yaml
similarity index 100%
rename from examples/cluster/compute/v1beta1/healthcheck.yaml
rename to examples/compute/cluster/v1beta1/healthcheck.yaml
diff --git a/examples/cluster/compute/v1beta1/regionbackendservice.yaml b/examples/compute/cluster/v1beta1/regionbackendservice.yaml
similarity index 100%
rename from examples/cluster/compute/v1beta1/regionbackendservice.yaml
rename to examples/compute/cluster/v1beta1/regionbackendservice.yaml
diff --git a/examples/cluster/compute/v1beta1/regionsecuritypolicy.yaml b/examples/compute/cluster/v1beta1/regionsecuritypolicy.yaml
similarity index 100%
rename from examples/cluster/compute/v1beta1/regionsecuritypolicy.yaml
rename to examples/compute/cluster/v1beta1/regionsecuritypolicy.yaml
diff --git a/examples/namespaced/compute/v1beta1/healthcheck.yaml b/examples/compute/namespaced/v1beta1/healthcheck.yaml
similarity index 100%
rename from examples/namespaced/compute/v1beta1/healthcheck.yaml
rename to examples/compute/namespaced/v1beta1/healthcheck.yaml
diff --git a/examples/namespaced/compute/v1beta1/regionbackendservice.yaml b/examples/compute/namespaced/v1beta1/regionbackendservice.yaml
similarity index 100%
rename from examples/namespaced/compute/v1beta1/regionbackendservice.yaml
rename to examples/compute/namespaced/v1beta1/regionbackendservice.yaml
diff --git a/examples/namespaced/compute/v1beta1/regionsecuritypolicy.yaml b/examples/compute/namespaced/v1beta1/regionsecuritypolicy.yaml
similarity index 100%
rename from examples/namespaced/compute/v1beta1/regionsecuritypolicy.yaml
rename to examples/compute/namespaced/v1beta1/regionsecuritypolicy.yaml
diff --git a/examples/cluster/container/v1beta1/cluster.yaml b/examples/container/cluster/v1beta1/cluster.yaml
similarity index 100%
rename from examples/cluster/container/v1beta1/cluster.yaml
rename to examples/container/cluster/v1beta1/cluster.yaml
diff --git a/examples/cluster/container/v1beta1/nodepool.yaml b/examples/container/cluster/v1beta1/nodepool.yaml
similarity index 100%
rename from examples/cluster/container/v1beta1/nodepool.yaml
rename to examples/container/cluster/v1beta1/nodepool.yaml
diff --git a/examples/cluster/container/v1beta2/cluster.yaml b/examples/container/cluster/v1beta2/cluster.yaml
similarity index 100%
rename from examples/cluster/container/v1beta2/cluster.yaml
rename to examples/container/cluster/v1beta2/cluster.yaml
diff --git a/examples/cluster/container/v1beta2/nodepool.yaml b/examples/container/cluster/v1beta2/nodepool.yaml
similarity index 100%
rename from examples/cluster/container/v1beta2/nodepool.yaml
rename to examples/container/cluster/v1beta2/nodepool.yaml
diff --git a/examples/namespaced/container/v1beta1/cluster.yaml b/examples/container/namespaced/v1beta1/cluster.yaml
similarity index 100%
rename from examples/namespaced/container/v1beta1/cluster.yaml
rename to examples/container/namespaced/v1beta1/cluster.yaml
diff --git a/examples/namespaced/container/v1beta1/nodepool.yaml b/examples/container/namespaced/v1beta1/nodepool.yaml
similarity index 100%
rename from examples/namespaced/container/v1beta1/nodepool.yaml
rename to examples/container/namespaced/v1beta1/nodepool.yaml
diff --git a/examples/cluster/gcp/secret.yaml.tmpl b/examples/gcp/cluster/secret.yaml.tmpl
similarity index 100%
rename from examples/cluster/gcp/secret.yaml.tmpl
rename to examples/gcp/cluster/secret.yaml.tmpl
diff --git a/examples/cluster/gcp/v1beta1/accesstoken.yaml b/examples/gcp/cluster/v1beta1/accesstoken.yaml
similarity index 100%
rename from examples/cluster/gcp/v1beta1/accesstoken.yaml
rename to examples/gcp/cluster/v1beta1/accesstoken.yaml
diff --git a/examples/cluster/gcp/v1beta1/providerconfig.yaml b/examples/gcp/cluster/v1beta1/providerconfig.yaml
similarity index 100%
rename from examples/cluster/gcp/v1beta1/providerconfig.yaml
rename to examples/gcp/cluster/v1beta1/providerconfig.yaml
diff --git a/examples/cluster/gcp/v1beta1/upbound.yaml b/examples/gcp/cluster/v1beta1/upbound.yaml
similarity index 100%
rename from examples/cluster/gcp/v1beta1/upbound.yaml
rename to examples/gcp/cluster/v1beta1/upbound.yaml
diff --git a/examples/cluster/gcp/v1beta1/workloadidentity.yaml b/examples/gcp/cluster/v1beta1/workloadidentity.yaml
similarity index 100%
rename from examples/cluster/gcp/v1beta1/workloadidentity.yaml
rename to examples/gcp/cluster/v1beta1/workloadidentity.yaml
diff --git a/examples/namespaced/gcp/secret.yaml.tmpl b/examples/gcp/namespaced/secret.yaml.tmpl
similarity index 100%
rename from examples/namespaced/gcp/secret.yaml.tmpl
rename to examples/gcp/namespaced/secret.yaml.tmpl
diff --git a/examples/namespaced/gcp/v1beta1/accesstoken.yaml b/examples/gcp/namespaced/v1beta1/accesstoken.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/accesstoken.yaml
rename to examples/gcp/namespaced/v1beta1/accesstoken.yaml
diff --git a/examples/namespaced/gcp/v1beta1/clusterproviderconfig.yaml b/examples/gcp/namespaced/v1beta1/clusterproviderconfig.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/clusterproviderconfig.yaml
rename to examples/gcp/namespaced/v1beta1/clusterproviderconfig.yaml
diff --git a/examples/namespaced/gcp/v1beta1/clusterproviderconfig_accesstoken.yaml b/examples/gcp/namespaced/v1beta1/clusterproviderconfig_accesstoken.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/clusterproviderconfig_accesstoken.yaml
rename to examples/gcp/namespaced/v1beta1/clusterproviderconfig_accesstoken.yaml
diff --git a/examples/namespaced/gcp/v1beta1/clusterproviderconfig_upbound.yaml b/examples/gcp/namespaced/v1beta1/clusterproviderconfig_upbound.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/clusterproviderconfig_upbound.yaml
rename to examples/gcp/namespaced/v1beta1/clusterproviderconfig_upbound.yaml
diff --git a/examples/namespaced/gcp/v1beta1/clusterproviderconfig_workloadidentity.yaml b/examples/gcp/namespaced/v1beta1/clusterproviderconfig_workloadidentity.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/clusterproviderconfig_workloadidentity.yaml
rename to examples/gcp/namespaced/v1beta1/clusterproviderconfig_workloadidentity.yaml
diff --git a/examples/namespaced/gcp/v1beta1/providerconfig.yaml b/examples/gcp/namespaced/v1beta1/providerconfig.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/providerconfig.yaml
rename to examples/gcp/namespaced/v1beta1/providerconfig.yaml
diff --git a/examples/namespaced/gcp/v1beta1/upbound.yaml b/examples/gcp/namespaced/v1beta1/upbound.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/upbound.yaml
rename to examples/gcp/namespaced/v1beta1/upbound.yaml
diff --git a/examples/namespaced/gcp/v1beta1/workloadidentity.yaml b/examples/gcp/namespaced/v1beta1/workloadidentity.yaml
similarity index 100%
rename from examples/namespaced/gcp/v1beta1/workloadidentity.yaml
rename to examples/gcp/namespaced/v1beta1/workloadidentity.yaml
diff --git a/examples/namespaced/gcp/.gitignore b/examples/namespaced/gcp/.gitignore
deleted file mode 100644
index 4a424df..0000000
--- a/examples/namespaced/gcp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-secret.yaml
diff --git a/examples/cluster/networksecurity/v1beta1/servertlspolicy.yaml b/examples/networksecurity/cluster/v1beta1/servertlspolicy.yaml
similarity index 100%
rename from examples/cluster/networksecurity/v1beta1/servertlspolicy.yaml
rename to examples/networksecurity/cluster/v1beta1/servertlspolicy.yaml
diff --git a/examples/namespaced/networksecurity/v1beta1/servertlspolicy.yaml b/examples/networksecurity/namespaced/v1beta1/servertlspolicy.yaml
similarity index 100%
rename from examples/namespaced/networksecurity/v1beta1/servertlspolicy.yaml
rename to examples/networksecurity/namespaced/v1beta1/servertlspolicy.yaml
diff --git a/examples/cluster/providerconfig/v1beta1/impersonatedserviceaccount.yaml b/examples/providerconfig/cluster/v1beta1/impersonatedserviceaccount.yaml
similarity index 100%
rename from examples/cluster/providerconfig/v1beta1/impersonatedserviceaccount.yaml
rename to examples/providerconfig/cluster/v1beta1/impersonatedserviceaccount.yaml
diff --git a/examples/cluster/providerconfig/v1beta1/providerconfig.yaml b/examples/providerconfig/cluster/v1beta1/providerconfig.yaml
similarity index 100%
rename from examples/cluster/providerconfig/v1beta1/providerconfig.yaml
rename to examples/providerconfig/cluster/v1beta1/providerconfig.yaml
diff --git a/examples/namespaced/providerconfig/v1beta1/clusterproviderconfig.yaml b/examples/providerconfig/namespaced/v1beta1/clusterproviderconfig.yaml
similarity index 100%
rename from examples/namespaced/providerconfig/v1beta1/clusterproviderconfig.yaml
rename to examples/providerconfig/namespaced/v1beta1/clusterproviderconfig.yaml
diff --git a/examples/namespaced/providerconfig/v1beta1/impersonatedserviceaccount.yaml b/examples/providerconfig/namespaced/v1beta1/impersonatedserviceaccount.yaml
similarity index 100%
rename from examples/namespaced/providerconfig/v1beta1/impersonatedserviceaccount.yaml
rename to examples/providerconfig/namespaced/v1beta1/impersonatedserviceaccount.yaml
diff --git a/examples/namespaced/providerconfig/v1beta1/providerconfig.yaml b/examples/providerconfig/namespaced/v1beta1/providerconfig.yaml
similarity index 100%
rename from examples/namespaced/providerconfig/v1beta1/providerconfig.yaml
rename to examples/providerconfig/namespaced/v1beta1/providerconfig.yaml