diff --git a/.github/workflows/publish-images.yaml b/.github/workflows/publish-images.yaml
index 4868c8e..13e33b4 100644
--- a/.github/workflows/publish-images.yaml
+++ b/.github/workflows/publish-images.yaml
@@ -33,7 +33,7 @@ jobs:
         uses: haya14busa/action-cond@v1
         with:
           cond: ${{ github.event_name == 'release' }}
-          if_true: ${{ github.release.tag_name }}
+          if_true: ${{ github.event.release.tag_name }}
           if_false: "canary"
 
       - name: Checkout
diff --git a/charts/opvic/values.yaml b/charts/opvic/values.yaml
index 964cf5a..a2b487d 100644
--- a/charts/opvic/values.yaml
+++ b/charts/opvic/values.yaml
@@ -21,7 +21,8 @@ controlplane:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     # set to canary for the latest unreleased version
-    tag: "canary"
+    # tag: "canary"
+    tag: ""
 
   # Control plane cache configuration
   cache:
@@ -131,7 +132,8 @@ agent:
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
     # set to canary for the latest unreleased version
-    tag: "canary"
+    # tag: "canary"
+    tag: ""
 
   # Agent unique id across all clusters
   identifier: ""