diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ca775c3..10f57c9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
 
 env:
   BuildConfiguration: Release
-  BuildVersion: 1.22.0.${{ github.run_number }}
+  BuildVersion: 1.23.0.${{ github.run_number }}
 
 jobs:
   build:
diff --git a/History.md b/History.md
index a904f66..e09356e 100644
--- a/History.md
+++ b/History.md
@@ -1,3 +1,6 @@
+### 1.23.0 ###
+- ReSharper and Rider 2024.3 support
+
 ### 1.22.0 ###
 - ReSharper and Rider 2024.2 support
 
diff --git a/Roflcopter.sln b/Roflcopter.sln
index f022ed8..bb3e339 100644
--- a/Roflcopter.sln
+++ b/Roflcopter.sln
@@ -7,15 +7,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{26B55A35-CCB
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SolutionItems", "SolutionItems.csproj", "{6ADCE94D-EF87-42F6-A68B-69DA6FD90DE6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RS20242", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RS20242.csproj", "{9E2BBE59-1972-45B2-836B-802479CFEB6D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RS20243", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RS20243.csproj", "{9E2BBE59-1972-45B2-836B-802479CFEB6D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RS20242", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RS20242.csproj", "{6AFE9FA3-33A0-43B2-9C04-05A4C6A57A2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RS20243", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RS20243.csproj", "{6AFE9FA3-33A0-43B2-9C04-05A4C6A57A2D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Sample", "Src\Roflcopter.Plugin.Tests\test\data\Roflcopter.Sample.csproj", "{DA8C3190-009E-430B-95B5-7AFF7AA0A55F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RD20242", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RD20242.csproj", "{B81B447C-A4D0-419A-BD44-8D8836272C3D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.RD20243", "Src\Roflcopter.Plugin\Roflcopter.Plugin.RD20243.csproj", "{B81B447C-A4D0-419A-BD44-8D8836272C3D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RD20242", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RD20242.csproj", "{E8FBF9D8-FDD3-4755-85D6-351600B6DB49}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roflcopter.Plugin.Tests.RD20243", "Src\Roflcopter.Plugin.Tests\Roflcopter.Plugin.Tests.RD20243.csproj", "{E8FBF9D8-FDD3-4755-85D6-351600B6DB49}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Src/PluginAndTests.props b/Src/PluginAndTests.props
index d7e3a11..654d3ea 100644
--- a/Src/PluginAndTests.props
+++ b/Src/PluginAndTests.props
@@ -10,8 +10,7 @@
     <ReSharperVersionYY>$([System.Text.RegularExpressions.Regex]::Match($(ReSharperVersionIdentifier), $(_ReSharperVersionIdentifierRegex)).Groups[2].Value)</ReSharperVersionYY>
     <ReSharperVersionMinor>$([System.Text.RegularExpressions.Regex]::Match($(ReSharperVersionIdentifier), $(_ReSharperVersionIdentifierRegex)).Groups[3].Value)</ReSharperVersionMinor>
 
-    <!-- Workaround, drop with 2024.3: -->
-    <SdkNuGetPackageVersion>$(ReSharperVersionYYYY).$(ReSharperVersionMinor).2</SdkNuGetPackageVersion>
+    <SdkNuGetPackageVersion>$(ReSharperVersionYYYY).$(ReSharperVersionMinor).*-*</SdkNuGetPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/Src/RiderPlugin/build.gradle.kts b/Src/RiderPlugin/build.gradle.kts
index fa210b3..aed5181 100644
--- a/Src/RiderPlugin/build.gradle.kts
+++ b/Src/RiderPlugin/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("java")
     alias(libs.plugins.kotlinJvm)
-    id("org.jetbrains.intellij.platform") version "2.0.1"   // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+    id("org.jetbrains.intellij.platform") version "2.0.0-beta5"   // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
     id("me.filippov.gradle.jvm.wrapper") version "0.14.0"   // https://plugins.gradle.org/plugin/me.filippov.gradle.jvm.wrapper
 }
 
diff --git a/Src/RiderPlugin/gradle.properties b/Src/RiderPlugin/gradle.properties
index 977d34d..518663a 100644
--- a/Src/RiderPlugin/gradle.properties
+++ b/Src/RiderPlugin/gradle.properties
@@ -1,12 +1,12 @@
 RiderPluginProjectName=rider-Roflcopter
 
 ResharperPluginProjectName=Roflcopter.Plugin
-ReSharperVersionIdentifier=RD20242
+ReSharperVersionIdentifier=RD20243
 PluginVersion=0.0.0.1
 BuildConfiguration=Debug
 
-# https://www.jetbrains.com/intellij-repository/releases
-ProductVersion=2024.2
+# https://www.jetbrains.com/intellij-repository/releases or https://www.jetbrains.com/intellij-repository/snapshots
+ProductVersion=2024.3-SNAPSHOT
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default
diff --git a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20242.csproj b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20243.csproj
similarity index 97%
rename from Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20242.csproj
rename to Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20243.csproj
index 180f24d..0777ab5 100644
--- a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20242.csproj
+++ b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RD20243.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RD20242.csproj" />
+    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RD20243.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20242.csproj b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20243.csproj
similarity index 97%
rename from Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20242.csproj
rename to Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20243.csproj
index f4199a1..c6bee8b 100644
--- a/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20242.csproj
+++ b/Src/Roflcopter.Plugin.Tests/Roflcopter.Plugin.Tests.RS20243.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RS20242.csproj" />
+    <ProjectReference Include="..\Roflcopter.Plugin\Roflcopter.Plugin.RS20243.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20242.csproj b/Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20243.csproj
similarity index 100%
rename from Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20242.csproj
rename to Src/Roflcopter.Plugin/Roflcopter.Plugin.RD20243.csproj
diff --git a/Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20242.csproj b/Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20243.csproj
similarity index 100%
rename from Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20242.csproj
rename to Src/Roflcopter.Plugin/Roflcopter.Plugin.RS20243.csproj
diff --git a/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountDefinitionsCachedSettingsReader.cs b/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountDefinitionsCachedSettingsReader.cs
index 53aef5d..4ece8d8 100644
--- a/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountDefinitionsCachedSettingsReader.cs
+++ b/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountDefinitionsCachedSettingsReader.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
+using JetBrains.Application.Parts;
 using JetBrains.Application.Settings;
 using JetBrains.Application.Settings.Extentions;
 using JetBrains.Lifetimes;
@@ -9,7 +10,7 @@
 
 namespace Roflcopter.Plugin.TodoItems
 {
-    [SolutionComponent]
+    [SolutionComponent(Instantiation.DemandAnyThreadSafe)] // TODO: Review Instantiation !! 
     public class TodoItemsCountDefinitionsCachedSettingsReader : ICachedSettingsReader<IReadOnlyCollection<TodoItemsCountDefinition>>
     {
         private readonly ISettingsStore _settingsStore;
diff --git a/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountProvider.cs b/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountProvider.cs
index cfa5a4b..a6e4224 100644
--- a/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountProvider.cs
+++ b/Src/Roflcopter.Plugin/TodoItems/TodoItemsCountProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
+using JetBrains.Application.Parts;
 using JetBrains.Application.Settings;
 using JetBrains.Application.Settings.Extentions;
 using JetBrains.DataFlow;
@@ -16,7 +17,7 @@
 
 namespace Roflcopter.Plugin.TodoItems
 {
-    [SolutionComponent]
+    [SolutionComponent(Instantiation.LaterAsyncAnyThreadUnsafe)] // TODO: Review Instantiation !!
     public class TodoItemsCountProvider
     {
         private static readonly ILogger Logger = JetBrains.Util.Logging.Logger.GetLogger(typeof(TodoItemsCountProvider));
diff --git a/Src/Roflcopter.Plugin/UnitTesting/ConvertToParameterizedTestContextAction.cs b/Src/Roflcopter.Plugin/UnitTesting/ConvertToParameterizedTestContextAction.cs
index f5b6f01..284e998 100644
--- a/Src/Roflcopter.Plugin/UnitTesting/ConvertToParameterizedTestContextAction.cs
+++ b/Src/Roflcopter.Plugin/UnitTesting/ConvertToParameterizedTestContextAction.cs
@@ -48,7 +48,7 @@ protected override Action<ITextControl> ExecutePsiTransaction(ISolution solution
                 elementFactory.CreateParameterDeclaration(
                     ownerDeclaration: methodDeclaration,
                     ParameterKind.VALUE,
-                    isParameterArray: false,
+                    isParams: false,
                     isVarArg: false,
                     type: psiModule.GetPredefinedType().Object,
                     name: "parameter",