diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 803cf5aeb1..313ff526fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -395,7 +395,8 @@ jobs:
 
   codecov-device-coverage-upload:
     needs: [android-test-gmd, android-test-gmd-cfg]
-    if: always()
+    # TODO: Re-enable with device code coverage: https://github.com/alexvanyo/composelife/issues/2257
+    if: false
     runs-on: ubuntu-latest
 
     strategy:
diff --git a/build-logic/convention/src/main/kotlin/com/alexvanyo/composelife/buildlogic/Jacoco.kt b/build-logic/convention/src/main/kotlin/com/alexvanyo/composelife/buildlogic/Jacoco.kt
index 5584ed9f4c..f7ec5f7965 100644
--- a/build-logic/convention/src/main/kotlin/com/alexvanyo/composelife/buildlogic/Jacoco.kt
+++ b/build-logic/convention/src/main/kotlin/com/alexvanyo/composelife/buildlogic/Jacoco.kt
@@ -146,7 +146,7 @@ fun Project.configureJacoco(
 
     commonExtension.buildTypes.configureEach {
         enableUnitTestCoverage = true
-        // TODO: Re-enable test coverage for instrumented tests
+        // TODO: Re-enable test coverage for instrumented tests https://github.com/alexvanyo/composelife/issues/2257
         // enableAndroidTestCoverage = true
     }