diff --git a/build.gradle b/build.gradle
index 006b14743f..f64e8b4c0d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,11 @@ buildscript {
     classpath libs.plugin.ksp
     classpath libs.grgit
 
-    classpath libs.paparazzi.gradle.plugin
+    // Normally you would declare a version here, but we use dependency substitution in
+    // settings.gradle to use the version built from inside the repo.
+    classpath 'app.cash.paparazzi:paparazzi-gradle-plugin'
+
+//    classpath libs.paparazzi.gradle.plugin
   }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f5f95ec9a3..c5f580542a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.1.1"
+agp = "8.0.2"
 androidTools = "31.0.2" # == 23.0.0 + agp version
 bytebuddy = "1.14.5"
 composeCompiler = "1.4.7"
diff --git a/settings.gradle b/settings.gradle
index 8702bd6c21..28d73ff4f6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@ include ':sample'
 enableFeaturePreview('TYPESAFE_PROJECT_ACCESSORS')
 
 includeBuild('build-logic') {
-//  dependencySubstitution {
-//    substitute module('app.cash.paparazzi:paparazzi-gradle-plugin') using project(':paparazzi-gradle-plugin')
-//  }
+  dependencySubstitution {
+    substitute module('app.cash.paparazzi:paparazzi-gradle-plugin') using project(':paparazzi-gradle-plugin')
+  }
 }