diff --git a/.github/workflows/mergePr.yml b/.github/workflows/mergePr.yml
index 43dd92984..fdc42cf11 100644
--- a/.github/workflows/mergePr.yml
+++ b/.github/workflows/mergePr.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
 
-    if: github.event.pull_request.merged == true && github.repository == 'JetBrains/ideavim'
+    if: false
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/updateChangelog.yml b/.github/workflows/updateChangelog.yml
index 5dcfd9a6c..d12208b0d 100644
--- a/.github/workflows/updateChangelog.yml
+++ b/.github/workflows/updateChangelog.yml
@@ -7,15 +7,12 @@ on:
   workflow_dispatch:
   schedule:
     - cron: '0 10 * * *'
-# Workflow run on push is disabled to avoid conflicts when merging PR
-#  push:
-#    branches: [ master ]
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
-    if: github.repository == 'JetBrains/ideavim'
+    if: false
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.teamcity/_Self/buildTypes/ReleasePlugin.kt b/.teamcity/_Self/buildTypes/ReleasePlugin.kt
index 40a072ce7..09a5b9890 100644
--- a/.teamcity/_Self/buildTypes/ReleasePlugin.kt
+++ b/.teamcity/_Self/buildTypes/ReleasePlugin.kt
@@ -97,14 +97,14 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Set TeamCity build number"
       tasks = "scripts:setTeamCityBuildNumber"
     }
-    gradle {
-      name = "Update change log"
-      tasks = "scripts:changelogUpdateUnreleased"
-    }
-    gradle {
-      name = "Commit preparation changes"
-      tasks = "scripts:commitChanges"
-    }
+//    gradle {
+//      name = "Update change log"
+//      tasks = "scripts:changelogUpdateUnreleased"
+//    }
+//    gradle {
+//      name = "Commit preparation changes"
+//      tasks = "scripts:commitChanges"
+//    }
     gradle {
       name = "Add release tag"
       tasks = "scripts:addReleaseTag"
@@ -117,33 +117,24 @@ sealed class ReleasePlugin(private val releaseType: String) : IdeaVimBuildType({
       name = "Publish release"
       tasks = "publishPlugin"
     }
-    script {
-      name = "Checkout master branch"
-      scriptContent = """
-        echo Checkout master
-        git checkout master
-      """.trimIndent()
-    }
-    gradle {
-      name = "Update change log in master"
-      tasks = "scripts:changelogUpdateUnreleased"
-    }
-    gradle {
-      name = "Commit preparation changes in master"
-      tasks = "scripts:commitChanges"
-    }
+//    script {
+//      name = "Checkout master branch"
+//      scriptContent = """
+//        echo Checkout master
+//        git checkout master
+//      """.trimIndent()
+//    }
+//    gradle {
+//      name = "Update change log in master"
+//      tasks = "scripts:changelogUpdateUnreleased"
+//    }
+//    gradle {
+//      name = "Commit preparation changes in master"
+//      tasks = "scripts:commitChanges"
+//    }
     script {
       name = "Push changes to the repo"
       scriptContent = """
-      branch=$(git branch --show-current)  
-      echo Current branch is ${'$'}branch
-      if [ "master" != "${'$'}branch" ];
-      then
-        git checkout master
-      fi
-      
-      git push origin
-      
       git checkout release
       echo checkout release branch
       git branch --set-upstream-to=origin/release release
diff --git a/CHANGES.md b/CHANGES.md
index 960162556..9c578b0fd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -23,18 +23,12 @@ It is important to distinguish EAP from traditional pre-release software.
 Please note that the quality of EAP versions may at times be way below even
 usual beta standards.
 
-## To Be Released
+## End of changelog file maintenance
 
-### Features:
-* Use `]s` and `[s` to go to the next or previous misspelled word | [VIM-330](https://youtrack.jetbrains.com/issue/VIM-330)
+Since version 2.9.0, the changelog can be found on YouTrack
 
-### Fixes:
-* [VIM-3291](https://youtrack.jetbrains.com/issue/VIM-3291) Remove sync of editor selection between different opened editors
-* [VIM-3234](https://youtrack.jetbrains.com/issue/VIM-3234) The space character won't mix in the tab chars after >> and << commands
-* 
-### Merged PRs:
-* [805](https://github.com/JetBrains/ideavim/pull/805) by [chylex](https://github.com/chylex): VIM-3238 Fix recording a macro that replays another macro
-* [806](https://github.com/JetBrains/ideavim/pull/806) by [chylex](https://github.com/chylex): Enforce LF line separator in project code style
+To Be Released: https://youtrack.jetbrains.com/issues/VIM?q=%23%7BReady%20To%20Release%7D%20
+Latest Fixes: https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20sort%20by:%20updated%20
 
 ## 2.9.0, 2024-02-20
 
diff --git a/build.gradle.kts b/build.gradle.kts
index fa48d5f71..18300bb19 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -32,7 +32,6 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib.RepositoryBuilder
 import org.intellij.markdown.ast.getTextInNode
 import org.jetbrains.changelog.Changelog
-import org.jetbrains.changelog.exceptions.MissingVersionException
 import org.kohsuke.github.GHUser
 import java.net.HttpURLConnection
 import java.net.URL
@@ -305,27 +304,13 @@ tasks {
     from(createOpenApiSourceJar) { into("lib/src") }
   }
 
-  val pluginVersion = version
-  // Don't forget to update plugin.xml
   patchPluginXml {
+    // Don't forget to update plugin.xml
     sinceBuild.set("233.11799.30")
 
-    // Get the latest available change notes from the changelog file
-    changeNotes.set(
-      provider {
-        with(changelog) {
-          val log = try {
-            getUnreleased()
-          } catch (e: MissingVersionException) {
-            getOrNull(pluginVersion.toString()) ?: getLatest()
-          }
-          renderItem(
-            log,
-            org.jetbrains.changelog.Changelog.OutputType.HTML,
-          )
-        }
-      },
-    )
+    changeNotes.set("""
+      Changelog: https://youtrack.jetbrains.com/issues/VIM?q=State:%20Fixed%20Fix%20versions:%20${version.get()}
+    """.trimIndent())
   }
 }