diff --git a/.github/workflows/publish-charts.yaml b/.github/workflows/publish-charts.yaml
index 21aafee4..04696a3a 100644
--- a/.github/workflows/publish-charts.yaml
+++ b/.github/workflows/publish-charts.yaml
@@ -1,9 +1,6 @@
 name: Publish Helm Charts
 
 on:
-  push:
-    tags:
-      - 'v*'
   workflow_dispatch:
     inputs:
       version:
@@ -86,7 +83,7 @@ jobs:
           exit 1
         fi
 
-        # Component versions: from inputs (workflow_dispatch) or default to umbrella version
+        # Component versions: always from workflow_dispatch inputs (all required)
         crds_ver="${INPUT_CRDS_VERSION}"
         operator_ver="${INPUT_OPERATOR_VERSION}"
         service_ver="${INPUT_SERVICE_VERSION}"
@@ -95,15 +92,6 @@ jobs:
         bmf_ver="${INPUT_BMF_VERSION}"
         ui_ver="${INPUT_UI_VERSION}"
 
-        # When triggered by tag push (no inputs), use the umbrella version for all components
-        : "${crds_ver:=${version}}"
-        : "${operator_ver:=${version}}"
-        : "${service_ver:=${version}}"
-        : "${aap_ver:=${version}}"
-        : "${bmf_crds_ver:=${version}}"
-        : "${bmf_ver:=${version}}"
-        : "${ui_ver:=${version}}"
-
         # Validate all component versions
         for pair in "osac-operator-crds:${crds_ver}" "osac-operator:${operator_ver}" "fulfillment-service:${service_ver}" "osac-aap:${aap_ver}" "bare-metal-fulfillment-operator-crds:${bmf_crds_ver}" "bare-metal-fulfillment-operator:${bmf_ver}" "osac-ui:${ui_ver}"; do
           name="${pair%%:*}"