diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5c9176..be58b05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,10 @@ Change Log
 ==========
 All notable changes to this project will be documented in this file.
 
-[Version 2.4.0] _(unreleased)_](https://github.com/xmartlabs/android-snapshot-publisher/releases/tag/v2.4.0)
+[Version 2.4.0] _(2021-10-06)_](https://github.com/xmartlabs/android-snapshot-publisher/releases/tag/v2.4.0)
 - Change min Android Gradle plugin gradle version to `7.0.0`.
-
+- Upgrade Google Play Publisher dependency to [v3.6.0](https://github.com/Triple-T/gradle-play-publisher/releases/tag/3.6.0).
+- Update Core libraries
 
 [Version 2.3.0-AGP7.0 _(2021-05-18)_](https://github.com/xmartlabs/android-snapshot-publisher/releases/tag/v2.3.0-AGP7.0)
 - Upgrade Google Play Publisher dependency to [v3.4.0-agp7.0](https://github.com/Triple-T/gradle-play-publisher/releases/tag/3.4.0-agp7.0).
diff --git a/README.md b/README.md
index ab79196..a4a8f4c 100644
--- a/README.md
+++ b/README.md
@@ -72,11 +72,10 @@ buildscript {
     google()
   }
   dependencies {
-     classpath "com.xmartlabs:snapshot-publisher:2.3.0"
+     classpath "com.xmartlabs:snapshot-publisher:2.4.0"
   }
 }
 ```
-**Note:** If you're using AGP 7.0, you should use the `2.3.0-AGP7.0` version.
 
 Apply the plugin to each individual `com.android.application` module where you want to use it.
 
@@ -134,8 +133,6 @@ snapshotPublisher {
 
 **Known Issue:** after AGP 4.1 the version name cannot be applied only to specific plugin tasks. 
 In turn, it's applied in the configuration step, causing all builds to contain `versionNameFormat`.
-AGP 4.2 fixes this issue but is still in alpha.
-If you're using a lower version of AGP, you can use the version of [2.1.0](https://github.com/xmartlabs/android-snapshot-publisher/releases/tag/v2.1.0).
 
 ### Release notes
 The `releaseNotes` block allows you to perform build release notes customizations.
diff --git a/build.gradle.kts b/build.gradle.kts
index a5064eb..7bd8cc3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -52,7 +52,7 @@ jacoco {
 }
 
 group = "com.xmartlabs"
-version = "2.3.0-AGP7.0"
+version = "2.4.0"
 
 gradlePlugin {
   plugins {
diff --git a/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt b/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt
index d80f764..59c2384 100644
--- a/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt
+++ b/src/main/kotlin/com/xmartlabs/snapshotpublisher/plugin/PlayPublisherPluginHelper.kt
@@ -71,14 +71,7 @@ internal object PlayPublisherPluginHelper {
   }
 
   private fun checkAgp() {
-    val agpVersion = VersionNumber.parse(
-        try {
-          Version.ANDROID_GRADLE_PLUGIN_VERSION
-        } catch (e: NoClassDefFoundError) {
-          @Suppress("DEPRECATION") // TODO(#708): remove when 3.6 is the minimum
-          com.android.builder.model.Version.ANDROID_GRADLE_PLUGIN_VERSION
-        }
-    )
+    val agpVersion = VersionNumber.parse(Version.ANDROID_GRADLE_PLUGIN_VERSION)
     check(agpVersion >= MIN_AGP_VERSION) {
       "Android Snapshot Publisher's minimum Android Gradle Plugin version is at least " +
           "$MIN_AGP_VERSION and yours is $agpVersion. Find the latest version " +