diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a592e4..1437504 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,11 +6,12 @@
 ### Added
 - GitHub Actions: UI Tests workflow
 - Suppress `UnusedProperty` inspection for the `kotlin.stdlib.default.dependency` in `gradle.properties`
+- Use Gradle `wrapper` task to handle Gradle updates
 
 ### Changed
 - Update `pluginVerifierIdeVersions` to `2020.3.4, 2021.1.3`
 - Change since/until build to `203-212.*`
-- Upgrade Gradle Wrapper to `7.1`
+- Upgrade Gradle Wrapper to `7.1.1`
 - Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.5.20`
 - Dependencies (GitHub Actions) - upgrade `actions/upload-artifact` to `v2.2.4`
 - Dependencies - upgrade `org.jetbrains.intellij` to `1.1.2`
diff --git a/build.gradle.kts b/build.gradle.kts
index b62b849..eefbbbb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,6 +79,10 @@ tasks {
         jvmTarget = "1.8"
     }
 
+    wrapper {
+        gradleVersion = properties("gradleVersion")
+    }
+
     patchPluginXml {
         version.set(properties("pluginVersion"))
         sinceBuild.set(properties("pluginSinceBuild"))
diff --git a/gradle.properties b/gradle.properties
index 336e8b1..db0b628 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,6 +22,8 @@ platformDownloadSources = true
 # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
 platformPlugins =
 
+gradleVersion = 7.1.1
+
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
 # suppress inspection "UnusedProperty"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 69a9715..05679dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists