diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bfae6169cef..27dbd730934 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -103,7 +103,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shard: [shard0, shard1, shard2, shard3]
+        shard: [shard0, shard1, shard2, shard3, shard4, shard5, shard6, shard7]
     steps:
       - uses: actions/checkout@v2
 
diff --git a/app/build.gradle b/app/build.gradle
index c8de52e2896..bfecf8b032b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -107,7 +107,7 @@ _excludeTestFiles(filesToExclude)
 // one shard after another without cleaning first (since Gradle doesn't handle file exclusion well,
 // it expects files to be present corresponding to generated code, such as Dagger, from previous
 // runs).
-def appModuleShardCount = 4
+def appModuleShardCount = 8
 def shardIndexes = 0..(appModuleShardCount - 1)
 shardIndexes.each { shardIndex ->
   if (project.gradle.startParameter?.taskRequests?.args[0]?.remove("--shard$shardIndex".toString())) {