diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 12831a7c..b86296b4 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ targetSdk = "33"
 
 agp = "8.5.0-alpha05"
 android-tools-common = "31.5.0-alpha05"
-anvil = "2.5.0-beta04"
+anvil = "2.5.0-beta05"
 bmversions = "0.51.0"
 detekt = "1.23.6"
 diktat = "2.0.0"
@@ -73,7 +73,7 @@ mockwebserver-dsl = "1.0.0"
 okhttp = "4.12.0"
 okio = "3.9.0"
 paparazzi = "1.3.3"
-pixnews-anvil-codegen = "0.3"
+pixnews-anvil-codegen = "0.4"
 prefiller = "1.6.0-SNAPSHOT"
 retrofit = "2.9.0"
 radiography = "2.5"
@@ -191,18 +191,18 @@ okhttp = { group = "com.squareup.okhttp3", name = "okhttp" }
 okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor" }
 okhttp-mockwebserver = { group = "com.squareup.okhttp3", name = "mockwebserver" }
 okio = { group = "com.squareup.okio", name = "okio", version.ref = "okio" }
-pixnews-anvil-activity-generator = { group = "ru.pixnews.anvil.codegen.activity", name = "generator", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-activity-inject = { group = "ru.pixnews.anvil.codegen.activity", name = "inject", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-experiment-generator = { group = "ru.pixnews.anvil.codegen.experiment", name = "generator", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-experiment-inject = { group = "ru.pixnews.anvil.codegen.experiment", name = "inject", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-initializer-generator = { group = "ru.pixnews.anvil.codegen.initializer", name = "generator", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-initializer-inject = { group = "ru.pixnews.anvil.codegen.initializer", name = "inject", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-test-generator = { group = "ru.pixnews.anvil.codegen.test", name = "generator", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-test-inject = { group = "ru.pixnews.anvil.codegen.test", name = "inject", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-viewmodel-generator = { group = "ru.pixnews.anvil.codegen.viewmodel", name = "generator", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-viewmodel-inject = { group = "ru.pixnews.anvil.codegen.viewmodel", name = "inject", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-workmanager-generator = { group = "ru.pixnews.anvil.codegen.workmanager", name = "generator", version.ref = "pixnews-anvil-codegen" }
-pixnews-anvil-workmanager-inject = { group = "ru.pixnews.anvil.codegen.workmanager", name = "inject", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-activity-generator = { group = "ru.pixnews.anvil.codegen", name = "activity-generator", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-activity-inject = { group = "ru.pixnews.anvil.codegen", name = "activity-inject", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-experiment-generator = { group = "ru.pixnews.anvil.codegen", name = "experiment-generator", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-experiment-inject = { group = "ru.pixnews.anvil.codegen", name = "experiment-inject", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-initializer-generator = { group = "ru.pixnews.anvil.codegen", name = "initializer-generator", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-initializer-inject = { group = "ru.pixnews.anvil.codegen", name = "initializer-inject", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-test-generator = { group = "ru.pixnews.anvil.codegen", name = "test-generator", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-test-inject = { group = "ru.pixnews.anvil.codegen", name = "test-inject", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-viewmodel-generator = { group = "ru.pixnews.anvil.codegen", name = "viewmodel-generator", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-viewmodel-inject = { group = "ru.pixnews.anvil.codegen", name = "viewmodel-inject", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-workmanager-generator = { group = "ru.pixnews.anvil.codegen", name = "workmanager-generator", version.ref = "pixnews-anvil-codegen" }
+pixnews-anvil-workmanager-inject = { group = "ru.pixnews.anvil.codegen", name = "workmanager-inject", version.ref = "pixnews-anvil-codegen" }
 pixnews-debuglayout = { group = "ru.pixnews.debuglayout", name = "core", version.ref = "debuglayout" }
 radiography = { group = "com.squareup.radiography", name = "radiography", version.ref = "radiography" }
 turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" }
diff --git a/gradle/plugin/settings/convention/ru.pixnews.gradle.settings.repositories.settings.gradle.kts b/gradle/plugin/settings/convention/ru.pixnews.gradle.settings.repositories.settings.gradle.kts
index b95be49d..dadcbc5d 100644
--- a/gradle/plugin/settings/convention/ru.pixnews.gradle.settings.repositories.settings.gradle.kts
+++ b/gradle/plugin/settings/convention/ru.pixnews.gradle.settings.repositories.settings.gradle.kts
@@ -68,8 +68,8 @@ fun RepositoryHandler.pixnewsMaven(): Unit = exclusiveContent {
     filter {
         includeGroup("io.github.simonschiller.prefiller")
         includeGroup("io.github.simonschiller")
+        includeGroup("ru.pixnews.anvil.codegen")
         includeGroup("ru.pixnews.debuglayout")
-        includeGroupByRegex("""ru\.pixnews\.anvil\..+""")
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c03ccfcd..891f65f0 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,11 +18,11 @@ buildscript {
     }
     dependencies {
         classpath("com.android.tools.build:gradle:8.5.0-alpha05")
-        classpath("com.squareup.anvil:gradle-plugin:2.5.0-beta04")
+        classpath("com.squareup.anvil:gradle-plugin:2.5.0-beta05")
         classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
         classpath("com.google.devtools.ksp:symbol-processing-gradle-plugin:1.9.23-1.0.20")
-        classpath("com.squareup.wire:wire-gradle-plugin:4.9.7")
+        classpath("com.squareup.wire:wire-gradle-plugin:4.9.9")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.51.0")
         classpath("androidx.room:androidx.room.gradle.plugin:2.6.1")
         classpath("com.diffplug.spotless:spotless-plugin-gradle:6.25.0")