diff --git a/.github/workflows/publish-pypi.yml b/.github/workflows/publish-pypi.yml
index 50b9dfaf..d22c048e 100644
--- a/.github/workflows/publish-pypi.yml
+++ b/.github/workflows/publish-pypi.yml
@@ -83,11 +83,20 @@ jobs:
         id: beta_version
         run: |
           # Read current version from setup.py
-          CURRENT_VERSION=$(grep -o '__version__ = "[^"]*"' setup.py | cut -d"" -f2)
+          CURRENT_VERSION=$(grep -o '__version__ = "[^"]*"' setup.py | sed 's/__version__ = "\(.*\)"/\1/')
           echo "Current version in files: $CURRENT_VERSION"
 
           # Split version into components
-          IFS='.' read -r MAJOR MINOR PATCH_FULL <<< "$CURRENT_VERSION"
+          IFS='.' read -r MAJOR MINOR PATCH_FULL <<< "$CURRENT_VERSION" || true
+
+          # Validate we got valid version components
+          if [[ -z "$MAJOR" || -z "$MINOR" || -z "$PATCH_FULL" ]]; then
+            echo "Error: Could not parse version components from $CURRENT_VERSION"
+            echo "Using default version 0.0.1b1"
+            MAJOR=0
+            MINOR=0
+            PATCH_FULL=1
+          fi
 
           # Handle beta suffix if it exists
           if [[ $PATCH_FULL == *b* ]]; then
@@ -95,7 +104,13 @@ jobs:
             PATCH_NUM=${PATCH_FULL%%b*}
             # Extract the beta number and increment it
             BETA_NUM=${PATCH_FULL#*b}
-            BETA_NUM=$((BETA_NUM + 1))
+            # Ensure beta number is a valid integer
+            if ! [[ $BETA_NUM =~ ^[0-9]+$ ]]; then
+              echo "Warning: Invalid beta number format. Resetting to beta1."
+              BETA_NUM=1
+            else
+              BETA_NUM=$((BETA_NUM + 1))
+            fi
           else
             # If not already a beta, use the patch number and start with beta1
             PATCH_NUM=$PATCH_FULL
diff --git a/datafog/__about__.py b/datafog/__about__.py
index 4093d847..3f20161b 100644
--- a/datafog/__about__.py
+++ b/datafog/__about__.py
@@ -1 +1 @@
-__version__ = "4.1.0b4"
+__version__ = "4.1.0b5"
diff --git a/setup.py b/setup.py
index a90f4fd1..b65ab94f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
     long_description = f.read()
 
 # Use a single source of truth for the version
-__version__ = "4.1.0b4"
+__version__ = "4.1.0b5"
 
 project_urls = {
     "Homepage": "https://datafog.ai",