diff --git a/docs/registry.md b/docs/registry.md
index a5dcbb8b802..e6411434718 100644
--- a/docs/registry.md
+++ b/docs/registry.md
@@ -47,7 +47,7 @@ editLink: false
 | aws-nuke | [aqua:rebuy-de/aws-nuke](https://github.com/rebuy-de/aws-nuke) [asdf:bersalazar/asdf-aws-nuke](https://github.com/bersalazar/asdf-aws-nuke) |
 | aws-sam-cli | [asdf:amrox/asdf-pyapp](https://github.com/amrox/asdf-pyapp) |
 | aws-sso-cli | [aqua:synfinatic/aws-sso-cli](https://github.com/synfinatic/aws-sso-cli) [asdf:adamcrews/asdf-aws-sso-cli](https://github.com/adamcrews/asdf-aws-sso-cli) |
-| aws-vault | [asdf:karancode/asdf-aws-vault](https://github.com/karancode/asdf-aws-vault) |
+| aws-vault | [aqua:99designs/aws-vault](https://github.com/99designs/aws-vault) [asdf:karancode/asdf-aws-vault](https://github.com/karancode/asdf-aws-vault) |
 | awscli | [asdf:MetricMike/asdf-awscli](https://github.com/MetricMike/asdf-awscli) |
 | awscli-local | [asdf:paulo-ferraz-oliveira/asdf-awscli-local](https://github.com/paulo-ferraz-oliveira/asdf-awscli-local) |
 | awsebcli | [asdf:amrox/asdf-pyapp](https://github.com/amrox/asdf-pyapp) |
@@ -74,10 +74,10 @@ editLink: false
 | bitwarden | [asdf:vixus0/asdf-bitwarden](https://github.com/vixus0/asdf-bitwarden) |
 | bitwarden-secrets-manager | [asdf:asdf-community/asdf-bitwarden-secrets-manager](https://github.com/asdf-community/asdf-bitwarden-secrets-manager) |
 | bombardier | [aqua:codesenberg/bombardier](https://github.com/codesenberg/bombardier) [asdf:NeoHsu/asdf-bombardier](https://github.com/NeoHsu/asdf-bombardier) |
-| borg | [asdf:lwiechec/asdf-borg](https://github.com/lwiechec/asdf-borg) |
+| borg | [aqua:borgbackup/borg](https://github.com/borgbackup/borg) [asdf:lwiechec/asdf-borg](https://github.com/lwiechec/asdf-borg) |
 | bosh | [asdf:vmware-tanzu/tanzu-plug-in-for-asdf](https://github.com/vmware-tanzu/tanzu-plug-in-for-asdf) |
 | bottom | [aqua:aqua:ClementTsang/bottom](https://github.com/aqua:ClementTsang/bottom) [asdf:carbonteq/asdf-btm](https://github.com/carbonteq/asdf-btm) |
-| boundary | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| boundary | [aqua:hashicorp/boundary](https://github.com/hashicorp/boundary) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | bpkg | [asdf:bpkg/asdf-bpkg](https://github.com/bpkg/asdf-bpkg) |
 | brig | [asdf:Ibotta/asdf-brig](https://github.com/Ibotta/asdf-brig) |
 | btrace | [asdf:joschi/asdf-btrace](https://github.com/joschi/asdf-btrace) |
@@ -89,7 +89,7 @@ editLink: false
 | cabal | [asdf:sestrella/asdf-ghcup](https://github.com/sestrella/asdf-ghcup) |
 | caddy | [aqua:caddyserver/caddy](https://github.com/caddyserver/caddy) [asdf:salasrod/asdf-caddy](https://github.com/salasrod/asdf-caddy) |
 | calendarsync | [asdf:FeryET/asdf-calendarsync](https://github.com/FeryET/asdf-calendarsync) |
-| calicoctl | [asdf:TheCubicleJockey/asdf-calicoctl](https://github.com/TheCubicleJockey/asdf-calicoctl) |
+| calicoctl | [aqua:projectcalico/calico/calicoctl](https://github.com/projectcalico/calico/calicoctl) [asdf:TheCubicleJockey/asdf-calicoctl](https://github.com/TheCubicleJockey/asdf-calicoctl) |
 | camunda-modeler | [asdf:barmac/asdf-camunda-modeler](https://github.com/barmac/asdf-camunda-modeler) |
 | cargo-binstall | [ubi:cargo-bins/cargo-binstall](https://github.com/cargo-bins/cargo-binstall) [cargo:cargo-binstall](https://crates.io/crates/cargo-binstall) |
 | cargo-insta | [ubi:mitsuhiko/insta](https://github.com/mitsuhiko/insta) |
@@ -140,7 +140,7 @@ editLink: false
 | conduit | [asdf:gmcabrita/asdf-conduit](https://github.com/gmcabrita/asdf-conduit) |
 | conform | [asdf:skyzyx/asdf-conform](https://github.com/skyzyx/asdf-conform) |
 | conftest | [aqua:open-policy-agent/conftest](https://github.com/open-policy-agent/conftest) [asdf:looztra/asdf-conftest](https://github.com/looztra/asdf-conftest) |
-| consul | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| consul | [aqua:hashicorp/consul](https://github.com/hashicorp/consul) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | container-diff | [asdf:cgroschupp/asdf-container-diff](https://github.com/cgroschupp/asdf-container-diff) |
 | container-structure-test | [aqua:GoogleContainerTools/container-structure-test](https://github.com/GoogleContainerTools/container-structure-test) [asdf:FeryET/asdf-container-structure-test](https://github.com/FeryET/asdf-container-structure-test) |
 | cookiecutter | [asdf:shawon-crosen/asdf-cookiecutter](https://github.com/shawon-crosen/asdf-cookiecutter) |
@@ -278,7 +278,7 @@ editLink: false
 | go-containerregistry | [aqua:google/go-containerregistry](https://github.com/google/go-containerregistry) [asdf:dex4er/asdf-go-containerregistry](https://github.com/dex4er/asdf-go-containerregistry) |
 | go-getter | [asdf:ryodocx/asdf-go-getter](https://github.com/ryodocx/asdf-go-getter) |
 | go-jira | [asdf:dguihal/asdf-go-jira](https://github.com/dguihal/asdf-go-jira) |
-| go-jsonnet | [asdf:https://gitlab.com/craigfurman/asdf-go-jsonnet](https://gitlab.com/craigfurman/asdf-go-jsonnet) |
+| go-jsonnet | [aqua:google/go-jsonnet](https://github.com/google/go-jsonnet) [asdf:https://gitlab.com/craigfurman/asdf-go-jsonnet](https://gitlab.com/craigfurman/asdf-go-jsonnet) |
 | go-junit-report | [asdf:jwillker/asdf-go-junit-report](https://github.com/jwillker/asdf-go-junit-report) |
 | go-sdk | [asdf:yacchi/asdf-go-sdk](https://github.com/yacchi/asdf-go-sdk) |
 | go-swagger | [asdf:jfreeland/asdf-go-swagger](https://github.com/jfreeland/asdf-go-swagger) |
@@ -332,7 +332,7 @@ editLink: false
 | hledger-flow | [asdf:airtonix/asdf-hledger-flow](https://github.com/airtonix/asdf-hledger-flow) |
 | hls | [asdf:sestrella/asdf-ghcup](https://github.com/sestrella/asdf-ghcup) |
 | hostctl | [aqua:guumaster/hostctl](https://github.com/guumaster/hostctl) [asdf:svenluijten/asdf-hostctl](https://github.com/svenluijten/asdf-hostctl) |
-| httpie-go | [asdf:abatilo/asdf-httpie-go](https://github.com/abatilo/asdf-httpie-go) |
+| httpie-go | [aqua:aqua:nojima/httpie-go](https://github.com/aqua:nojima/httpie-go) [asdf:abatilo/asdf-httpie-go](https://github.com/abatilo/asdf-httpie-go) |
 | hub | [aqua:mislav/hub](https://github.com/mislav/hub) [asdf:mise-plugins/asdf-hub](https://github.com/mise-plugins/asdf-hub) |
 | hugo | [aqua:gohugoio/hugo](https://github.com/gohugoio/hugo) [asdf:NeoHsu/asdf-hugo](https://github.com/NeoHsu/asdf-hugo) |
 | hurl | [aqua:Orange-OpenSource/hurl](https://github.com/Orange-OpenSource/hurl) [asdf:raimon49/asdf-hurl](https://github.com/raimon49/asdf-hurl) |
@@ -340,7 +340,7 @@ editLink: false
 | hygen | [asdf:brentjanderson/asdf-hygen](https://github.com/brentjanderson/asdf-hygen) |
 | hyperfine | [ubi:sharkdp/hyperfine](https://github.com/sharkdp/hyperfine) [asdf:volf52/asdf-hyperfine](https://github.com/volf52/asdf-hyperfine) |
 | iam-policy-json-to-terraform | [aqua:flosell/iam-policy-json-to-terraform](https://github.com/flosell/iam-policy-json-to-terraform) [asdf:carlduevel/asdf-iam-policy-json-to-terraform](https://github.com/carlduevel/asdf-iam-policy-json-to-terraform) |
-| iamlive | [asdf:chessmango/asdf-iamlive](https://github.com/chessmango/asdf-iamlive) |
+| iamlive | [aqua:iann0036/iamlive](https://github.com/iann0036/iamlive) [asdf:chessmango/asdf-iamlive](https://github.com/chessmango/asdf-iamlive) |
 | ibmcloud | [asdf:triangletodd/asdf-ibmcloud](https://github.com/triangletodd/asdf-ibmcloud) |
 | idris | [asdf:asdf-community/asdf-idris](https://github.com/asdf-community/asdf-idris) |
 | idris2 | [asdf:asdf-community/asdf-idris2](https://github.com/asdf-community/asdf-idris2) |
@@ -445,7 +445,7 @@ editLink: false
 | lean | [asdf:asdf-community/asdf-lean](https://github.com/asdf-community/asdf-lean) |
 | lefthook | [ubi:evilmartians/lefthook](https://github.com/evilmartians/lefthook) [asdf:jtzero/asdf-lefthook](https://github.com/jtzero/asdf-lefthook) |
 | leiningen | [asdf:miorimmax/asdf-lein](https://github.com/miorimmax/asdf-lein) |
-| levant | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| levant | [aqua:hashicorp/levant](https://github.com/hashicorp/levant) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | lfe | [asdf:asdf-community/asdf-lfe](https://github.com/asdf-community/asdf-lfe) |
 | libsql-server | [asdf:jonasb/asdf-libsql-server](https://github.com/jonasb/asdf-libsql-server) |
 | license-plist | [asdf:MacPaw/asdf-license-plist](https://github.com/MacPaw/asdf-license-plist) |
@@ -517,7 +517,7 @@ editLink: false
 | ninja | [aqua:ninja-build/ninja](https://github.com/ninja-build/ninja) [asdf:asdf-community/asdf-ninja](https://github.com/asdf-community/asdf-ninja) |
 | node | [core:node](https://mise.jdx.dev/lang/node.html) [vfox:version-fox/vfox-nodejs](https://github.com/version-fox/vfox-nodejs) |
 | node | [core:node](https://mise.jdx.dev/lang/node.html) |
-| nomad | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| nomad | [aqua:hashicorp/levant](https://github.com/hashicorp/levant) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | nomad-pack | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | notation | [aqua:notaryproject/notation](https://github.com/notaryproject/notation) [asdf:bodgit/asdf-notation](https://github.com/bodgit/asdf-notation) |
 | nova | [aqua:FairwindsOps/nova](https://github.com/FairwindsOps/nova) [asdf:elementalvoid/asdf-nova](https://github.com/elementalvoid/asdf-nova) |
@@ -548,7 +548,7 @@ editLink: false
 | osqueryi | [asdf:davidecavestro/asdf-osqueryi](https://github.com/davidecavestro/asdf-osqueryi) |
 | overmind | [ubi:DarthSim/overmind](https://github.com/DarthSim/overmind) [go:github.com/DarthSim/overmind/v2](https://pkg.go.dev/github.com/DarthSim/overmind/v2) |
 | pachctl | [asdf:abatilo/asdf-pachctl](https://github.com/abatilo/asdf-pachctl) |
-| packer | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| packer | [aqua:hashicorp/packer](https://github.com/hashicorp/packer) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | pandoc | [asdf:Fbrisset/asdf-pandoc](https://github.com/Fbrisset/asdf-pandoc) |
 | patat | [asdf:airtonix/asdf-patat](https://github.com/airtonix/asdf-patat) |
 | pdm | [asdf:1oglop1/asdf-pdm](https://github.com/1oglop1/asdf-pdm) |
@@ -721,7 +721,7 @@ editLink: false
 | terradozer | [aqua:jckuester/terradozer](https://github.com/jckuester/terradozer) [asdf:chessmango/asdf-terradozer](https://github.com/chessmango/asdf-terradozer) |
 | terraform | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) [vfox:enochchau/vfox-terraform](https://github.com/enochchau/vfox-terraform) |
 | terraform-docs | [aqua:terraform-docs/terraform-docs](https://github.com/terraform-docs/terraform-docs) [asdf:looztra/asdf-terraform-docs](https://github.com/looztra/asdf-terraform-docs) |
-| terraform-ls | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| terraform-ls | [aqua:hashicorp/terraform-ls](https://github.com/hashicorp/terraform-ls) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | terraform-lsp | [asdf:bartlomiejdanek/asdf-terraform-lsp](https://github.com/bartlomiejdanek/asdf-terraform-lsp) |
 | terraform-validator | [aqua:thazelart/terraform-validator](https://github.com/thazelart/terraform-validator) [asdf:looztra/asdf-terraform-validator](https://github.com/looztra/asdf-terraform-validator) |
 | terraformer | [aqua:GoogleCloudPlatform/terraformer](https://github.com/GoogleCloudPlatform/terraformer) [asdf:gr1m0h/asdf-terraformer](https://github.com/gr1m0h/asdf-terraformer) |
@@ -774,7 +774,7 @@ editLink: false
 | v | [asdf:jthegedus/asdf-v](https://github.com/jthegedus/asdf-v) |
 | vale | [aqua:errata-ai/vale](https://github.com/errata-ai/vale) [asdf:pdemagny/asdf-vale](https://github.com/pdemagny/asdf-vale) |
 | vals | [aqua:helmfile/vals](https://github.com/helmfile/vals) [asdf:dex4er/asdf-vals](https://github.com/dex4er/asdf-vals) |
-| vault | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| vault | [aqua:hashicorp/vault](https://github.com/hashicorp/vault) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | vcluster | [aqua:loft-sh/vcluster](https://github.com/loft-sh/vcluster) [asdf:https://gitlab.com/wt0f/asdf-vcluster](https://gitlab.com/wt0f/asdf-vcluster) |
 | vela | [asdf:pdemagny/asdf-vela](https://github.com/pdemagny/asdf-vela) |
 | velad | [asdf:pdemagny/asdf-velad](https://github.com/pdemagny/asdf-velad) |
@@ -794,7 +794,7 @@ editLink: false
 | wasmer | [aqua:wasmerio/wasmer](https://github.com/wasmerio/wasmer) [asdf:tachyonicbytes/asdf-wasmer](https://github.com/tachyonicbytes/asdf-wasmer) |
 | wasmtime | [aqua:bytecodealliance/wasmtime](https://github.com/bytecodealliance/wasmtime) [asdf:tachyonicbytes/asdf-wasmtime](https://github.com/tachyonicbytes/asdf-wasmtime) |
 | watchexec | [ubi:watchexec/watchexec](https://github.com/watchexec/watchexec) [asdf:nyrst/asdf-watchexec](https://github.com/nyrst/asdf-watchexec) |
-| waypoint | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
+| waypoint | [aqua:hashicorp/waypoint](https://github.com/hashicorp/waypoint) [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) |
 | weave-gitops | [asdf:deas/asdf-weave-gitops](https://github.com/deas/asdf-weave-gitops) |
 | websocat | [aqua:vi/websocat](https://github.com/vi/websocat) [asdf:bdellegrazie/asdf-websocat](https://github.com/bdellegrazie/asdf-websocat) |
 | wren-cli | [asdf:jtakakura/asdf-wren-cli](https://github.com/jtakakura/asdf-wren-cli) |
diff --git a/e2e/backend/test_aqua b/e2e/backend/test_aqua
index cce6c8808b1..c9ff63f409d 100644
--- a/e2e/backend/test_aqua
+++ b/e2e/backend/test_aqua
@@ -2,6 +2,11 @@
 
 export MISE_EXPERIMENTAL=1
 
-assert_contains "mise x aqua:BurntSushi/ripgrep@14.0.0 -- rg --version" "ripgrep 14.0.0"
-assert "mise x age@1.2.0 -- age --version" "v1.2.0"
-assert_contains "mise x helm@3.16.3 -- helm version" "v3.16.3"
+test() {
+  assert_contains "mise x $1 -- $2" "$3"
+}
+
+test aqua:BurntSushi/ripgrep@14.0.0 "rg --version" "ripgrep 14.0.0"
+test age@1.2.0 "age --version" "v1.2.0"
+test aqua:helm/helm@3.16.3 "helm version" "v3.16.3"
+test aqua:crate-ci/typos@1.27.3 "typos --version" "typos-cli 1.27.3"
diff --git a/e2e/plugins/test_plugin_install b/e2e/plugins/test_plugin_install
index 6d6ff371870..a116f1a8eba 100644
--- a/e2e/plugins/test_plugin_install
+++ b/e2e/plugins/test_plugin_install
@@ -3,14 +3,14 @@
 cat <<EOF >.tool-versions
 tiny latest
 shfmt latest
-waypoint latest
+zprint latest
 EOF
 
 # install/uninstall multiple
-mise plugin install tiny shfmt waypoint
+mise plugin install tiny shfmt zprint
 assert_contains "mise plugin ls" "tiny"
 assert_contains "mise plugin ls" "shfmt"
-assert_contains "mise plugin ls" "waypoint"
+assert_contains "mise plugin ls" "zprint"
 
 rm -rf "$MISE_DATA_DIR/plugins/tiny"
 mise plugin install https://github.com/mise-plugins/rtx-tiny.git
@@ -22,9 +22,9 @@ rm -rf "$MISE_DATA_DIR/plugins/tiny"
 mise plugin install tiny https://github.com/mise-plugins/rtx-tiny
 assert_contains "mise plugin ls" "tiny"
 
-rm -rf "$MISE_DATA_DIR/plugins/waypoint"
+rm -rf "$MISE_DATA_DIR/plugins/zprint"
 mise plugin install --all
-assert_contains "mise plugin ls" "waypoint"
+assert_contains "mise plugin ls" "zprint"
 
 mise plugin uninstall tiny
 assert_not_contains "mise plugin ls" "tiny"
diff --git a/registry.toml b/registry.toml
index 92f5e9bb7d6..c5a04338adf 100644
--- a/registry.toml
+++ b/registry.toml
@@ -46,7 +46,7 @@ aws-iam-authenticator.backends = ["aqua:kubernetes-sigs/aws-iam-authenticator",
 aws-nuke.backends = ["aqua:rebuy-de/aws-nuke", "asdf:bersalazar/asdf-aws-nuke"]
 aws-sam-cli.backends = ["asdf:amrox/asdf-pyapp"]
 aws-sso-cli.backends = ["aqua:synfinatic/aws-sso-cli", "asdf:adamcrews/asdf-aws-sso-cli"]
-aws-vault.backends = ["asdf:karancode/asdf-aws-vault"]
+aws-vault.backends = ["aqua:99designs/aws-vault", "asdf:karancode/asdf-aws-vault"]
 awscli.backends = ["asdf:MetricMike/asdf-awscli"]
 awscli-local.backends = ["asdf:paulo-ferraz-oliveira/asdf-awscli-local"]
 awsebcli.backends = ["asdf:amrox/asdf-pyapp"]
@@ -73,10 +73,10 @@ binnacle.backends = ["aqua:Traackr/binnacle", "asdf:Traackr/asdf-binnacle"]
 bitwarden.backends = ["asdf:vixus0/asdf-bitwarden"]
 bitwarden-secrets-manager.backends = ["asdf:asdf-community/asdf-bitwarden-secrets-manager"]
 bombardier.backends = ["aqua:codesenberg/bombardier", "asdf:NeoHsu/asdf-bombardier"]
-borg.backends = ["asdf:lwiechec/asdf-borg"]
+borg.backends = ["aqua:borgbackup/borg", "asdf:lwiechec/asdf-borg"]
 bosh.backends = ["asdf:vmware-tanzu/tanzu-plug-in-for-asdf"]
 bottom.backends = ["aqua:aqua:ClementTsang/bottom", "asdf:carbonteq/asdf-btm"]
-boundary.backends = ["asdf:asdf-community/asdf-hashicorp"]
+boundary.backends = ["aqua:hashicorp/boundary", "asdf:asdf-community/asdf-hashicorp"]
 bpkg.backends = ["asdf:bpkg/asdf-bpkg"]
 brig.backends = ["asdf:Ibotta/asdf-brig"]
 btrace.backends = ["asdf:joschi/asdf-btrace"]
@@ -87,7 +87,7 @@ bundler.backends = ["asdf:jonathanmorley/asdf-bundler"]
 cabal.backends = ["asdf:sestrella/asdf-ghcup"]
 caddy.backends = ["aqua:caddyserver/caddy", "asdf:salasrod/asdf-caddy"]
 calendarsync.backends = ["asdf:FeryET/asdf-calendarsync"]
-calicoctl.backends = ["asdf:TheCubicleJockey/asdf-calicoctl"]
+calicoctl.backends = ["aqua:projectcalico/calico/calicoctl", "asdf:TheCubicleJockey/asdf-calicoctl"]
 camunda-modeler.backends = ["asdf:barmac/asdf-camunda-modeler"]
 cargo-binstall.backends = ['ubi:cargo-bins/cargo-binstall[tag_regex=^\\d\\.]', "cargo:cargo-binstall"]
 cargo-insta.backends = ["ubi:mitsuhiko/insta"]
@@ -138,7 +138,7 @@ concourse.backends = ["aqua:concourse/concourse/concourse", "asdf:mattysweeps/as
 conduit.backends = ["asdf:gmcabrita/asdf-conduit"]
 conform.backends = ["asdf:skyzyx/asdf-conform"]
 conftest.backends = ["aqua:open-policy-agent/conftest", "asdf:looztra/asdf-conftest"]
-consul.backends = ["asdf:asdf-community/asdf-hashicorp"]
+consul.backends = ["aqua:hashicorp/consul", "asdf:asdf-community/asdf-hashicorp"]
 container-diff.backends = ["asdf:cgroschupp/asdf-container-diff"]
 container-structure-test.backends = ["aqua:GoogleContainerTools/container-structure-test", "asdf:FeryET/asdf-container-structure-test"]
 cookiecutter.backends = ["asdf:shawon-crosen/asdf-cookiecutter"]
@@ -273,7 +273,7 @@ go.backends = ["core:go", "vfox:version-fox/vfox-golang"]
 go-containerregistry.backends = ["aqua:google/go-containerregistry", "asdf:dex4er/asdf-go-containerregistry"]
 go-getter.backends = ["asdf:ryodocx/asdf-go-getter"]
 go-jira.backends = ["asdf:dguihal/asdf-go-jira"]
-go-jsonnet.backends = ["asdf:https://gitlab.com/craigfurman/asdf-go-jsonnet"]
+go-jsonnet.backends = ["aqua:google/go-jsonnet", "asdf:https://gitlab.com/craigfurman/asdf-go-jsonnet"]
 go-junit-report.backends = ["asdf:jwillker/asdf-go-junit-report"]
 go-sdk.backends = ["asdf:yacchi/asdf-go-sdk"]
 go-swagger.backends = ["asdf:jfreeland/asdf-go-swagger"]
@@ -327,7 +327,7 @@ hledger.backends = ["asdf:airtonix/asdf-hledger"]
 hledger-flow.backends = ["asdf:airtonix/asdf-hledger-flow"]
 hls.backends = ["asdf:sestrella/asdf-ghcup"]
 hostctl.backends = ["aqua:guumaster/hostctl", "asdf:svenluijten/asdf-hostctl"]
-httpie-go.backends = ["asdf:abatilo/asdf-httpie-go"]
+httpie-go.backends = ["aqua:aqua:nojima/httpie-go", "asdf:abatilo/asdf-httpie-go"]
 hub.backends = ["aqua:mislav/hub", "asdf:mise-plugins/asdf-hub"]
 hugo.backends = ["aqua:gohugoio/hugo", "asdf:NeoHsu/asdf-hugo"]
 hurl.backends = ["aqua:Orange-OpenSource/hurl", "asdf:raimon49/asdf-hurl"]
@@ -335,7 +335,7 @@ hwatch.backends = ["ubi:blacknon/hwatch", "asdf:chessmango/asdf-hwatch"]
 hygen.backends = ["asdf:brentjanderson/asdf-hygen"]
 hyperfine.backends = ["ubi:sharkdp/hyperfine", "asdf:volf52/asdf-hyperfine"]
 iam-policy-json-to-terraform.backends = ["aqua:flosell/iam-policy-json-to-terraform", "asdf:carlduevel/asdf-iam-policy-json-to-terraform"]
-iamlive.backends = ["asdf:chessmango/asdf-iamlive"]
+iamlive.backends = ["aqua:iann0036/iamlive", "asdf:chessmango/asdf-iamlive"]
 ibmcloud.backends = ["asdf:triangletodd/asdf-ibmcloud"]
 idris.backends = ["asdf:asdf-community/asdf-idris"]
 idris2.backends = ["asdf:asdf-community/asdf-idris2"]
@@ -439,7 +439,7 @@ lazygit.backends = ["aqua:jesseduffield/lazygit", "asdf:nklmilojevic/asdf-lazygi
 lean.backends = ["asdf:asdf-community/asdf-lean"]
 lefthook.backends = ["ubi:evilmartians/lefthook", "asdf:jtzero/asdf-lefthook"]
 leiningen.backends = ["asdf:miorimmax/asdf-lein"]
-levant.backends = ["asdf:asdf-community/asdf-hashicorp"]
+levant.backends = ["aqua:hashicorp/levant", "asdf:asdf-community/asdf-hashicorp"]
 lfe.backends = ["asdf:asdf-community/asdf-lfe"]
 libsql-server.backends = ["asdf:jonasb/asdf-libsql-server"]
 license-plist.backends = ["asdf:MacPaw/asdf-license-plist"]
@@ -510,7 +510,7 @@ nfpm.backends = ["ubi:goreleaser/nfpm", "asdf:ORCID/asdf-nfpm"]
 nim.backends = ["asdf:asdf-community/asdf-nim"]
 ninja.backends = ["aqua:ninja-build/ninja", "asdf:asdf-community/asdf-ninja"]
 node.backends = ["core:node", "vfox:version-fox/vfox-nodejs"]
-nomad.backends = ["asdf:asdf-community/asdf-hashicorp"]
+nomad.backends = ["aqua:hashicorp/levant", "asdf:asdf-community/asdf-hashicorp"]
 nomad-pack.backends = ["asdf:asdf-community/asdf-hashicorp"]
 notation.backends = ["aqua:notaryproject/notation", "asdf:bodgit/asdf-notation"]
 nova.backends = ["aqua:FairwindsOps/nova", "asdf:elementalvoid/asdf-nova"]
@@ -541,7 +541,7 @@ osm.backends = ["asdf:nlamirault/asdf-osm"]
 osqueryi.backends = ["asdf:davidecavestro/asdf-osqueryi"]
 overmind.backends = ["ubi:DarthSim/overmind", "go:github.com/DarthSim/overmind/v2"]
 pachctl.backends = ["asdf:abatilo/asdf-pachctl"]
-packer.backends = ["asdf:asdf-community/asdf-hashicorp"]
+packer.backends = ["aqua:hashicorp/packer", "asdf:asdf-community/asdf-hashicorp"]
 pandoc.backends = ["asdf:Fbrisset/asdf-pandoc"]
 patat.backends = ["asdf:airtonix/asdf-patat"]
 pdm.backends = ["asdf:1oglop1/asdf-pdm"]
@@ -712,7 +712,7 @@ temporalite.backends = ["asdf:eko/asdf-temporalite"]
 terradozer.backends = ["aqua:jckuester/terradozer", "asdf:chessmango/asdf-terradozer"]
 terraform.backends = ["asdf:asdf-community/asdf-hashicorp", "vfox:enochchau/vfox-terraform"]
 terraform-docs.backends = ["aqua:terraform-docs/terraform-docs", "asdf:looztra/asdf-terraform-docs"]
-terraform-ls.backends = ["asdf:asdf-community/asdf-hashicorp"]
+terraform-ls.backends = ["aqua:hashicorp/terraform-ls", "asdf:asdf-community/asdf-hashicorp"]
 terraform-lsp.backends = ["asdf:bartlomiejdanek/asdf-terraform-lsp"]
 terraform-validator.backends = ["aqua:thazelart/terraform-validator", "asdf:looztra/asdf-terraform-validator"]
 terraformer.backends = ["aqua:GoogleCloudPlatform/terraformer", "asdf:gr1m0h/asdf-terraformer"]
@@ -765,7 +765,7 @@ uv.backends = ["aqua:astral-sh/uv", "asdf:asdf-community/asdf-uv"]
 v.backends = ["asdf:jthegedus/asdf-v"]
 vale.backends = ["aqua:errata-ai/vale", "asdf:pdemagny/asdf-vale"]
 vals.backends = ["aqua:helmfile/vals", "asdf:dex4er/asdf-vals"]
-vault.backends = ["asdf:asdf-community/asdf-hashicorp"]
+vault.backends = ["aqua:hashicorp/vault", "asdf:asdf-community/asdf-hashicorp"]
 vcluster.backends = ["aqua:loft-sh/vcluster", "asdf:https://gitlab.com/wt0f/asdf-vcluster"]
 vela.backends = ["asdf:pdemagny/asdf-vela"]
 velad.backends = ["asdf:pdemagny/asdf-velad"]
@@ -785,7 +785,7 @@ wasm4.backends = ["asdf:jtakakura/asdf-wasm4"]
 wasmer.backends = ["aqua:wasmerio/wasmer", "asdf:tachyonicbytes/asdf-wasmer"]
 wasmtime.backends = ["aqua:bytecodealliance/wasmtime", "asdf:tachyonicbytes/asdf-wasmtime"]
 watchexec.backends = ["ubi:watchexec/watchexec", "asdf:nyrst/asdf-watchexec"]
-waypoint.backends = ["asdf:asdf-community/asdf-hashicorp"]
+waypoint.backends = ["aqua:hashicorp/waypoint", "asdf:asdf-community/asdf-hashicorp"]
 weave-gitops.backends = ["asdf:deas/asdf-weave-gitops"]
 websocat.backends = ["aqua:vi/websocat", "asdf:bdellegrazie/asdf-websocat"]
 wren-cli.backends = ["asdf:jtakakura/asdf-wren-cli"]
diff --git a/src/aqua/aqua_registry.rs b/src/aqua/aqua_registry.rs
index 4e8c2a2de15..504ff696667 100644
--- a/src/aqua/aqua_registry.rs
+++ b/src/aqua/aqua_registry.rs
@@ -155,8 +155,12 @@ impl AquaPackage {
         let semver_match = |vc| {
             if let Some(caps) = re.captures(vc) {
                 let vc = caps.get(1).unwrap().as_str().replace(' ', "");
-                let req = versions::Requirement::new(&vc).unwrap();
-                req.matches(&v)
+                if let Some(req) = versions::Requirement::new(&vc) {
+                    req.matches(&v)
+                } else {
+                    warn!("invalid semver constraint: {vc}");
+                    false
+                }
             } else if let Some(caps) = re_exact.captures(vc) {
                 let vc = caps.get(1).unwrap().as_str();
                 v.to_string() == vc
diff --git a/src/backend/aqua.rs b/src/backend/aqua.rs
index 62d6fa3e6b9..152add3d5db 100644
--- a/src/backend/aqua.rs
+++ b/src/backend/aqua.rs
@@ -225,6 +225,8 @@ impl AquaBackend {
             file::create_dir_all(&install_path)?;
             file::un_bz2(&tarball_path, &bin_path)?;
             file::make_executable(&bin_path)?;
+        } else if format == "dmg" {
+            file::un_dmg(&tarball_path, &install_path)?;
         } else {
             bail!("unsupported format: {}", format);
         }
diff --git a/src/file.rs b/src/file.rs
index 0a15ab2cbb3..c3f0cff74ad 100644
--- a/src/file.rs
+++ b/src/file.rs
@@ -590,6 +590,7 @@ pub fn untar(archive: &Path, dest: &Path, opts: &TarOptions) -> Result<()> {
             .wrap_err_with(err)?
             .components()
             .skip(opts.strip_components)
+            .filter(|c| c.as_os_str() != ".")
             .collect();
         let path = dest.join(path);
         create_dir_all(path.parent().unwrap()).wrap_err_with(err)?;
@@ -614,6 +615,28 @@ pub fn unzip(archive: &Path, dest: &Path) -> Result<()> {
         .wrap_err_with(|| format!("failed to extract zip archive: {}", display_path(archive)))
 }
 
+pub fn un_dmg(archive: &Path, dest: &Path) -> Result<()> {
+    debug!(
+        "hdiutil attach -quiet -nobrowse -mountpoint {} {}",
+        dest.display(),
+        archive.display()
+    );
+    let tmp = tempfile::TempDir::new()?;
+    cmd!(
+        "hdiutil",
+        "attach",
+        "-quiet",
+        "-nobrowse",
+        "-mountpoint",
+        tmp.path(),
+        archive.to_path_buf()
+    )
+    .run()?;
+    copy_dir_all(tmp.path(), dest)?;
+    cmd!("hdiutil", "detach", tmp.path()).run()?;
+    Ok(())
+}
+
 #[cfg(windows)]
 pub fn un7z(archive: &Path, dest: &Path) -> Result<()> {
     sevenz_rust::decompress_file(archive, dest)
diff --git a/tasks/aqua-tester.fish b/tasks/aqua-tester.fish
index 3f3421e09ca..9a6ce89baba 100644
--- a/tasks/aqua-tester.fish
+++ b/tasks/aqua-tester.fish
@@ -1,4 +1,5 @@
-alias m @mise
+cargo b
+alias m target/debug/mise
 m registry | grep -v '(core|ubi|aqua|vfox):' | awk '{print $1}'> tmp/missing_asdf_tools
 rm -f tmp/pairs
 for tool in (cat tmp/missing_asdf_tools)
@@ -31,6 +32,9 @@ for tool in (cat tmp/pairs | gsort -R)
     if test "$tool[1]" = "istioctl"
       continue
     end
+    if test "$tool[1]" = "om"
+      continue
+    end
     set -l cmd "m x $tool[2] -- $tool[1] -v"
     echo $cmd
     set -l output (m x $tool[2] -- $tool[1] -v)