diff --git a/build_tools/compute_local_version.py b/build_tools/compute_local_version.py
index a02dba86..dcd66662 100755
--- a/build_tools/compute_local_version.py
+++ b/build_tools/compute_local_version.py
@@ -24,7 +24,7 @@
 release_type.add_argument("-stable", "--stable-release", action="store_true")
 release_type.add_argument("-rc", "--nightly-release", action="store_true")
 release_type.add_argument("-dev", "--development-release", action="store_true")
-release_type.add_argument("--custom-string", action="store", type=str)
+release_type.add_argument("--version-suffix", action="store", type=str)
 
 args = parser.parse_args()
 
@@ -52,11 +52,11 @@ def write_version_to_file(version_file, version):
     current_version += "rc" + datetime.today().strftime("%Y%m%d")
 elif args.development_release:
     current_version += (
-        ".dev+"
+        ".dev0+"
         + subprocess.check_output(["git", "rev-parse", "HEAD"]).decode("ascii").strip()
     )
-elif args.custom_string:
-    current_version += args.custom_string
+elif args.version_suffix:
+    current_version += args.version_suffix
 
 if args.write_json:
     write_version_to_file(VERSION_LOCAL_FILE_PATH, current_version)