diff --git a/.github/ISSUE_TEMPLATE/bug report.yml b/.github/ISSUE_TEMPLATE/bug report.yml
index fa7239534..dec00a5e8 100644
--- a/.github/ISSUE_TEMPLATE/bug report.yml	
+++ b/.github/ISSUE_TEMPLATE/bug report.yml	
@@ -18,11 +18,6 @@ body:
         > ⚠️ **Important:** Submit a separate bug report for each problem you encounter.
         > 
         > 🚫 Do not include personal identifying information such as email addresses or encryption keys.
-        
-        ---
-        
-        > 📝 **Note:** The version list is automatically updated when a new release is created.
-        > See [`.github/workflows/release.yml`](../.github/workflows/release.yml) for details.
 
   # ─────────────────────────────────────────────────────────────────────────────
   # PROBLEM DESCRIPTION
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index c5100bf40..3df9b880f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -15,11 +15,6 @@ body:
         We appreciate you taking the time to help improve OpenSourcePOS.
         
         > 📋 **Before submitting:** Please search [existing feature requests](https://github.com/opensourcepos/opensourcepos/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) to ensure your idea hasn't already been suggested.
-        
-        ---
-        
-        > 📝 **Note:** The version list is automatically updated when a new release is created.
-        > See [`.github/workflows/release.yml`](../.github/workflows/release.yml) for details.
 
   # ─────────────────────────────────────────────────────────────────────────────
   # FEATURE DETAILS
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fe6997434..8cbe76591 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -115,6 +115,9 @@ jobs:
           # Insert new link after [unreleased] line
           sed -i "/^\[unreleased\]/a $NEW_LINK" "$CHANGELOG_FILE"
           
+          # Update [unreleased] link to start from new version
+          sed -i "s|^\[unreleased\]: .*|\[unreleased\]: https://github.com/opensourcepos/opensourcepos/compare/${NEW_VERSION}...HEAD|" "$CHANGELOG_FILE"
+          
           # Create version header and content
           VERSION_DATE=$(date +%Y-%m-%d)
           VERSION_HEADER="## [$NEW_VERSION] - $VERSION_DATE"