diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh
index 7f75299f..07d2117f 100755
--- a/scripts/bump_version.sh
+++ b/scripts/bump_version.sh
@@ -1,26 +1,82 @@
 #!/bin/zsh
 
-# Copy current version to project root
-echo $PWD
-cp src/interface/obsidian/versions.json .
-cp src/interface/obsidian/manifest.json .
+project_root=$PWD
 
-# Induce hatch to compute next version number
-# remove .dev[commits-since-tag] version suffix from hatch computed version number
-next_version=$(touch bump.txt && git add bump.txt && hatch version | sed 's/\.dev.*//g')
-git rm --cached -- bump.txt && rm bump.txt
+while getopts 'nc:' opt;
+do
+    case "${opt}" in
+        c)
+            # Get current project version
+            current_version=$OPTARG
 
-# Bump Obsidian plugins to next version
-cd src/interface/obsidian
-sed -E -i.bak "s/version\": \"(.*)\",/version\": \"$next_version\",/" package.json
-sed -E -i.bak "s/version\": \"(.*)\"/version\": \"$next_version\"/" manifest.json
-npm run version  # updates versions.json
-rm *.bak
+            # Bump Obsidian plugin to current version
+            cd $project_root/src/interface/obsidian
+            sed -E -i.bak "s/version\": \"(.*)\",/version\": \"$current_version\",/" package.json
+            sed -E -i.bak "s/version\": \"(.*)\"/version\": \"$current_version\"/" manifest.json
+            cp $project_root/versions.json .
+            npm run version # append current version
+            rm *.bak
 
-# Bump Emacs package to next version
-cd ../emacs
-sed -E -i.bak "s/^;; Version: (.*)/;; Version: $next_version/" khoj.el
-rm *.bak
+            # Bump Emacs package to current version
+            cd ../emacs
+            sed -E -i.bak "s/^;; Version: (.*)/;; Version: $current_version/" khoj.el
+            git add khoj.el
+            rm *.bak
+
+            # Copy current obsidian versioned files to project root
+            cd $project_root
+            cp src/interface/obsidian/versions.json .
+            cp src/interface/obsidian/manifest.json .
+
+            # Run pre-commit validation to fix jsons
+            pre-commit run --hook-stage manual --all
+
+            # Commit changes and tag commit for release
+            git add \
+                $project_root/src/interface/obsidian/package.json \
+                $project_root/src/interface/obsidian/manifest.json \
+                $project_root/src/interface/obsidian/versions.json \
+                $project_root/src/interface/emacs/khoj.el \
+                $project_root/manifest.json \
+                $project_root/versions.json
+            git commit -m "Release Khoj version $current_version"
+            git tag $current_version master
+            ;;
+        n)
+            # Induce hatch to compute next version number
+            # remove .dev[commits-since-tag] version suffix from hatch computed version number
+            next_version=$(touch bump.txt && git add bump.txt && hatch version | sed 's/\.dev.*//g')
+            git rm --cached -- bump.txt && rm bump.txt
+
+            # Bump Obsidian plugins to next version
+            cd $project_root/src/interface/obsidian
+            sed -E -i.bak "s/version\": \"(.*)\",/version\": \"$next_version\",/" package.json
+            sed -E -i.bak "s/version\": \"(.*)\"/version\": \"$next_version\"/" manifest.json
+            npm run version  # updates versions.json
+            rm *.bak
+
+            # Bump Emacs package to next version
+            cd $project_root/src/interface/emacs
+            sed -E -i.bak "s/^;; Version: (.*)/;; Version: $next_version/" khoj.el
+            rm *.bak
+
+            # Run pre-commit validations to fix jsons
+            pre-commit run --hook-stage manual --all
+
+            # Commit changes
+            git add \
+                $project_root/src/interface/obsidian/package.json \
+                $project_root/src/interface/obsidian/manifest.json \
+                $project_root/src/interface/obsidian/versions.json \
+                $project_root/src/interface/emacs/khoj.el
+            git commit -m "Bump Khoj to pre-release version $next_version"
+            ;;
+        ?)
+           echo -e "Invalid command option.\nUsage: $(basename $0) [-c] [-n]"
+           exit 1
+           ;;
+    esac
+done
 
 # Restore State
-cd ../../../
+cd $project_root