diff --git a/.github/workflows/chart-release-dispatcher.yaml b/.github/workflows/chart-release-dispatcher.yaml
index 26e03e56d4..153919d2bb 100644
--- a/.github/workflows/chart-release-dispatcher.yaml
+++ b/.github/workflows/chart-release-dispatcher.yaml
@@ -5,7 +5,6 @@ on:
     workflows:
       - "Java CI with Maven"
     branches:
-      - main
       - beta
       - staging
     types:
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0977cb36a2..58bed6dc7d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,6 +25,7 @@ on:
       - beta
       - development
       - master
+      - staging
       - lineageondemand
 
 jobs:
@@ -77,7 +78,7 @@ jobs:
         shell: bash
 
       - name: Get version tag
-        run: echo "##[set-output name=version;]$(echo `git ls-remote https://${{ secrets.my_pat }}@github.com/atlanhq/${REPOSITORY_NAME}.git ${{ steps.get_branch.outputs.branch }} | awk '{ print $1}' | cut -c1-7`)abcd"
+        run: echo "##[set-output name=version;]$(echo `git ls-remote https://${{ secrets.my_pat }}@github.com/atlanhq/${REPOSITORY_NAME}.git refs/heads/${{ steps.get_branch.outputs.branch }} | awk '{ print $1}' | cut -c1-7`)abcd"
         id: get_version
 
       - name: Set up Buildx 
@@ -104,7 +105,6 @@ jobs:
           tags: |
             ghcr.io/atlanhq/${{ github.event.repository.name }}-${{ steps.get_branch.outputs.branch }}:latest
             ghcr.io/atlanhq/${{ github.event.repository.name }}-${{ steps.get_branch.outputs.branch }}:${{ steps.get_version.outputs.version }}
-
       - name: Scan Image
         uses: aquasecurity/trivy-action@master
         with:
@@ -117,3 +117,26 @@ jobs:
         uses: github/codeql-action/upload-sarif@v2.1.33
         with:
           sarif_file: 'trivy-image-results.sarif'
+
+      - name: Check out into atlan repo
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ steps.get_branch.outputs.branch }}
+          repository: atlanhq/atlan
+          token: ${{ secrets.my_pat }}
+
+      - name: Add Changelog
+        run: |
+          mkdir -p gitlog
+          echo "- ${{ github.event.head_commit.message }}">>gitlog/${{ github.event.repository.name }}.txt
+          chmod +x ./scripts/create_changelog.sh
+          ./scripts/create_changelog.sh
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v7
+        with:
+          branch: ${{ steps.get_branch.outputs.branch }}
+          author_name: atlan-ci
+          author_email: it@atlan.com
+          message: '${{ github.event.repository.name }}'
+          default_author: user_info
+          push: origin ${{ steps.get_branch.outputs.branch }}