diff --git a/.github/workflows/robustness_nightly.yaml b/.github/workflows/robustness_nightly.yaml
index 0812f6230..df04e7842 100644
--- a/.github/workflows/robustness_nightly.yaml
+++ b/.github/workflows/robustness_nightly.yaml
@@ -15,10 +15,3 @@ jobs:
       count: 100
       testTimeout: 200m
       runs-on: "['ubuntu-latest']"
-  arm64:
-    # GHA has a maximum amount of 6h execution time, we try to get done within 3h
-    uses: ./.github/workflows/robustness_template.yaml
-    with:
-      count: 100
-      testTimeout: 200m
-      runs-on: "['actuated-arm64-4cpu-8gb']"
diff --git a/.github/workflows/robustness_test.yaml b/.github/workflows/robustness_test.yaml
index 1e0aa5007..03392859d 100644
--- a/.github/workflows/robustness_test.yaml
+++ b/.github/workflows/robustness_test.yaml
@@ -8,9 +8,3 @@ jobs:
       count: 10
       testTimeout: 30m
       runs-on: "['ubuntu-latest']"
-  arm64:
-    uses: ./.github/workflows/robustness_template.yaml
-    with:
-      count: 10
-      testTimeout: 30m
-      runs-on: "['actuated-arm64-4cpu-8gb']"
diff --git a/.github/workflows/tests_arm64.yaml b/.github/workflows/tests_arm64.yaml
deleted file mode 100644
index 6498c0c0f..000000000
--- a/.github/workflows/tests_arm64.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Tests ARM64
-permissions: read-all
-on: [push, pull_request]
-jobs:
-  test-linux-arm64:
-    uses: ./.github/workflows/tests-template.yml
-    with:
-      runs-on: actuated-arm64-4cpu-8gb
-  test-linux-arm64-race:
-    uses: ./.github/workflows/tests-template.yml
-    with:
-      runs-on: actuated-arm64-8cpu-8gb
-      targets: "['linux-unit-test-4-cpu-race']"
diff --git a/Makefile b/Makefile
index 2e0c09fa8..f5a6703a0 100644
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,8 @@ test-failpoint:
 	@echo "[failpoint] array freelist test"
 	BBOLT_VERIFY=all TEST_FREELIST_TYPE=array go test -v ${TESTFLAGS} -timeout 30m ./tests/failpoint
 
-.PHONY: test-robustness # Running robustness tests requires root permission
+.PHONY: test-robustness # Running robustness tests requires root permission for now
+# TODO: Remove sudo once we fully migrate to the prow infrastructure
 test-robustness: gofail-enable build
 	sudo env PATH=$$PATH go test -v ${TESTFLAGS} ./tests/dmflakey -test.root
 	sudo env PATH=$(PWD)/bin:$$PATH go test -v ${TESTFLAGS} ${ROBUSTNESS_TESTFLAGS} ./tests/robustness -test.root