diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4be166a..28c798a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,37 +1,31 @@
-name: CI Workflow
+name: CI
 
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
+on: [push, pull_request]
 
 jobs:
-  build:
+  test:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
       - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
+          distribution: 'adopt'
           java-version: '17'
 
-      - name: Set up Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: wrapper
+      - name: Build with Gradle
+        run: ./gradlew clean test
 
-      - name: Build and Run Tests
-        run: ./gradlew clean build
+      - name: Archive Serenity Reports
+        uses: actions/upload-artifact@v2
+        with:
+          name: serenity-reports
+          path: target/site/serenity/
 
-      - name: Publish Test Report
-        if: always()
+      - name: Archive Cucumber JSON Report
         uses: actions/upload-artifact@v2
         with:
-          name: Serenity Report
-          path: build/reports/tests/test/index.html
+          name: cucumber-reports
+          path: target/cucumber.json