diff --git a/functionaltests/resources/v2/wb_v2.yaml b/functionaltests/resources/v2/wb_v2.yaml
index c6b0223f..e3d359be 100644
--- a/functionaltests/resources/v2/wb_v2.yaml
+++ b/functionaltests/resources/v2/wb_v2.yaml
@@ -6,8 +6,9 @@ name: wb
 workflows:
   wf1:
     type: direct
+
     tasks:
       hello:
         action: std.echo output="Hello"
         publish:
-            result: <% $.hello %>
+          result: <% task(hello).result %>
diff --git a/functionaltests/resources/v2/wb_with_tags_v2.yaml b/functionaltests/resources/v2/wb_with_tags_v2.yaml
index 8cc66a08..013bcad8 100644
--- a/functionaltests/resources/v2/wb_with_tags_v2.yaml
+++ b/functionaltests/resources/v2/wb_with_tags_v2.yaml
@@ -12,4 +12,4 @@ workflows:
       hello:
         action: std.echo output="Hello"
         publish:
-          result: <% $.hello %>
+          result: <% task(hello).result %>
diff --git a/functionaltests/resources/v2/wf_delay_v2.yaml b/functionaltests/resources/v2/wf_delay_v2.yaml
index 7eb23c0d..ad0f29e6 100644
--- a/functionaltests/resources/v2/wf_delay_v2.yaml
+++ b/functionaltests/resources/v2/wf_delay_v2.yaml
@@ -9,7 +9,7 @@ wf:
     hello:
       action: std.echo output="Hello"
       publish:
-        result: <% $.hello %>
+        result: <% task(hello).result %>
       wait-after: 1
       on-success:
         - task2
@@ -17,4 +17,4 @@ wf:
     task2:
       action: std.echo output="Task 2"
       publish:
-        task2: <% $.task2 %>
+        task2: <% task(task2).result %>
diff --git a/functionaltests/resources/v2/wf_single_v2.yaml b/functionaltests/resources/v2/wf_single_v2.yaml
index ad213d59..aedee3e1 100644
--- a/functionaltests/resources/v2/wf_single_v2.yaml
+++ b/functionaltests/resources/v2/wf_single_v2.yaml
@@ -8,4 +8,4 @@ wf_single:
     hello:
       action: std.echo output="Hello"
       publish:
-        result: <% $.hello %>
+        result: <% task(hello).result %>
diff --git a/functionaltests/resources/v2/wf_v2.yaml b/functionaltests/resources/v2/wf_v2.yaml
index 95d7f3d4..e32862eb 100644
--- a/functionaltests/resources/v2/wf_v2.yaml
+++ b/functionaltests/resources/v2/wf_v2.yaml
@@ -9,7 +9,7 @@ wf:
       action: std.echo output="Hello"
       wait-before: 5
       publish:
-        result: <% $.hello %>
+        result: <% task(hello).result %>
 
 wf1:
   type: reverse
@@ -21,7 +21,7 @@ wf1:
     addressee:
       action: std.echo output="John"
       publish:
-        name: <% $.addressee %>
+        name: <% task(addressee).result %>
 
     goodbye:
       action: std.echo output="<% $.farewell %>, <% $.name %>"