diff --git a/.github/workflows/publish-cli.yml b/.github/workflows/publish-cli.yml
index 6af65bd412..d05237bc26 100644
--- a/.github/workflows/publish-cli.yml
+++ b/.github/workflows/publish-cli.yml
@@ -12,13 +12,14 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 11
 
-      - uses: gradle/gradle-build-action@v2
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Publish CLI
         run: ./gradlew :maestro-cli:jreleaserFullRelease --no-daemon --no-parallel
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 376a3650c1..f01093e7aa 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -19,13 +19,14 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 11
 
-      - uses: gradle/gradle-build-action@v2
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Retrieve version
         run: |
diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
index 14e819698b..9772bab744 100644
--- a/.github/workflows/publish-snapshot.yml
+++ b/.github/workflows/publish-snapshot.yml
@@ -15,13 +15,14 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
           java-version: 11
 
-      - uses: gradle/gradle-build-action@v2
+      - name: Set up Gradle
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Retrieve version
         run: |
diff --git a/.github/workflows/test-e2e-prod.yaml b/.github/workflows/test-e2e-prod.yaml
index 626aaba54b..7ede48a839 100644
--- a/.github/workflows/test-e2e-prod.yaml
+++ b/.github/workflows/test-e2e-prod.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK 8
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
diff --git a/.github/workflows/test-e2e.yaml b/.github/workflows/test-e2e.yaml
index ebd33e3b4b..05b87d8991 100644
--- a/.github/workflows/test-e2e.yaml
+++ b/.github/workflows/test-e2e.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
@@ -54,7 +54,7 @@ jobs:
       - name: Clone repository (only needed for the e2e directory)
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
@@ -109,7 +109,7 @@ jobs:
         with:
           name: maestro-cli
 
-      - name: Set up JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: zulu
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 292cbeff7c..2bb1bd615a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,21 +1,21 @@
 name: Test
 
 on:
+  workflow_dispatch:
   pull_request:
 
 jobs:
   test:
     runs-on: ubuntu-latest
-    if: github.repository == 'mobile-dev-inc/maestro'
 
     steps:
-      - name: Checkout
+      - name: Clone repository
         uses: actions/checkout@v4
 
-      - name: Install JDK
+      - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'zulu'
+          distribution: zulu
           java-version: 11
 
       - name: Set up Gradle
@@ -25,10 +25,11 @@ jobs:
         run: ./gradlew test
 
 
-  validation:
+  validate-gradle-wrapper:
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout
+      - name: Clone repository
         uses: actions/checkout@v4
 
       - name: Validate Gradle Wrapper