diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a6a6c1c8a7..5700a0795fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -105,7 +105,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false
@@ -268,7 +268,7 @@ jobs:
 #
 #      # Free GitHub Actions Environment Disk Space
 #      - name: Maximize Build Space
-#        uses: jlumbroso/free-disk-space@main
+#        uses: jlumbroso/free-disk-space@v1.3.1
 #        with:
 #          tool-cache: false
 #          large-packages: false
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 247c35f1c09..6585ccd8eb6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -77,7 +77,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts
index 2512f70961d..a1b3cd279cf 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
     id("java")
     id("org.jetbrains.intellij.platform.module")
+
     alias(libs.plugins.aspectj)
 }
 
@@ -20,6 +21,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
+        bundledPlugins("com.intellij.modules.json")
         instrumentationTools()
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/src/main/resources/META-INF/azure-intellij-plugin-arm.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/src/main/resources/META-INF/azure-intellij-plugin-arm.xml
index bf79f507fef..045cd40bc73 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/src/main/resources/META-INF/azure-intellij-plugin-arm.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/src/main/resources/META-INF/azure-intellij-plugin-arm.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
+    <depends>com.intellij.modules.json</depends>
+
     <extensions defaultExtensionNs="com.microsoft.tooling.msservices.intellij.azure">
         <explorerNodeProvider implementation="com.microsoft.azure.toolkit.ide.arm.ResourceGroupNodeProvider"/>
         <explorerNodeProvider implementation="com.microsoft.azure.toolkit.ide.arm.DeploymentNodeProvider"/>
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts
index 1b2efd27996..d8fd4d7f9f2 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
+        bundledModule("intellij.platform.collaborationTools")
         bundledPlugins(listOf("org.jetbrains.plugins.terminal"))
         instrumentationTools()
     }
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts
index d0b108d058a..fea35c023fe 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts
@@ -20,7 +20,8 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
-        bundledPlugins(listOf("com.intellij.properties"))
+        bundledModule("intellij.libraries.microba")
+        bundledPlugins(listOf("com.intellij.properties", "com.intellij.modules.json"))
         instrumentationTools()
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/src/main/resources/META-INF/azure-intellij-plugin-monitor.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/src/main/resources/META-INF/azure-intellij-plugin-monitor.xml
index e7b40e8fdae..51a9e294c77 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/src/main/resources/META-INF/azure-intellij-plugin-monitor.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/src/main/resources/META-INF/azure-intellij-plugin-monitor.xml
@@ -1,4 +1,6 @@
 <idea-plugin>
+    <depends>com.intellij.modules.json</depends>
+
     <extensions defaultExtensionNs="com.intellij">
         <toolWindow anchor="bottom"
                     icon="/icons/Common/log_analytics_workspace.svg"
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md b/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md
index 1bcdb30c9d5..130407f4d89 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Support for Rider 2024.3
+
 ## [4.2.2] - 2024-10-09
 
 ### Fixed
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/build.gradle.kts
index 16c0c1f0d99..293abc7ff8e 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/build.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
+        bundledModule("intellij.rider")
         bundledPlugins(listOf("com.jetbrains.restClient"))
         instrumentationTools()
     }
