diff --git a/build.gradle.kts b/build.gradle.kts
index 72336a0..2433a54 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -45,7 +45,7 @@ plugins {
     idea
     kotlin("jvm") version "1.9.21"
     id("org.jetbrains.intellij") version "1.17.0"
-    id("org.jetbrains.grammarkit") version "2022.3.2"
+    id("org.jetbrains.grammarkit") version "2022.3.2.2"
 }
 
 allprojects {
@@ -177,15 +177,14 @@ project(":") {
 
     val generateRegoLexer = task<GenerateLexerTask>("generateRegoLexer") {
         sourceFile.set(file("src/main/grammar/RegoLexer.flex"))
-        targetDir.set("src/main/gen/org/openpolicyagent/ideaplugin/lang/lexer")
-        targetClass.set("_RegoLexer")
+        targetOutputDir.set(file("src/main/gen/org/openpolicyagent/ideaplugin/lang/lexer"))
         purgeOldFiles.set(true)
     }
 
 
     val generateRegoParser = task<GenerateParserTask>("generateRegoParser") {
         sourceFile.set(file("src/main/grammar/Rego.bnf"))
-        targetRoot.set("src/main/gen")
+        targetRootOutputDir.set(file("src/main/gen"))
         pathToParser.set("/org/openpolicyagent/ideaplugin/lang/parser/RegoParser.java")
         pathToPsiRoot.set("/org/openpolicyagent/ideaplugin/lang/psi")
         purgeOldFiles.set(true)
diff --git a/gradle.properties b/gradle.properties
index 192a789..f0d9566 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,13 +9,13 @@ kotlin.code.style=official
 baseIDE=idea
 
 # if you change the version of ide, also change psiViewerPluginVersion accordingly (cf https://plugins.jetbrains.com/plugin/227-psiviewer/versions)
-ideaVersion=IC-2023.3
-pycharmCommunityVersion=PC-2023.3
-psiViewerPluginVersion=233.2
+ideaVersion=IC-2024.1
+pycharmCommunityVersion=PC-2024.1
+psiViewerPluginVersion=241-SNAPSHOT
 
 # see https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for more information
-sinceBuild=233
-untilBuild=242.*
+sinceBuild=241
+untilBuild=243.*
 
 # these two variables will be overwritten by the release process (i.e. the GitHub action) thanks to the env variables:
 #   - ORG_GRADLE_PROJECT_publishToken
diff --git a/src/main/resources/META-INF/opa-core.xml b/src/main/resources/META-INF/opa-core.xml
index ae140ab..4c5b4da 100644
--- a/src/main/resources/META-INF/opa-core.xml
+++ b/src/main/resources/META-INF/opa-core.xml
@@ -104,7 +104,7 @@
                 class="org.openpolicyagent.ideaplugin.ide.actions.RegoCreateFileAction"
                 text="Rego File"
                 description="Create new Rego file">
-            <add-to-group group-id="NewGroup" anchor="before" relative-to-action="NewFile"/>
+            <add-to-group group-id="NewGroup" anchor="last" />
         </action>
     </actions>
 </idea-plugin>