diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 808a2e93a..475b28646 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -112,6 +112,7 @@ win:container_prep:
     - .build-rules
   image: $MONADO_IMAGE
 
+
 # Variables for build and usage of Debian bullseye image
 .monado.variables.debian:bullseye:
   variables:
@@ -350,6 +351,26 @@ ndk:arm64-v8a:
     - .gitlab-ci/prebuild.sh
     - .gitlab-ci/ci-cmake-build.sh -DANDROID_ABI=arm64-v8a -DANDROID_PLATFORM=26 -DBUILD_DOC=OFF -DCMAKE_TOOLCHAIN_FILE=/opt/android-ndk/build/cmake/android.toolchain.cmake -DEigen3_DIR=/usr/lib/cmake/eigen3/ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3
 
+android:spotlessCheck:
+  stage: build
+  extends:
+    - .monado.image.debian:bullseye-ndk
+  before_script:
+    # For caching gradle stuff
+    - export GRADLE_USER_HOME=`pwd`/.gradlehome
+
+  variables:
+    GRADLE_ARGS: "-Porg.gradle.daemon=false "
+  cache:
+    paths:
+      - .gradlehome/wrapper
+      - .gradlehome/caches
+
+  script:
+
+    - .gitlab-ci/prebuild.sh
+    - .gitlab-ci/ci-gradle-build.sh spotlessCheck
+
 android:outOfProcessDebug:
   stage: build
   extends:
@@ -620,4 +641,4 @@ pages:
     - mv repo public/apt
   artifacts:
     paths:
-      - public
\ No newline at end of file
+      - public
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 27efd18fc..563cc961c 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -150,6 +150,9 @@ distributions:
               BUILD_DOC: "OFF"
               ANDROID_ABI: arm64-v8a
 
+          - name: android:spotlessCheck
+            target: spotlessCheck
+
           - name: android:outOfProcessDebug
             target: assembleOutOfProcessDebug
             artifact_path: src/xrt/targets/openxr_android/build/outputs/apk/outOfProcess