diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
index 79e140f59..ff85129dd 100644
--- a/.github/workflows/build-android.yml
+++ b/.github/workflows/build-android.yml
@@ -2,7 +2,7 @@ name: Build Android Registration-Client
 
 on:
   workflow_dispatch:
-  inputs:
+    inputs:
       serverBaseURL:
         description: "Enter serverBaseURL for APK"
         required: true
diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
index 8b8faf36a..9d2676afe 100644
--- a/.github/workflows/push_trigger.yml
+++ b/.github/workflows/push_trigger.yml
@@ -19,13 +19,13 @@ on:
       - "sprint-*"
 
 jobs:
-   codeql:
+  codeql:
     name: CodeQL Security Analysis
     runs-on: ubuntu-latest
     permissions:
       contents: read
       security-events: write
-
+  
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -36,7 +36,10 @@ jobs:
           languages: "java"
 
       - name: Build for CodeQL
-        run: ./gradlew build || true
+        run: |
+          cd client
+          chmod +x gradlew
+          ./gradlew build || true
 
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v3
@@ -44,9 +47,10 @@ jobs:
   build:
     name: Android Build Check
     runs-on: ubuntu-latest
-    needs: [codeql]   
+    needs: [codeql]
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
 
       - name: Setup Java 17
         uses: actions/setup-java@v3
@@ -69,9 +73,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install npm dependencies
+      - name: Check repo structure
         run: |
-          npm install
+          echo "Listing files:"
+          ls -R .
+          
+      - name: Install npm dependencies
+        working-directory: client
+        run: npm install
       - name: Updating serverBaseURL.
         run: |
           find . -type f -name "*build.gradle" -print0 | xargs -0 sed -i "s/api-internal.sandbox.xyz.net/${{ github.event.inputs.defaultServerBaseURL }}/g"