diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index e196ff6f..054e15c0 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -18,19 +18,11 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build_apk"
-  
-
   build_apk:
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      - name: Enable KVM group perms
-        run: |
-          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
-          sudo udevadm control --reload-rules
-          sudo udevadm trigger --name-match=kvm
-    
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - name: Checkout
         uses: actions/checkout@v4
@@ -59,12 +51,46 @@ jobs:
         working-directory: ./Compose-Flight-Search-App
         run: ./gradlew test
 
-      - name: Run instrumentation test
-        uses: ReactiveCircus/android-emulator-runner@v2.30.1
-        with:
-          working-directory: ./Compose-Flight-Search-App
-          api-level: 33
-          script: ./gradlew connectedAndroidTest
+      - name: Build
+        working-directory: ./Compose-Flight-Search-App
+        run: ./gradlew assemble
+
 
+  android_test:
+      # The type of runner that the job will run on
+      runs-on: ubuntu-latest
+      # Steps represent a sequence of tasks that will be executed as part of the job
+      steps:
+        - name: Enable KVM group perms
+          run: |
+            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+            sudo udevadm control --reload-rules
+            sudo udevadm trigger --name-match=kvm
+      
+        # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+        - name: Checkout
+          uses: actions/checkout@v4
+  
+        - name: Gradle Wrapper Validation
+          uses: gradle/actions/wrapper-validation@v3.3.2
+            
+        - name: SetUp Java
+          uses: actions/setup-java@v4
+          with:
+            distribution: temurin
+            java-version: 17
+  
+        - name: Setup Gradle
+          uses: gradle/actions/setup-gradle@v3
+  
+        - name: Make gradlew executable
+          working-directory: ./Compose-Flight-Search-App
+          run: chmod +x ./gradlew
   
+        - name: Run instrumentation test
+          uses: ReactiveCircus/android-emulator-runner@v2.30.1
+          with:
+            working-directory: ./Compose-Flight-Search-App
+            api-level: 33
+            script: ./gradlew connectedAndroidTest