diff --git a/.github/workflows/doc-helm.yaml b/.github/workflows/doc-helm.yaml
index 2bdfa2a..784db50 100644
--- a/.github/workflows/doc-helm.yaml
+++ b/.github/workflows/doc-helm.yaml
@@ -17,17 +17,22 @@ jobs:
         # Enable pipefail so git command failures do not result in null versions downstream
         set -x
 
-        echo "RSSERVER_VERSION=$(\
+        echo "APP_VERSION=$(\
             git ls-remote --tags --refs --sort="v:refname" \
-            https://github.com/RS-PYTHON/rs-server.git 'v*.*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | cut -d '.' -f 1 \
+            https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' \
         )" >> $GITHUB_OUTPUT
-        echo "SHA_SHORT=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
+
+        echo "CHART_VERSION=0.$(\
+            git ls-remote --tags --refs --sort="v:refname" \
+            https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | sed 's/.\{3\}/&-/' \
+         )" >> $GITHUB_OUTPUT
 
     - name: Update version number in chart.yaml
       shell: bash
       run: |
         for chart in $(find charts -name Chart.yaml); do
-        sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.RSSERVER_VERSION }}.0.0-${{ steps.get_version.outputs.SHA_SHORT }}," $chart
+        sed -i "s,{{APP_VERSION}},${{ steps.get_version.outputs.APP_VERSION }}," $chart
+        sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.CHART_VERSION }}," $chart
         done
 
     - name: Run helm-docs
diff --git a/.github/workflows/publish-helm.yml b/.github/workflows/publish-helm.yml
index 5645561..fa6ea59 100644
--- a/.github/workflows/publish-helm.yml
+++ b/.github/workflows/publish-helm.yml
@@ -10,8 +10,8 @@ on:
   push:
     tags:
       - '**'
-#     branches:
-#       - 'feat134/helm-chart-releaser'  
+    branches:
+      - 'feat**'  
   workflow_dispatch:
 
 env:
@@ -40,17 +40,35 @@ jobs:
           # Enable pipefail so git command failures do not result in null versions downstream
           set -x
 
-          echo "RSSERVER_VERSION=$(\
-              git ls-remote --tags --refs --sort="v:refname" \
-              https://github.com/RS-PYTHON/rs-server.git 'v*.*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | cut -d '.' -f 1 \
-          )" >> $GITHUB_OUTPUT
           echo "SHA_SHORT=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
 
+          echo "APP_VERSION=$(\
+            git ls-remote --tags --refs --sort="v:refname" \
+            https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' \
+          )" >> $GITHUB_OUTPUT
+          # v0.1a7
+
+          if [ "$GITHUB_REF_TYPE" == "tag" ]; then
+
+            echo "CHART_VERSION=0.$(echo $GITHUB_REF_NAME | sed 's/.*\///' | sed 's/^v//' | sed 's/^v//' | sed 's/.\{3\}/&-/')" >> $GITHUB_OUTPUT
+            # v0.1a7 => 0.0.1-a7
+
+          elif [ "$GITHUB_REF_TYPE" == "branch" ]; then
+
+            echo "CHART_VERSION=0.$(\
+                git ls-remote --tags --refs --sort="v:refname" \
+                https://github.com/RS-PYTHON/rs-server.git 'v0.*a*' | tail -n1 | sed 's/.*\///' | sed 's/^v//' | sed 's/.\{3\}/&-/' \
+            )-${{ steps.get_version.outputs.SHA_SHORT }}" >> $GITHUB_OUTPUT
+            # 0.0.1-a7-1tr5hrt
+
+          fi
+
       - name: Update version number in chart.yaml
         shell: bash
         run: |
-          for chart in $(find charts -name Chart.yaml); do
-            sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.RSSERVER_VERSION }}.0.0-${{ steps.get_version.outputs.SHA_SHORT }}," $chart
+          for chart in $(find charts -name Chart.yaml); do          
+            sed -i "s,{{APP_VERSION}},${{ steps.get_version.outputs.APP_VERSION }}," $chart
+            sed -i "s,{{CHART_VERSION}},${{ steps.get_version.outputs.CHART_VERSION }}," $chart
           done
 
       - id: publish-chart
diff --git a/charts/mockup-station-adgs/Chart.yaml b/charts/mockup-station-adgs/Chart.yaml
index 7e14e1a..857f0c9 100644
--- a/charts/mockup-station-adgs/Chart.yaml
+++ b/charts/mockup-station-adgs/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: MOCKUP STATION ADGS
 name: mockup-station-adgs
 version: {{CHART_VERSION}}
diff --git a/charts/mockup-station-cadip/Chart.yaml b/charts/mockup-station-cadip/Chart.yaml
index 7fca90a..441f5b3 100644
--- a/charts/mockup-station-cadip/Chart.yaml
+++ b/charts/mockup-station-cadip/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: MOCKUP STATION CADIP
 name: mockup-station-cadip
 version: {{CHART_VERSION}}
diff --git a/charts/rs-server-adgs/Chart.yaml b/charts/rs-server-adgs/Chart.yaml
index a59d98b..8a78c65 100644
--- a/charts/rs-server-adgs/Chart.yaml
+++ b/charts/rs-server-adgs/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: RS SERVER ADGS
 name: rs-server-adgs
 version: {{CHART_VERSION}}
diff --git a/charts/rs-server-cadip/Chart.yaml b/charts/rs-server-cadip/Chart.yaml
index 4312e1b..fff2b03 100644
--- a/charts/rs-server-cadip/Chart.yaml
+++ b/charts/rs-server-cadip/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: RS SERVER CADIP
 name: rs-server-cadip
 version: {{CHART_VERSION}}
diff --git a/charts/rs-server-catalog-db/Chart.yaml b/charts/rs-server-catalog-db/Chart.yaml
index af5c56a..eefeb12 100644
--- a/charts/rs-server-catalog-db/Chart.yaml
+++ b/charts/rs-server-catalog-db/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: RS SERVER CATALOG DB
 name: rs-server-catalog-db
 version: {{CHART_VERSION}}
diff --git a/charts/rs-server-catalog/Chart.yaml b/charts/rs-server-catalog/Chart.yaml
index 12e249f..fd6a42f 100644
--- a/charts/rs-server-catalog/Chart.yaml
+++ b/charts/rs-server-catalog/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: RS SERVER CATALOG
 name: rs-server-catalog
 version: {{CHART_VERSION}}
diff --git a/charts/rs-server-frontend/Chart.yaml b/charts/rs-server-frontend/Chart.yaml
index 1575365..7159a1a 100644
--- a/charts/rs-server-frontend/Chart.yaml
+++ b/charts/rs-server-frontend/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
-appVersion: {{CHART_VERSION}}
+appVersion: {{APP_VERSION}}
 description: RS SERVER FRONTEND
 name: rs-server-frontend
 version: {{CHART_VERSION}}