diff --git a/.github/workflows/release-pypi-build-push-test-package.yml b/.github/workflows/release-pypi-build-push-test-package.yml
index babc35a..ee278ed 100644
--- a/.github/workflows/release-pypi-build-push-test-package.yml
+++ b/.github/workflows/release-pypi-build-push-test-package.yml
@@ -36,7 +36,11 @@ jobs:
 
       - name: bump_test_version
         run: |
-          make bump-test-version RELEASE_VERSION=${{ github.event.inputs.version }}
+          if [ -z "${{ github.event.inputs.version }}" ]; then
+            make bump-test-version
+          else
+            make bump-test-version RELEASE_VERSION=${{ github.event.inputs.version }}
+          fi
 
       - name: clean
         run: |
diff --git a/Makefile b/Makefile
index 5414665..ba5db45 100644
--- a/Makefile
+++ b/Makefile
@@ -4,12 +4,36 @@ LEVERAGE_TESTING_TAG   := 2.5.0
 LEVERAGE_IMAGE_TAG     := 1.2.7-0.0.5
 PYPROJECT_FILE := pyproject.toml
 INIT_FILE := leverage/__init__.py
-RELEASE_VERSION ?= $(shell curl -sL "https://test.pypi.org/pypi/leverage/json" | jq -r ".releases | keys | sort | .[-1]" | awk 'BEGIN{FS="."; OFS="."} {print $$1,$$2,$$3+1}' )rc.1
 PLACEHOLDER := 0.0.0
 
+# Detect OS
+UNAME_S := $(shell uname -s)
+SED := sed
+SORT := sort
+
+ifeq ($(UNAME_S),Darwin)
+    # Check for gsed
+    GSED_AVAILABLE := $(shell command -v gsed 2> /dev/null)
+    ifneq ($(GSED_AVAILABLE),)
+        SED := gsed
+    else
+        $(error gsed is not installed. Please install using 'brew install gnu-sed')
+    endif
+
+    # Check for gsort
+    GSORT_AVAILABLE := $(shell command -v gsort 2> /dev/null)
+    ifneq ($(GSORT_AVAILABLE),)
+        SORT := gsort
+    else
+        $(error gsort is not installed. Please install using 'brew install coreutils')
+    endif
+endif
+
+RELEASE_VERSION ?= $(shell curl -sL "https://pypi.org/pypi/leverage/json" | jq -r ".releases | keys[]" | gsort -V | tail -n 1 | awk 'BEGIN{FS="."; OFS="."} {print $$1,$$2,$$3+1}' )rc1
+
 help:
 	@echo 'Available Commands:'
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf " - \033[36m%-18s\033[0m %s\n", $$1, $$2}'
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | $(SORT) | awk 'BEGIN {FS = ":.*?## "}; {printf " - \033[36m%-18s\033[0m %s\n", $$1, $$2}'
 
 build-image: ## Build docker image for testing
 	docker build . -t ${LEVERAGE_TESTING_IMAGE}:${LEVERAGE_TESTING_TAG}
@@ -47,19 +71,25 @@ push-ci: ## Push distributables to PyPi (to be used in CI)
 push-test: ## Push distributables to Pypi test
 	poetry run twine upload --repository testpypi dist/*
 
-bump-test-version: ## Bump version based on TestPyPI or provided input
-	@echo "[INFO] Get current version from __init__.py"
+bump-test-version: ## Bump version based on PyPI latest release or provided input
+	@echo "[INFO] Get current version from leverage/__init__.py"
 	$(eval CURRENT_VERSION=$(shell awk '/__version__/ {print $$3}' $(INIT_FILE) | tr -d '"' | tr -d "'"))
 	@echo "[INFO] Current version: $(CURRENT_VERSION)"
-	@echo "[INFO] Get latest version from TestPypi."
-	$(eval LATEST_VERSION=$(shell curl -sL "https://test.pypi.org/pypi/leverage/json" | jq -r ".releases | keys | sort | .[-1]"))
-	@echo "[INFO] Latest version: $(LATEST_VERSION)"
-	$(eval RELEASE_VERSION=$(shell echo $(LATEST_VERSION) | awk 'BEGIN{FS="."; OFS="."} {print $$1,$$2,$$3+1}')rc.1)
+
+ifeq ($(strip $(RELEASE_VERSION)),)
+	@echo "[INFO] RELEASE_VERSION not provided or empty. Fetching from TestPyPI."
+	$(eval LATEST_VERSION=$(shell curl -sL "https://pypi.org/pypi/leverage/json" | jq -r ".releases | keys[]" | gsort -V | tail -n 1 ))
+	@echo "[INFO] Latest version fetched: $(LATEST_VERSION)"
+	$(eval RELEASE_VERSION=$(shell echo $(LATEST_VERSION) | awk 'BEGIN{FS="."; OFS="."} {sub("rc[0-9]+", "", $$3); print $$1,$$2,$$3+1 "rc1"}'))
+	@echo "[INFO] Auto-generated RELEASE_VERSION: $(RELEASE_VERSION)"
+endif
+
 	@echo "[INFO] Checking Release Version (template 9.9.9-rc9)..."
-	@echo $(RELEASE_VERSION) | awk '/[0-9]+\.[0-9]+\.[0-9]+-(rc|alpha|beta)[0-9]+/ {print "[INFO] Version ok"}' || (echo "[ERROR] Version is wrong" && exit 1)
+	@echo $(RELEASE_VERSION) | awk '/^[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$$/ {print "[INFO] Version ok"}' || (echo "[ERROR] Invalid format for RELEASE_VERSION. Expected format: ^[0-9]+\.[0-9]+\.[0-9]+-rc[0-9]+$$" && exit 1)
+
 	@echo "[INFO] Bump version to $(RELEASE_VERSION)"
-	@sed -i '' 's/__version__ = "$(CURRENT_VERSION)"/__version__ = "$(RELEASE_VERSION)"/' $(INIT_FILE)
-	@sed -i '' 's/version = "$(CURRENT_VERSION)"/version = "$(RELEASE_VERSION)"/' $(PYPROJECT_FILE)
+	@$(SED) -i 's/__version__ = "$(CURRENT_VERSION)"/__version__ = "$(RELEASE_VERSION)"/' $(INIT_FILE)
+	@$(SED) -i 's/version = "$(CURRENT_VERSION)"/version = "$(RELEASE_VERSION)"/' $(PYPROJECT_FILE)
 
 bump-version-ci: ## Fetch latest tag, update versions in __init__.py and pyproject.toml
 	@echo "[INFO] Get latest tag"
@@ -67,7 +97,7 @@ bump-version-ci: ## Fetch latest tag, update versions in __init__.py and pyproje
 	@echo $(RELEASE_VERSION)
 
 	@echo "[INFO] Write version to __init__.py"
-	@sed -i '' 's/$(PLACEHOLDER)/$(RELEASE_VERSION)/' $(INIT_FILE)
+	@$(SED) -i 's/$(PLACEHOLDER)/$(RELEASE_VERSION)/' $(INIT_FILE)
 
 	@echo "[INFO] Update version in pyproject.toml"
-	@sed -i '' 's/version = ".*"/version = "$(RELEASE_VERSION)"/' $(PYPROJECT_FILE)
+	@$(SED) -i 's/version = ".*"/version = "$(RELEASE_VERSION)"/' $(PYPROJECT_FILE)