diff --git a/meshix-cli-bin/.SRCINFO b/meshix-cli-bin/.SRCINFO
index 840390e..5b9e557 100644
--- a/meshix-cli-bin/.SRCINFO
+++ b/meshix-cli-bin/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = meshix-cli-bin
 	pkgdesc = Meshix CLI for run inspection and generation workflows
-	pkgver = 0.0.2
+	pkgver = 0.0.5
 	pkgrel = 1
-	url = https://github.com/shpitdev/meshix-observability
+	url = https://github.com/shpitdev/meshix-mono
 	install = meshix-cli-bin.install
 	arch = x86_64
 	license = LicenseRef-proprietary
diff --git a/meshix-cli-bin/PKGBUILD b/meshix-cli-bin/PKGBUILD
index d72b9ae..573479a 100644
--- a/meshix-cli-bin/PKGBUILD
+++ b/meshix-cli-bin/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Anand Pant
 
 pkgname=meshix-cli-bin
-pkgver=0.0.2
+pkgver=0.0.5
 pkgrel=1
 pkgdesc="Meshix CLI for run inspection and generation workflows"
 arch=('x86_64')
-url="https://github.com/shpitdev/meshix-observability"
+url="https://github.com/shpitdev/meshix-mono"
 license=('LicenseRef-proprietary')
 install="${pkgname}.install"
 makedepends=('github-cli')
@@ -14,11 +14,11 @@ conflicts=('meshix-cli')
 
 # Public PKGBUILD, private release asset. Users need GitHub access to the shpitdev org.
 _asset="meshix-cli_v${pkgver}_linux_amd64.tar.gz"
-_sha256='e5446f112d1277cda436d2ecce972b96b409a6fbaf57020690f4a0711d1f06e0'
+_sha256='669f98ea36a220b24210f390426eac251eb4707e0bc94bf89fd6195366d703d7'
 
 prepare() {
-  gh release download "v${pkgver}" \
-    --repo shpitdev/meshix-observability \
+  gh release download "meshix-cli-v${pkgver}" \
+    --repo shpitdev/meshix-mono \
     --pattern "${_asset}" \
     --dir . --clobber
 
diff --git a/scripts/update-meshix-cli-bin.sh b/scripts/update-meshix-cli-bin.sh
index 0536784..4f7e2ff 100755
--- a/scripts/update-meshix-cli-bin.sh
+++ b/scripts/update-meshix-cli-bin.sh
@@ -16,21 +16,34 @@ fi
 
 repo_root="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
 pkgbuild="${repo_root}/meshix-cli-bin/PKGBUILD"
-repo="shpitdev/meshix-observability"
+repo="shpitdev/meshix-mono"
 requested_version="${MESHIX_CLI_VERSION:-latest}"
 
+normalize_release_tag() {
+  local version="$1"
+
+  if [[ -z "${version}" || "${version}" == "latest" ]]; then
+    printf 'latest'
+    return 0
+  fi
+
+  version="${version#meshix-cli-}"
+  version="${version#v}"
+  printf 'meshix-cli-v%s' "${version}"
+}
+
 resolve_release_json() {
   local version="$1"
   local endpoint
+  local release_tag
   local output=""
 
-  if [[ -z "${version}" || "${version}" == "latest" ]]; then
+  release_tag="$(normalize_release_tag "${version}")"
+
+  if [[ "${release_tag}" == "latest" ]]; then
     endpoint="repos/${repo}/releases/latest"
   else
-    if [[ "${version}" != v* ]]; then
-      version="v${version}"
-    fi
-    endpoint="repos/${repo}/releases/tags/${version}"
+    endpoint="repos/${repo}/releases/tags/${release_tag}"
   fi
 
   if [[ -n "${SHPIT_GH_TOKEN:-}" ]]; then
@@ -62,7 +75,9 @@ release_json="$(resolve_release_json "${requested_version}")"
 if [[ "${release_json}" == "__SKIP__" ]]; then
   exit 0
 fi
-pkgver="$(jq -r '.tag_name | ltrimstr("v")' <<<"${release_json}")"
+tag_name="$(jq -r '.tag_name' <<<"${release_json}")"
+pkgver="${tag_name#meshix-cli-v}"
+pkgver="${pkgver#v}"
 asset_json="$(jq -c '
   .assets
   | map(select(.name | test("_linux_amd64\\.tar\\.gz$")))
diff --git a/scripts/validate-packages.sh b/scripts/validate-packages.sh
index 52f6978..f08fbd5 100755
--- a/scripts/validate-packages.sh
+++ b/scripts/validate-packages.sh
@@ -11,7 +11,7 @@ done
 
 meshix_pkg="${repo_root}/meshix-cli-bin"
 if [[ -f "${meshix_pkg}/PKGBUILD" ]]; then
-  grep -q 'gh release download "v${pkgver}"' "${meshix_pkg}/PKGBUILD"
+  grep -q 'gh release download "meshix-cli-v${pkgver}"' "${meshix_pkg}/PKGBUILD"
   grep -q 'install="${pkgname}\.install"' "${meshix_pkg}/PKGBUILD"
   grep -q 'meshix-cli-dev' "${meshix_pkg}/meshix-cli-bin.install"
 fi