diff --git a/.argo/publish.yaml b/.argo/publish.yaml
index 9d6e91ac..d56aed7a 100644
--- a/.argo/publish.yaml
+++ b/.argo/publish.yaml
@@ -127,6 +127,19 @@ spec:
                 - name: chartDir
                   value: 'charts/kubefirst'
 
+        - - name: get-current-macro-chart-version
+            templateRef:
+              name: cwft-helm
+              template: get-macro-chart-version-from-charts
+              clusterScope: true
+            arguments:
+              artifacts:
+                - name: repo-source
+                  from: '{{steps.set-app-version-and-bump-macro-chartz.outputs.artifacts.repo-source}}'
+              parameters:
+                - name: chartDir
+                  value: "charts/kubefirst"
+
         - - name: pull-commit-push-tag-charts
             templateRef:
               name: cwft-git
diff --git a/.argo/release.yaml b/.argo/release.yaml
index d5b176d6..0a1944a1 100644
--- a/.argo/release.yaml
+++ b/.argo/release.yaml
@@ -178,6 +178,18 @@ spec:
                 - name: chartDir
                   value: 'charts/kubefirst'
 
+        - - name: get-current-macro-chart-version
+            templateRef:
+              name: cwft-helm
+              template: get-macro-chart-version-from-charts
+              clusterScope: true
+            arguments:
+              artifacts:
+                - name: repo-source
+                  from: '{{steps.set-app-version-and-bump-macro-chartz.outputs.artifacts.repo-source}}'
+              parameters:
+                - name: chartDir
+                  value: "charts/kubefirst"
 
         - - name: pull-commit-push-tag-charts
             templateRef:
@@ -196,5 +208,4 @@ spec:
                 - name: repoName
                   value: 'charts'
                 - name: tag
-                  value: 'kubefirst-v{{steps.get-initial-chart-version.outputs.result}}'
-
+                  value: 'kubefirst-v{{steps.get-current-macro-chart-version.outputs.result}}'