@@ -36,4 +37,13 @@ dependencies {
     implementation(libs.azureToolkitIdeAppserviceLib)
     implementation(libs.azureToolkitIdeContainerregistryLib)
     implementation(libs.serializationJson)
+    implementation(libs.ktorClientContentNegotiation) {
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8")
+    }
+    implementation(libs.ktorSerializationJson) {
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-jdk8")
+        exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json")
+    }
 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/settings/AzureFunctionConfigurable.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/settings/AzureFunctionConfigurable.kt
index d127462b1d6..1287fe29843 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/settings/AzureFunctionConfigurable.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/settings/AzureFunctionConfigurable.kt
@@ -168,9 +168,7 @@ class AzureFunctionConfigurable : BoundConfigurable("Functions") {
         }
         row("Tool download path:") {
             textFieldWithBrowseButton(
-                "Azure Functions Core Tools Download Path",
-                null,
-                FileChooserDescriptorFactory.createSingleFolderDescriptor()
+                FileChooserDescriptorFactory.createSingleFolderDescriptor().withTitle("Azure Functions Core Tools Download Path")
             )
                 .align(AlignX.FILL)
                 .validationOnInput {
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-lib-dotnet/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-lib-dotnet/build.gradle.kts
index 1c902aca9db..f241b30d39d 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-lib-dotnet/build.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-lib-dotnet/build.gradle.kts
@@ -19,6 +19,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
+        bundledModule("intellij.rider")
         bundledPlugins(listOf("Docker"))
         instrumentationTools()
     }
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-storage-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/storage/azurite/settings/AzuriteConfigurable.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-storage-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/storage/azurite/settings/AzuriteConfigurable.kt
index 219d3f9f9b8..19002c23e31 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-storage-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/storage/azurite/settings/AzuriteConfigurable.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-storage-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/storage/azurite/settings/AzuriteConfigurable.kt
@@ -40,9 +40,7 @@ class AzuriteConfigurable(private val project: Project) : BoundConfigurable("Azu
         group("Azurite Executable") {
             row("Azurite executable path:") {
                 textFieldWithBrowseButton(
-                    "Browse For Azurite Executable",
-                    null,
-                    FileChooserDescriptorFactory.createSingleFileOrExecutableAppDescriptor()
+                    FileChooserDescriptorFactory.createSingleFileOrExecutableAppDescriptor().withTitle("Browse For Azurite Executable")
                 )
                     .align(Align.FILL)
                     .bindText(settings::executablePath)
@@ -57,10 +55,7 @@ class AzuriteConfigurable(private val project: Project) : BoundConfigurable("Azu
             }
             row("Path:") {
                 textFieldWithBrowseButton(
-                    "Browse For Workspace Location",
-                    null,
-                    FileChooserDescriptorFactory.createSingleFolderDescriptor()
-                )
+                    FileChooserDescriptorFactory.createSingleFolderDescriptor().withTitle("Browse For Workspace Location"))
                     .align(Align.FILL)
                     .bindText(settings::workspacePath)
                     .validationOnInput { validationForPath(it) }
@@ -125,10 +120,7 @@ class AzuriteConfigurable(private val project: Project) : BoundConfigurable("Azu
         group("Certificate Settings") {
             row("Certificate path:") {
                 textFieldWithBrowseButton(
-                    "Select *.pem",
-                    null,
-                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()
-                )
+                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor().withTitle("Select *.pem"))
                     .align(Align.FILL)
                     .comment("Path to a locally-trusted pem or pfx certificate file path to enable HTTPS mode.")
                     .bindText(settings::certificatePath)
@@ -137,9 +129,7 @@ class AzuriteConfigurable(private val project: Project) : BoundConfigurable("Azu
             }
             row("Certificate key path:") {
                 textFieldWithBrowseButton(
-                    "Select *.key",
-                    null,
-                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()
+                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor().withTitle("Select *.key")
                 )
                     .align(Align.FILL)
                     .comment("Path to a locally-trusted pem key file, required when cert points to a pem file.")
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-rider/build.gradle.kts
index e8695cf1b2c..0d33c32bc3a 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/build.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/build.gradle.kts
@@ -4,7 +4,6 @@
 
 import com.jetbrains.plugin.structure.base.utils.isFile
 import org.jetbrains.changelog.Changelog
-import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.intellij.platform.gradle.Constants
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
@@ -76,6 +75,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
+        bundledModule("intellij.rider")
         bundledPlugins(listOf("com.jetbrains.restClient"))
         instrumentationTools()
         pluginVerifier()
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties
index 06070a3888f..0cde518f7dd 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties
@@ -4,18 +4,18 @@ pluginGroup = com.jetbrains
 pluginName = azure-toolkit-for-rider
 pluginRepositoryUrl = https://github.com/JetBrains/azure-tools-for-intellij
 # SemVer format -> https://semver.org
-pluginVersion = 4.2.2
+pluginVersion = 4.3.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 242
-pluginUntilBuild = 242.*
+pluginSinceBuild = 243
+pluginUntilBuild = 243.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 # Examples:
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-platformVersion = 2024.2.5
+platformVersion = 2024.3-EAP4-SNAPSHOT
 
 dotnetBuildConfiguration=Release
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/gradle/libs.versions.toml b/PluginsAndFeatures/azure-toolkit-for-rider/gradle/libs.versions.toml
index 645136a8762..04114a75c38 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/gradle/libs.versions.toml
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # libraries
 # https://search.maven.org/artifact/com.jetbrains.rd/rd-gen
-rdGen = "2024.1.1"
+rdGen = "2024.3.0"
 opentest4j = "1.3.0"
 azureToolkitLibs = "0.48.0"
 azureToolkitHdinsightLibs = "0.1.1"
@@ -14,11 +14,11 @@ plexusArchiver = "4.2.7"
 jedis = "3.6.3"
 
 # plugins
-kotlin = "2.0.20"
-serialization = "1.7.2"
+kotlin = "2.0.21"
+serialization = "1.7.3"
 changelog = "2.2.1"
-intelliJPlatform = "2.0.1"
-qodana = "2024.1.9"
+intelliJPlatform = "2.1.0"
+qodana = "2024.2.3"
 aspectj = "8.6"
 
 [libraries]
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/settings.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-rider/settings.gradle.kts
index 02ef7c3c3cd..844d9481d4e 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/settings.gradle.kts
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/settings.gradle.kts
@@ -15,6 +15,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 include(":protocol")
 include(":azure-intellij-plugin-resharper-host")
 include(":azure-intellij-plugin-lib")
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/Directory.Build.props b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/Directory.Build.props
index 386f472b9be..23bd61552fa 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/Directory.Build.props
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/Directory.Build.props
@@ -8,7 +8,7 @@
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
 
-    <RiderSDKVersion>2024.2.2</RiderSDKVersion>
+    <RiderSDKVersion>2024.3.0-eap04</RiderSDKVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/Errors/FunctionAppErrors.Generated.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/Errors/FunctionAppErrors.Generated.cs
index b1bb44463df..6a20487044b 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/Errors/FunctionAppErrors.Generated.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/Errors/FunctionAppErrors.Generated.cs
@@ -19,9 +19,11 @@
 using JetBrains.ReSharper.Daemon;
 using JetBrains.ReSharper.Feature.Services.Daemon.Attributes;
 using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Psi.ContentModel;
 using JetBrains.ReSharper.Psi.Resolve;
 using JetBrains.ReSharper.Psi.Tree;
 using JetBrains.ReSharper.Psi;
+using JetBrains.UI.RichText;
 using JetBrains.Util;
 using JetBrains.ReSharper.Azure.Daemon.Errors;
 using JetBrains.ReSharper.Azure.Daemon.FunctionApp.Stages.Analysis;
@@ -37,14 +39,14 @@ namespace JetBrains.ReSharper.Azure.Daemon.Errors.FunctionAppErrors
   [ConfigurableSeverityHighlighting(HIGHLIGHTING_ID, "CSHARP", Languages = "CSHARP", OverlapResolve = OverlapResolveKind.NONE, ToolTipFormatString = MESSAGE)]
   public sealed partial class TimerTriggerCronExpressionError : IHighlighting
   {
-    protected const string MESSAGE = "{0}";
+    private const string MESSAGE = "{0}";
     public const string HIGHLIGHTING_ID = "Azure.FunctionApp.TimerTriggerCronExpression";
 
     public TimerTriggerCronExpressionError(ICSharpExpression expression, string cronErrorMessage)
     {
       Expression = expression;
       CronErrorMessage = cronErrorMessage;
-      ToolTip = string.Format(MESSAGE, cronErrorMessage).NON_LOCALIZABLE();
+      ToolTip = string.Format(MESSAGE, cronErrorMessage);
     }
 
     public ICSharpExpression Expression { get; }
@@ -60,7 +62,7 @@ public DocumentRange CalculateRange()
 
     public bool IsValid()
     {
-      return (Expression == null || Expression.IsValid());
+      return (Expression is null || Expression.IsValid());
     }
   }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/FunctionAppDaemonHost.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/FunctionAppDaemonHost.cs
index 23e1a07130e..5acdbb93a4e 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/FunctionAppDaemonHost.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/FunctionAppDaemonHost.cs
@@ -1,6 +1,7 @@
 // Copyright 2018-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
 
 using System;
+using JetBrains.Application.Parts;
 using JetBrains.Lifetimes;
 using JetBrains.ProjectModel;
 using JetBrains.ProjectModel.MSBuild;
@@ -14,7 +15,7 @@
 
 namespace JetBrains.ReSharper.Azure.Daemon.FunctionApp;
 
-[SolutionComponent]
+[SolutionComponent(InstantiationEx.LegacyDefault)]
 public class FunctionAppDaemonHost
 {
     private readonly ISolution _solution;
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/InlayHints/TimerTriggerCronExpressionAdornmentProvider.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/InlayHints/TimerTriggerCronExpressionAdornmentProvider.cs
index dac9813f37a..035686d5b8b 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/InlayHints/TimerTriggerCronExpressionAdornmentProvider.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Daemon/FunctionApp/InlayHints/TimerTriggerCronExpressionAdornmentProvider.cs
@@ -1,12 +1,13 @@
 // Copyright 2018-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
 
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.TextControl.DocumentMarkup;
 using JetBrains.TextControl.DocumentMarkup.Adornments;
 
 namespace JetBrains.ReSharper.Azure.Daemon.FunctionApp.InlayHints;
 
-[SolutionComponent]
+[SolutionComponent(Instantiation.DemandAnyThreadSafe)]
 public class TimerTriggerCronExpressionAdornmentProvider : IHighlighterAdornmentProvider
 {
     public bool IsValid(IHighlighter highlighter)
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureQuickListDefaultSettings.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureQuickListDefaultSettings.cs
index 762bd180acb..ba6488dbedb 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureQuickListDefaultSettings.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureQuickListDefaultSettings.cs
@@ -22,7 +22,7 @@ public class AzureQuickListDefaultSettings(
     ILogger logger,
     AzureCSharpProjectScopeCategoryUIProvider csharpScopeProvider,
     AzureFSharpProjectScopeCategoryUIProvider fsharpScopeProvider)
-    : HaveDefaultSettings(settingsSchema, logger)
+    : HaveDefaultSettings<QuickListSettings>(settingsSchema, logger)
 {
     private readonly IMainScopePoint? _myCSharpMainPoint = csharpScopeProvider.MainPoint;
     private readonly IMainScopePoint? _myFSharpMainPoint = fsharpScopeProvider.MainPoint;
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureTemplatesDefaultSettings.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureTemplatesDefaultSettings.cs
index 326e04b6b62..942c42c48e0 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureTemplatesDefaultSettings.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Intellisense/FunctionApp/LiveTemplates/Settings/AzureTemplatesDefaultSettings.cs
@@ -7,11 +7,12 @@
 using JetBrains.Application.Settings;
 using JetBrains.Diagnostics;
 using JetBrains.Lifetimes;
+using JetBrains.ReSharper.Feature.Services.LiveTemplates.Settings;
 
 namespace JetBrains.ReSharper.Azure.Intellisense.FunctionApp.LiveTemplates.Settings;
 
 [ShellComponent(Instantiation.DemandAnyThreadSafe)]
-public class AzureTemplatesDefaultSettings : IHaveDefaultSettingsStream
+public class AzureTemplatesDefaultSettings : IHaveDefaultSettingsStream, IDefaultSettingsRootKey<LiveTemplatesSettings>
 {
     public Stream GetDefaultSettingsStream(Lifetime lifetime)
     {
@@ -23,5 +24,5 @@ public Stream GetDefaultSettingsStream(Lifetime lifetime)
         return stream;
     }
 
-    public string Name => "Azure default templates";
+    public string Name => "Azure default LiveTemplates";
 }
\ No newline at end of file
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionAppProjectTechnologyProvider.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionAppProjectTechnologyProvider.cs
index 36bd6be57e1..e16d9140fc7 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionAppProjectTechnologyProvider.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/FunctionApp/FunctionAppProjectTechnologyProvider.cs
@@ -1,12 +1,13 @@
 // Copyright 2018-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
 
 using System.Collections.Generic;
+using JetBrains.Application.Parts;
 using JetBrains.IDE.UsageStatistics;
 using JetBrains.ProjectModel;
 
 namespace JetBrains.ReSharper.Azure.Project.FunctionApp;
 
-[SolutionComponent]
+[SolutionComponent(Instantiation.DemandAnyThreadSafe)]
 public class FunctionAppProjectTechnologyProvider : IProjectTechnologyProvider
 {
     public IEnumerable<string> GetProjectTechnology(IProject project)
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/RunnableProjectsHost/RunnableProjectProviders/AzureFunctionsRunnableProjectProvider.cs b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/RunnableProjectsHost/RunnableProjectProviders/AzureFunctionsRunnableProjectProvider.cs
index 62299d6d56c..8705a0ed255 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/RunnableProjectsHost/RunnableProjectProviders/AzureFunctionsRunnableProjectProvider.cs
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/dotnet/ReSharper.Azure/Azure.Project/RunnableProjectsHost/RunnableProjectProviders/AzureFunctionsRunnableProjectProvider.cs
@@ -1,6 +1,7 @@
 // Copyright 2018-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
 
 using System.Collections.Generic;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.ReSharper.Azure.Project.FunctionApp;
 using JetBrains.ReSharper.Features.Running;
@@ -9,7 +10,7 @@
 
 namespace JetBrains.ReSharper.Azure.Project.RunnableProjectsHost.RunnableProjectProviders;
 
-[SolutionComponent]
+[SolutionComponent(Instantiation.DemandAnyThreadSafe)]
 public class AzureFunctionsRunnableProjectProvider(ILogger logger) : IRunnableProjectProvider
 {
     public RunnableProject? CreateRunnableProject(IProject project, string name, string fullName, IconModel? icon)
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/src/main/kotlin/com/microsoft/azure/toolkit/intellij/settings/AzureConfigurable.kt b/PluginsAndFeatures/azure-toolkit-for-rider/src/main/kotlin/com/microsoft/azure/toolkit/intellij/settings/AzureConfigurable.kt
index 59f430b8dec..f23315a45b1 100644
--- a/PluginsAndFeatures/azure-toolkit-for-rider/src/main/kotlin/com/microsoft/azure/toolkit/intellij/settings/AzureConfigurable.kt
+++ b/PluginsAndFeatures/azure-toolkit-for-rider/src/main/kotlin/com/microsoft/azure/toolkit/intellij/settings/AzureConfigurable.kt
@@ -62,9 +62,7 @@ class AzureConfigurable : BoundConfigurable("Azure") {
             }
             row("Azure CLI path:") {
                 textFieldWithBrowseButton(
-                    "Browse For Azure CLI",
-                    null,
-                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()
+                    FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor().withTitle("Browse For Azure CLI")
                 )
                     .align(Align.FILL)
                     .validationOnInput { validateAzureCliPath(it) }