diff --git a/.github/workflows/bump-and-release.yml b/.github/workflows/bump-and-release.yml
index 0503c72..e9b0363 100644
--- a/.github/workflows/bump-and-release.yml
+++ b/.github/workflows/bump-and-release.yml
@@ -75,15 +75,11 @@ jobs:
             echo "No tags found. Defaulting to v0.0.0"
             CURRENT_VERSION="0.0.0"
           else
-            echo "Found latest tag: $LATEST_TAG"
-            
-            # --- จุดที่แก้ไข (เพิ่ม ; then) ---
             if [ "$same_tag" == "false" ]; then
               CURRENT_VERSION="${LATEST_TAG_DAV#v}"
             else
               CURRENT_VERSION="${LATEST_TAG#v}"
             fi
-            # -----------------------------
           fi
           
           echo "version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
@@ -114,7 +110,7 @@ jobs:
 
           # === DEVELOPMENT ===
           elif [ "$TARGET_BRANCH" == "development" ]; then
-            if [[ "$CURRENT_VERSION" == *"-dev."* && "$SAME_TAG" == "true" ]]; then
+            if [[ "$SOURCE_BRANCH" == feat/* && "$SAME_TAG" == "true" ]]; then
               NEW_VERSION="$MAJOR.$((MINOR + 1)).0-dev.1"
             elif [[ "$CURRENT_VERSION" == *"-dev."* || "$SOURCE_BRANCH" == "main" ]]; then
               LAST_NUM=${CURRENT_VERSION##*.}
diff --git a/package-lock.json b/package-lock.json
index d4de6bd..264f1ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "version-bump",
-  "version": "0.11.0",
+  "version": "0.12.0-dev.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "version-bump",
-      "version": "0.11.0",
+      "version": "0.12.0-dev.1",
       "license": "ISC"
     }
   }
diff --git a/package.json b/package.json
index 88d034c..abf9b41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "version-bump",
-  "version": "0.11.0",
+  "version": "0.12.0-dev.1",
   "description": "",
   "main": "index.js",
   "scripts": {