diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 2e45b1419..d65cb20e3 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -20,8 +20,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+      - name: Setup Bats and libs
+        uses: brokenpip3/setup-bats-libs@1.5.0
         with:
-          submodules: recursive
+          assert-path: ${{ github.workspace }}/test/e2e/bats/assert
+          file-path: ${{ github.workspace }}/test/e2e/bats/file
+          support-path: ${{ github.workspace }}/test/e2e/bats/support
+
       - name: Setup Go and ko
         uses: ./.github/actions/setup
 
@@ -32,6 +37,7 @@ jobs:
           cluster_name: kind
           config: test/kind/config.yaml
           wait: 120s
+
       - uses: shipwright-io/setup@v1
         with:
           tekton-version: v0.38.3
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e1a519750..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,12 +0,0 @@
-[submodule "test/e2e/bats/core"]
-	path = test/e2e/bats/core
-	url = https://github.com/bats-core/bats-core
-[submodule "test/e2e/bats/support"]
-	path = test/e2e/bats/support
-	url = https://github.com/bats-core/bats-support
-[submodule "test/e2e/bats/assert"]
-	path = test/e2e/bats/assert
-	url = https://github.com/bats-core/bats-assert
-[submodule "test/e2e/bats/file"]
-	path = test/e2e/bats/file
-	url = https://github.com/bats-core/bats-file
diff --git a/Makefile b/Makefile
index 07eaa2f4b..503484c33 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ test-unit:
 
 # looks for *.bats files in the test/e2e directory and runs them
 test-e2e:
-	./test/e2e/bats/core/bin/bats --recursive test/e2e/*.bats
+	bats --recursive test/e2e/*.bats
 
 # runs act, with optional arguments
 .PHONY: act