diff --git a/htmgo-site/Taskfile.yml b/htmgo-site/Taskfile.yml
index a6d5700..caf16b9 100644
--- a/htmgo-site/Taskfile.yml
+++ b/htmgo-site/Taskfile.yml
@@ -3,14 +3,14 @@ version: '3'
 tasks:
   run:
     cmds:
-      - go run github.com/maddalax/htmgo/cli@latest run
+      - htmgo run
     silent: true
 
   build:
     cmds:
-      - go run github.com/maddalax/htmgo/cli/htmgo@latest build
+      - htmgo build
 
   watch:
     cmds:
-      - go run github.com/maddalax/htmgo/cli@latest watch
-    silent: true
\ No newline at end of file
+      - htmgo watch
+    silent: true
diff --git a/templates/starter/Taskfile.yml b/templates/starter/Taskfile.yml
index 695006f..28f1902 100644
--- a/templates/starter/Taskfile.yml
+++ b/templates/starter/Taskfile.yml
@@ -3,12 +3,12 @@ version: '3'
 tasks:
   run:
     cmds:
-      - go run github.com/maddalax/htmgo/cli/htmgo@latest run
+      - htmgo run
     silent: true
 
   build:
     cmds:
-      - go run github.com/maddalax/htmgo/cli/htmgo@latest build
+      - htmgo build
 
   docker:
     cmds:
@@ -16,5 +16,5 @@ tasks:
 
   watch:
     cmds:
-      - go run github.com/maddalax/htmgo/cli/htmgo@latest watch
-    silent: true
\ No newline at end of file
+      - htmgo watch
+    silent: true