diff --git a/build/chart-prerelease.sh b/build/chart-prerelease.sh
index 309e9c6..2e03afc 100755
--- a/build/chart-prerelease.sh
+++ b/build/chart-prerelease.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-export appVersion=$(git describe --match 'v*' --abbrev=0 HEAD --tags)
-export chartVersion=$1
+export appVersion=$(git describe --match 'v*' --abbrev=0 HEAD --tags || echo "0.0.0")
+export chartVersion=$(echo $1 | sed 's/chart-\(.*\)/\1/')
 
 ./yq -i e '.version = strenv(chartVersion)' chart/Chart.yaml
 ./yq -i e '.appVersion = strenv(appVersion)"' chart/Chart.yaml