diff --git a/.github/workflows/actions/run-kurtosis-docker/action.yaml b/.github/workflows/actions/run-kurtosis-docker/action.yaml
new file mode 100644
index 00000000..42a3c85c
--- /dev/null
+++ b/.github/workflows/actions/run-kurtosis-docker/action.yaml
@@ -0,0 +1,28 @@
+name: Run Kurtosis using Docker driver
+description: Runs Kurtosis enclave using Docker driver
+inputs:
+  args-file:
+    description: "Kurtosis args file"
+    default: ""
+  enclave:
+    description: "Kurtosis enclave name"
+    default: "devnet"
+
+runs:
+  using: "composite"
+  steps:
+    - name: Start enclave ${{ inputs.enclave }}
+      shell: bash
+      run: kurtosis run . ${{ inputs.args-file && format('--args-file={0}', inputs.args-file) || '' }} --enclave=${{ inputs.enclave }} --verbosity detailed
+
+    - name: Dump kurtosis logs
+      shell: bash
+      if: ${{ failure() }}
+      run: kurtosis dump ./.kurtosis-dump
+
+    - name: Store kurtosis logs
+      if: ${{ failure() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: kurtosis-logs
+        path: ./.kurtosis-dump/enclaves/
\ No newline at end of file
diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml
index d4df3fda..d8a6e742 100644
--- a/.github/workflows/per-pr.yml
+++ b/.github/workflows/per-pr.yml
@@ -14,7 +14,7 @@ jobs:
       matrix:
         file_name:
           [
-            "./network_params.yaml"
+            "./network_params.yaml",
           ]
     runs-on: ubuntu-latest
     steps:
@@ -23,20 +23,11 @@ jobs:
 
       - name: Install mise
         uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.2.1
-
-      - name: Run Starlark
-        run: kurtosis run ${{ github.workspace }} --args-file ${{ matrix.file_name }} --verbosity detailed
-
-      - name: Dump logs
-        run: kurtosis dump ./.kurtosis-dump && ls -al .kurtosis-dump
-        if: ${{ failure() }}
-
-      - name: Store logs
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
+      
+      - name: Run kurtosis
+        uses: ./.github/workflows/actions/run-kurtosis-docker
         with:
-          name: kurtosis-logs
-          path: ./.kurtosis-dump/enclaves/
+          args-file: ${{ matrix.file_name }}
 
   # Make sure that `kurtosis run .` without an --args-file works fine (the defaults in input_parser.star are correct)
   run_without_args:
@@ -49,19 +40,8 @@ jobs:
       - name: Install mise
         uses: jdx/mise-action@7a111ead46986ccad89a74ad013ba2a7c08c9e67 # v2.2.1
 
-      - name: Run Starlark
-        run: kurtosis run ${{ github.workspace }} --verbosity detailed
-
-      - name: Dump logs
-        run: kurtosis dump .kurtosis-dump && ls -al .kurtosis-dump
-        if: ${{ failure() }}
-
-      - name: Store logs
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: kurtosis-logs
-          path: .kurtosis-dump/
+      - name: Run kurtosis
+        uses: ./.github/workflows/actions/run-kurtosis-docker
 
   run_k8s_test:
     name: Run k8s tests
diff --git a/mise.toml b/mise.toml
index 20d83513..9c533eb0 100644
--- a/mise.toml
+++ b/mise.toml
@@ -3,7 +3,7 @@
 # Core dependencies
 just = "1.40.0"
 "ubi:ethereum-optimism/kurtosis-test" = "0.0.5"
-"ubi:kurtosis-tech/kurtosis-cli-release-artifacts[exe=kurtosis]" = "1.6.0"
+"ubi:kurtosis-tech/kurtosis-cli-release-artifacts[exe=kurtosis]" = "1.8.1"
 "yq" = "v4.44.3"
 
 # lint