diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
index 4e5d4a0..c020160 100644
--- a/.github/workflows/build-test.yml
+++ b/.github/workflows/build-test.yml
@@ -13,17 +13,22 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v2
+
       - name: Setup node 12
         uses: actions/setup-node@v1
         with:
           node-version: 12.x
+
       - run: npm ci
+
       - run: npm run build
+
       - run: npm run format-check
+
       - run: npm test
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
index 08bf902..20d6295 100644
--- a/.github/workflows/run-test.yml
+++ b/.github/workflows/run-test.yml
@@ -13,35 +13,30 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        operating-system:
+        os:
           - ubuntu-latest
           - windows-latest
           - macos-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          path: setup-android
-      - uses: actions/checkout@v2
-        with:
-          repository: westnordost/StreetComplete
-          path: streetcomplete
+          repository: daveol/SampleApplication
+
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
+
       - name: Setup Android SDK
-        id: 'setup-android'
-        uses: ./setup-android/
-      - name: Run sdkmanager
+        uses: ${{ github.repository }}@${{ github.ref }}
+
+      - name: Build SampleApplication
         if: runner.os != 'windows'
-        run: |
-          cd streetcomplete
-          ./gradlew build
+        run: ./gradlew --no-daemon build
+
       - name: Build streetcomplete (Windows)
         if: runner.os == 'windows'
-        run: |
-          cd streetcomplete
-          .\gradlew.bat build
+        run: .\gradlew.bat --no-daemon build