diff --git a/pkgs/buildkite/cli/pkg.yaml b/pkgs/buildkite/cli/pkg.yaml
index f3c7131d348..b4e111969ec 100644
--- a/pkgs/buildkite/cli/pkg.yaml
+++ b/pkgs/buildkite/cli/pkg.yaml
@@ -1,5 +1,13 @@
 packages:
-  - name: buildkite/cli@v2.0.0
+  - name: buildkite/cli@v3.0.0
+  - name: buildkite/cli
+    version: v3.0.0-beta.20240418
+  - name: buildkite/cli
+    version: v3.0.0-beta.20240326
+  - name: buildkite/cli
+    version: v3.0.0-beta.20240202
+  - name: buildkite/cli
+    version: v2.0.0
   - name: buildkite/cli
     version: v1.2.0
   - name: buildkite/cli
diff --git a/pkgs/buildkite/cli/registry.yaml b/pkgs/buildkite/cli/registry.yaml
index 0ad947cc9d5..c4c96760c9d 100644
--- a/pkgs/buildkite/cli/registry.yaml
+++ b/pkgs/buildkite/cli/registry.yaml
@@ -3,24 +3,53 @@ packages:
     repo_owner: buildkite
     repo_name: cli
     description: A command line interface for Buildkite
-    supported_envs:
-      - darwin
-      - linux
-      - amd64
-    asset: cli-{{.OS}}-{{.Arch}}
-    format: raw
     files:
       - name: bk
-        src: cli
-    version_constraint: semver(">= 2.0.0")
-    complete_windows_ext: false
+    version_constraint: "false"
     version_overrides:
-      - version_constraint: semver(">= 1.2.0")
-        complete_windows_ext: true
-      - version_constraint: "true"
-        complete_windows_ext: true
+      - version_constraint: semver("<= 1.1.0")
+        asset: bk-{{.OS}}-{{.Arch}}-{{trimV .Version}}
+        format: raw
+        rosetta2: true
+        windows_arm_emulation: true
         supported_envs:
           - darwin
+          - windows
           - amd64
+      - version_constraint: Version == "v1.2.0"
+        asset: cli-{{.OS}}-{{.Arch}}
+        format: raw
+        windows_arm_emulation: true
+      - version_constraint: Version == "v2.0.0"
+        asset: cli-{{.OS}}-{{.Arch}}
+        format: raw
+        windows_arm_emulation: true
+        complete_windows_ext: false
+      - version_constraint: Version == "v3.0.0-beta.20240202"
+        asset: bk_{{trimV .Version}}_{{.OS}}_{{.Arch}}
+        format: raw
+      - version_constraint: Version == "v3.0.0-beta.20240326"
+        asset: bk_{{trimV .Version}}_{{.OS}}_{{.Arch}}
+        format: raw
         rosetta2: true
-        asset: bk-{{.OS}}-{{.Arch}}-{{.Version|trimV}}
+      - version_constraint: Version == "v3.0.0-beta.20240418"
+        asset: "{{.Version}}_{{.OS}}_{{.Arch}}"
+        format: raw
+      - version_constraint: "true"
+        asset: bk_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}}
+        format: zip
+        files:
+          - name: bk
+            src: "{{.AssetWithoutExt}}/bk"
+        replacements:
+          darwin: macOS
+        checksum:
+          type: github_release
+          asset: bk_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
+        overrides:
+          - goos: linux
+            format: tar.gz
+          - goos: windows
+            files:
+              - name: bk
diff --git a/registry.yaml b/registry.yaml
index a36f694eef6..06bb2f0dd29 100644
--- a/registry.yaml
+++ b/registry.yaml
@@ -10632,27 +10632,56 @@ packages:
     repo_owner: buildkite
     repo_name: cli
     description: A command line interface for Buildkite
-    supported_envs:
-      - darwin
-      - linux
-      - amd64
-    asset: cli-{{.OS}}-{{.Arch}}
-    format: raw
     files:
       - name: bk
-        src: cli
-    version_constraint: semver(">= 2.0.0")
-    complete_windows_ext: false
+    version_constraint: "false"
     version_overrides:
-      - version_constraint: semver(">= 1.2.0")
-        complete_windows_ext: true
-      - version_constraint: "true"
-        complete_windows_ext: true
+      - version_constraint: semver("<= 1.1.0")
+        asset: bk-{{.OS}}-{{.Arch}}-{{trimV .Version}}
+        format: raw
+        rosetta2: true
+        windows_arm_emulation: true
         supported_envs:
           - darwin
+          - windows
           - amd64
+      - version_constraint: Version == "v1.2.0"
+        asset: cli-{{.OS}}-{{.Arch}}
+        format: raw
+        windows_arm_emulation: true
+      - version_constraint: Version == "v2.0.0"
+        asset: cli-{{.OS}}-{{.Arch}}
+        format: raw
+        windows_arm_emulation: true
+        complete_windows_ext: false
+      - version_constraint: Version == "v3.0.0-beta.20240202"
+        asset: bk_{{trimV .Version}}_{{.OS}}_{{.Arch}}
+        format: raw
+      - version_constraint: Version == "v3.0.0-beta.20240326"
+        asset: bk_{{trimV .Version}}_{{.OS}}_{{.Arch}}
+        format: raw
         rosetta2: true
-        asset: bk-{{.OS}}-{{.Arch}}-{{.Version|trimV}}
+      - version_constraint: Version == "v3.0.0-beta.20240418"
+        asset: "{{.Version}}_{{.OS}}_{{.Arch}}"
+        format: raw
+      - version_constraint: "true"
+        asset: bk_{{trimV .Version}}_{{.OS}}_{{.Arch}}.{{.Format}}
+        format: zip
+        files:
+          - name: bk
+            src: "{{.AssetWithoutExt}}/bk"
+        replacements:
+          darwin: macOS
+        checksum:
+          type: github_release
+          asset: bk_{{trimV .Version}}_checksums.txt
+          algorithm: sha256
+        overrides:
+          - goos: linux
+            format: tar.gz
+          - goos: windows
+            files:
+              - name: bk
   - type: github_release
     repo_owner: buildpacks
     repo_name: pack