diff --git a/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/pkg.yaml b/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/pkg.yaml
index f34d3d0e7ec..d2db0c23d16 100644
--- a/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/pkg.yaml
+++ b/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/pkg.yaml
@@ -1,6 +1,8 @@
 packages:
   - name: grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2@v2.26.1
   - name: grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2
-    version: v2.0.0
+    version: v2.16.0
   - name: grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2
-    version: v1.16.0
+    version: v2.13.0
+  - name: grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2
+    version: v2.10.1
diff --git a/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/registry.yaml b/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/registry.yaml
index 0c8e7bbaec6..81a65514079 100644
--- a/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/registry.yaml
+++ b/pkgs/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2/registry.yaml
@@ -4,40 +4,56 @@ packages:
     type: github_release
     repo_owner: grpc-ecosystem
     repo_name: grpc-gateway
-    description: Generate Swagger / OpenAPIv2 JSON file from Protocol Buffer definition
-    asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
-    rosetta2: true
-    format: raw
-    replacements:
-      amd64: x86_64
-    files:
-      - name: protoc-gen-openapiv2
-    version_constraint: semver(">= 2.14.0")
+    description: gRPC to JSON proxy generator following the gRPC HTTP spec
+    version_constraint: "false"
     version_overrides:
-      - version_constraint: semver(">= 2.10.2")
-        slsa_provenance:
-          enabled: false
-      - version_constraint: semver(">= 2.0.0")
+      - version_constraint: semver("< 2.0.0") || Version == "v2.16.1"
+        no_asset: true
+      - version_constraint: semver("<= 2.10.1")
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        rosetta2: true
+        windows_arm_emulation: true
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
         supported_envs:
           - darwin
+          - windows
           - amd64
+      - version_constraint: semver("<= 2.13.0")
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
+      - version_constraint: semver("<= 2.16.0")
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
         slsa_provenance:
-          enabled: false
+          type: github_release
+          asset: multiple.intoto.jsonl
       - version_constraint: "true"
-        supported_envs:
-          - darwin
-          - amd64
-        # https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.0.0
-        # > Rename protoc-gen-swagger to protoc-gen-openapiv2
-        asset: protoc-gen-swagger-{{.Version}}-{{.OS}}-{{.Arch}}
-        files:
-          - name: protoc-gen-swagger
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
         slsa_provenance:
-          enabled: false
-    checksum:
-      type: github_release
-      asset: grpc-gateway_{{trimV .Version}}_checksums.txt
-      algorithm: sha256
-    slsa_provenance:
-      type: github_release
-      asset: multiple.intoto.jsonl
+          type: github_release
+          asset: multiple.intoto.jsonl
diff --git a/registry.yaml b/registry.yaml
index f8117f63f5a..ce2958b37ff 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -27763,43 +27763,59 @@ packages:
     type: github_release
     repo_owner: grpc-ecosystem
     repo_name: grpc-gateway
-    description: Generate Swagger / OpenAPIv2 JSON file from Protocol Buffer definition
-    asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
-    rosetta2: true
-    format: raw
-    replacements:
-      amd64: x86_64
-    files:
-      - name: protoc-gen-openapiv2
-    version_constraint: semver(">= 2.14.0")
+    description: gRPC to JSON proxy generator following the gRPC HTTP spec
+    version_constraint: "false"
     version_overrides:
-      - version_constraint: semver(">= 2.10.2")
-        slsa_provenance:
-          enabled: false
-      - version_constraint: semver(">= 2.0.0")
+      - version_constraint: semver("< 2.0.0") || Version == "v2.16.1"
+        no_asset: true
+      - version_constraint: semver("<= 2.10.1")
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        rosetta2: true
+        windows_arm_emulation: true
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
         supported_envs:
           - darwin
+          - windows
           - amd64
+      - version_constraint: semver("<= 2.13.0")
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
+      - version_constraint: semver("<= 2.16.0")
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
         slsa_provenance:
-          enabled: false
+          type: github_release
+          asset: multiple.intoto.jsonl
       - version_constraint: "true"
-        supported_envs:
-          - darwin
-          - amd64
-        # https://github.com/grpc-ecosystem/grpc-gateway/releases/tag/v2.0.0
-        # > Rename protoc-gen-swagger to protoc-gen-openapiv2
-        asset: protoc-gen-swagger-{{.Version}}-{{.OS}}-{{.Arch}}
-        files:
-          - name: protoc-gen-swagger
+        asset: protoc-gen-openapiv2-{{.Version}}-{{.OS}}-{{.Arch}}
+        format: raw
+        replacements:
+          amd64: x86_64
+        checksum:
+          type: github_release
+          asset: grpc-gateway_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
         slsa_provenance:
-          enabled: false
-    checksum:
-      type: github_release
-      asset: grpc-gateway_{{trimV .Version}}_checksums.txt
-      algorithm: sha256
-    slsa_provenance:
-      type: github_release
-      asset: multiple.intoto.jsonl
+          type: github_release
+          asset: multiple.intoto.jsonl
   - type: github_release
     repo_owner: grpc-ecosystem
     repo_name: grpc-health-probe