diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9413987..19c0292 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,22 +15,23 @@ jobs:
           java-version: '21'
           distribution: 'zulu'
           cache: 'maven'
-#      - name: Login to Docker Hub
-#        uses: docker/login-action@v3
-#        with:
-#          username: ${{secrets.DOCKERHUB_SIMPLEDOTORG_USERNAME}}
-#          password: ${{secrets.DOCKERHUB_SIMPLEDOTORG_ACCESS_TOCKEN}}
       - uses: stCarolas/setup-maven@v4.5
         with:
           maven-version: 3.9.6
+      - name: Clean branch name
+        run: |
+          BRANCH_NAME=${{ env.CLEAN_BRANCH_NAME }}
+          CLEAN_BRANCH_NAME=$(echo $BRANCH_NAME | sed 's/[\/_]/-/g')
+          echo "Cleaned branch name: $CLEAN_BRANCH_NAME"
+          echo CLEAN_BRANCH_NAME=$CLEAN_BRANCH_NAME >> $GITHUB_ENV
       - name: Sets up version
         working-directory: packager
-        run: mvn versions:set -DnewVersion=${{github.ref_name}}.${{github.run_number}}
+        run: mvn versions:set -DnewVersion=${{env.CLEAN_BRANCH_NAME}}.${{github.run_number}}
       - name: Builds Artifacts and Images
         working-directory: packager
         run: mvn clean install
       - name: Archive Hypertension Package
         uses: actions/upload-artifact@v4
         with:
-          name: Dhis2HypertensionPackage-${{github.ref_name}}.${{github.run_number}}-package.zip
-          path: packager/target/Dhis2HypertensionPackage-${{github.ref_name}}.${{github.run_number}}-package.zip
+          name: Dhis2HypertensionPackage-${{env.CLEAN_BRANCH_NAME}}.${{github.run_number}}-package.zip
+          path: packager/target/Dhis2HypertensionPackage-${{env.CLEAN_BRANCH_NAME}}.${{github.run_number}}-package.zip