diff --git a/.gitea/workflows/release-charts-cloudflared.yml b/.gitea/workflows/release-charts-cloudflared.yml
index 7904f66..442ec29 100644
--- a/.gitea/workflows/release-charts-cloudflared.yml
+++ b/.gitea/workflows/release-charts-cloudflared.yml
@@ -21,7 +21,6 @@ jobs:
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
-        id: install
 
       - name: Package Helm Chart
         run: |
@@ -40,8 +39,15 @@ jobs:
           helm repo add --username ${{ github.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm
           helm cm-push ${{ env.PACKAGE_PATH }} helm-charts
 
+      - name: Extract Chart Metadata
+        run: |
+          CHART_VERSION=$(yq '.version' Chart.yaml)
+          CHART_NAME=$(yq '.name' Chart.yaml)
+
       - name: Release Helm Chart
         uses: akkuman/gitea-release-action@v1
         with:
+          name: $CHART_NAME
+          tag_name: $CHART_VERSION
           files: |-
             ${{ env.PACKAGE_PATH }}
diff --git a/.gitea/workflows/release-charts-generic-device-plugin.yml b/.gitea/workflows/release-charts-generic-device-plugin.yml
index f4480a7..6cd428d 100644
--- a/.gitea/workflows/release-charts-generic-device-plugin.yml
+++ b/.gitea/workflows/release-charts-generic-device-plugin.yml
@@ -21,7 +21,6 @@ jobs:
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
-        id: install
 
       - name: Package Helm Chart
         run: |
@@ -40,8 +39,15 @@ jobs:
           helm repo add --username ${{ github.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm
           helm cm-push ${{ env.PACKAGE_PATH }} helm-charts
 
+      - name: Extract Chart Metadata
+        run: |
+          CHART_VERSION=$(yq '.version' Chart.yaml)
+          CHART_NAME=$(yq '.name' Chart.yaml)
+
       - name: Release Helm Chart
         uses: akkuman/gitea-release-action@v1
         with:
+          name: $CHART_NAME
+          tag_name: $CHART_VERSION
           files: |-
             ${{ env.PACKAGE_PATH }}
diff --git a/.gitea/workflows/release-charts-postgres-cluster.yml b/.gitea/workflows/release-charts-postgres-cluster.yml
index edd1af0..acc48ce 100644
--- a/.gitea/workflows/release-charts-postgres-cluster.yml
+++ b/.gitea/workflows/release-charts-postgres-cluster.yml
@@ -21,7 +21,6 @@ jobs:
         with:
           token: ${{ secrets.GITEA_TOKEN }}
           version: latest
-        id: install
 
       - name: Package Helm Chart
         run: |
@@ -40,8 +39,15 @@ jobs:
           helm repo add --username ${{ github.actor }} --password ${{ secrets.REPOSITORY_TOKEN }} helm-charts https://${{ vars.REPOSITORY_HOST }}/api/packages/alexlebens/helm
           helm cm-push ${{ env.PACKAGE_PATH }} helm-charts
 
+      - name: Extract Chart Metadata
+        run: |
+          CHART_VERSION=$(yq '.version' Chart.yaml)
+          CHART_NAME=$(yq '.name' Chart.yaml)
+
       - name: Release Helm Chart
         uses: akkuman/gitea-release-action@v1
         with:
+          name: $CHART_NAME
+          tag_name: $CHART_VERSION
           files: |-
             ${{ env.PACKAGE_PATH }}