diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33d24f06..d2994073 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,17 +50,25 @@ jobs:
         run: bundle exec danger
 
   ios_test:
-    name: Running tests in iOS
+    name: Running iOS tests
     runs-on: macos-latest
     defaults:
       run:
         working-directory: ./sample/ios
     steps:
-      - uses: actions/checkout@v3
-      - uses: ruby/setup-ruby@v1
+      - name: Check out
+        uses: actions/checkout@v3
         with:
-          ruby-version: '3.2'
-          bundler-cache: true
+          submodules: recursive
+
+      - name: Set up cache
+        uses: actions/cache@v3
+        id: bunlderCache
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
 
       - name: Setup Java JDK
         uses: actions/setup-java@v2.1.0
@@ -104,15 +112,10 @@ jobs:
       - name: Clean up previous code coverage report
         run: bundle exec fastlane cleanUpOutput
 
-      - name: Review pull request by Danger
-        uses: MeilCli/danger-action@v5
-        with:
-          plugins_file: 'sample/ios/Gemfile'
-          install_path: 'sample/ios/vendor/bundle'
-          danger_file: 'sample/ios/Dangerfile'
-          danger_id: 'danger-pr'
+      - name: Run Danger to wrap up the review
         env:
           DANGER_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: bundle exec danger
 
   generate_sample_project:
     # The job "generate_sample_project" identify that the job "test" must complete successfully
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 2367ee50..e1ef4fc7 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     kotlin(Plugins.ANDROID)
 }
 
-val keystoreProperties = rootDir.loadGradleProperties("signing.properties")
+val keystoreProperties = loadProperties("$rootDir/signing.properties")
 
 android {
     namespace = "co.nimblehq.kmm.template.android"
diff --git a/buildSrc/src/main/java/FileExt.kt b/buildSrc/src/main/java/FileExt.kt
deleted file mode 100644
index e52f52d1..00000000
--- a/buildSrc/src/main/java/FileExt.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-import java.io.File
-import java.util.*
-
-fun File.loadGradleProperties(fileName: String): Properties {
-    val properties = Properties()
-    val signingProperties = File(this, fileName)
-
-    if (signingProperties.isFile) {
-        properties.load(signingProperties.inputStream())
-    }
-    return properties
-}