diff --git a/build.gradle b/build.gradle
index 2d46f97bea..b40a2cb2c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,6 @@ buildscript {
         classpath 'net.ltgt.gradle:gradle-errorprone-plugin:3.1.0'
 
         classpath "io.github.gradle-nexus:publish-plugin:2.0.0-rc-1"
-        // TODO check if https://github.com/shipkit/shipkit-changelog/issues/103 is fixed, and remove workaround in shipkit.gradle.
         classpath 'org.shipkit:shipkit-changelog:2.0.1'
         classpath 'org.shipkit:shipkit-auto-version:2.0.2'
 
diff --git a/gradle/shipkit.gradle b/gradle/shipkit.gradle
index 1334480800..add74ce6a9 100644
--- a/gradle/shipkit.gradle
+++ b/gradle/shipkit.gradle
@@ -6,10 +6,6 @@ tasks.named('generateChangelog') {
     previousRevision = project.ext.'shipkit-auto-version.previous-tag'
     githubToken = System.getenv('GITHUB_TOKEN')
     repository = 'mockito/mockito'
-    // Workarounds for https://github.com/shipkit/shipkit-changelog/issues/103
-    doNotTrackState("GenerateChangelogTask tracks the entire repo, which results is locking problems hashing the .gradle folder.")
-    // GenerateChangelogTask uses the entire repo as input, which means it needs to "depend on" all other tasks' outputs.
-    mustRunAfter(allprojects.collectMany { it.tasks }.grep { it.path != ":generateChangelog" && it.path != ":githubRelease" })
 }
 
 tasks.named("githubRelease") {