diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e734409..6e267f9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,18 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: build
-        uses: addnab/docker-run-action@v3
-        with:
-          image: 	dannyben/bashly
-          options: --rm -v ${{ github.workspace }}:/app
-          run: bashly generate
-      - name: tests
-        uses: addnab/docker-run-action@v3
-        with:
-          image: ghcr.io/dasharo/dasharo-sdk:v1.5.0
-          options: --rm -v ${{ github.workspace }}:/dcu
-          run: |
-            cd dcu
-            test/approve-ci
-            
\ No newline at end of file
+      - uses: arduino/setup-task@v2
+      - run: task test
+        env:
+          TASK_X_REMOTE_TASKFILES: 1
diff --git a/.gitignore b/.gitignore
index b622a30..1106f26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.rom
 *.bmp
 test/data/*
+.task
+.claude
diff --git a/Taskfile.yml b/Taskfile.yml
new file mode 100644
index 0000000..d7e0d6d
--- /dev/null
+++ b/Taskfile.yml
@@ -0,0 +1,28 @@
+version: '3'
+
+includes:
+  docker:
+    taskfile: https://raw.githubusercontent.com/3mdeb/taskfiles/fe705d9f1438e9da2ed5a6f1622bc1ba6f1d9f8e/docker.yml
+    checksum: e7414f0ebce7fcaab587d1bf5387c4f32bee952bf97de9c30b9075c609608b54
+
+tasks:
+  build:
+    desc: Generate CLI using bashly
+    cmds:
+      - task: docker:run
+        vars:
+          IMAGE: dannyben/bashly:1.3.6
+          VOLUMES: "{{.PWD}}:/app"
+          WORKDIR: /app
+          COMMAND: bashly generate
+
+  test:
+    desc: Run approval tests
+    deps: [build]
+    cmds:
+      - task: docker:run
+        vars:
+          IMAGE: ghcr.io/dasharo/dasharo-sdk:v1.5.0
+          VOLUMES: "{{.PWD}}:/dcu"
+          WORKDIR: /dcu
+          COMMAND: test/approve-ci