diff --git a/.github/workflows/.deploy.yml b/.github/workflows/.deploy.yml
index cdf5c92ea..590eb79cc 100644
--- a/.github/workflows/.deploy.yml
+++ b/.github/workflows/.deploy.yml
@@ -95,6 +95,9 @@ jobs:
       - name: Package HELM Chart
         shell: bash
         run: |
+          # remove the excess part from semver, for example: x.x.x_* -> x.x.x
+          semver=$(echo ${{ inputs.semver }} | cut -d'_' -f1)
+          echo "Semver: $semver"
           helm package -u --app-version="${{ inputs.tag }}" --version=${{ inputs.semver }} ./${{ inputs.directory }}
 
       - name: Deploy to OpenShift
diff --git a/.github/workflows/cd-to-prod-on-workflow-dispatch.yml b/.github/workflows/cd-to-prod-on-workflow-dispatch.yml
index f8f3a79e1..6604de6b7 100644
--- a/.github/workflows/cd-to-prod-on-workflow-dispatch.yml
+++ b/.github/workflows/cd-to-prod-on-workflow-dispatch.yml
@@ -7,12 +7,18 @@ on:
       tag:
         description: "The Docker Tag to deploy, it would be the latest tagged version that you want to deploy from TEST to PROD."
         required: true
+      is_hotfix:
+        description: "Is this a hotfix deployment?"
+        required: false
+        default: false
+        type: boolean
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
   image-promotions-to-prod: # This is just for adding another tag to the image to reflect which docker tag is deployed to PROD.
+    if: ${{ !github.event.inputs.is_hotfix }}
     name: Image Promotions to PROD
     runs-on: ubuntu-22.04
     permissions:
diff --git a/.github/workflows/cd-to-test-on-workflow-dispatch.yml b/.github/workflows/cd-to-test-on-workflow-dispatch.yml
index 75ad37a60..f776f4c8d 100644
--- a/.github/workflows/cd-to-test-on-workflow-dispatch.yml
+++ b/.github/workflows/cd-to-test-on-workflow-dispatch.yml
@@ -8,13 +8,18 @@ on:
       tag:
         description: "The Docker Tag to deploy, it would be the latest tagged version that you want to deploy from dev to TEST."
         required: true
-
+      is_hotfix:
+        description: "Is this a hotfix deployment?"
+        required: false
+        default: false
+        type: boolean
 concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true
 
 jobs:
   image-promotions-to-test: # This is just for adding another tag to the image to reflect which docker tag is deployed to TEST.
+    if: ${{ !github.event.inputs.is_hotfix }}
     name: Image Promotions to TEST
     runs-on: ubuntu-22.04
     permissions:
diff --git a/admin-frontend/src/components/Header.vue b/admin-frontend/src/components/Header.vue
index 83cd2c924..a8920cd1d 100644
--- a/admin-frontend/src/components/Header.vue
+++ b/admin-frontend/src/components/Header.vue
@@ -23,7 +23,7 @@
       @click="redirectToLogout()"
       data-testid="logout-btn"
     >
-      Logout
+      Logouts
     </v-btn>
 
     <!-- Navbar content -->