diff --git a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
index 22320082..9609ad86 100644
--- a/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
+++ b/tools/deployment-cli-tools/ch_cli_tools/skaffold.py
@@ -220,7 +220,7 @@ def identify_unicorn_based_main(candidates):
                 'images': [artifact['image'] for artifact in artifacts.values() if artifact['image']]
             }
         }
-    if backend == COMPOSE_ENGINE or not helm_values.tag:
+    if backend == COMPOSE_ENGINE or helm_values.tag and not helm_values.local:
         skaffold_conf['build']['tagPolicy'] = {
             'envTemplate': {
                 'template': '"{{.TAG}}"'