diff --git a/octavia-cli/README.md b/octavia-cli/README.md
index 606b3fbad0f43..e8932db2b5f46 100644
--- a/octavia-cli/README.md
+++ b/octavia-cli/README.md
@@ -30,7 +30,7 @@ This script:
 ## 2.b If you want to directly run the CLI without alias in your current directory:
 ```bash
 mkdir my_octavia_project_directory # Create your octavia project directory where YAML configurations will be stored.
-docker run -i --rm -v ./my_octavia_project_directory:/home/octavia-project --network host -e AIRBYTE_URL="http://localhost:8000" airbyte/octavia-cli:dev
+docker run -i --rm -v ./my_octavia_project_directory:/home/octavia-project --network host -e AIRBYTE_URL="http://localhost:8000" airbyte/octavia-cli:0.1.0
 ```
 
 
diff --git a/octavia-cli/publish.sh b/octavia-cli/publish.sh
index 884d141aeae3a..557b411ebc2c4 100755
--- a/octavia-cli/publish.sh
+++ b/octavia-cli/publish.sh
@@ -1,6 +1,11 @@
 #!/usr/bin/env bash
 
-set -eux
+set -ux
 VERSION=$1
-docker tag airbyte/octavia-cli:dev airbyte/octavia-cli:${VERSION}
-docker push airbyte/octavia-cli:${VERSION}
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker buildx create --name octavia_builder > /dev/null 2>&1
+set -e
+docker buildx use octavia_builder
+docker buildx inspect --bootstrap
+docker buildx build --push --tag airbyte/octavia-cli:${VERSION} --platform=linux/arm64,linux/amd64 ${SCRIPT_DIR}