diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
index 0dbb81c4ec..94fa174fe3 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties
@@ -4,8 +4,8 @@ javaVersion=17
org.gradle.jvmargs='-Duser.language=en'
sources=false
-intellij_version=IC-223.4884.69-EAP-SNAPSHOT
-rider_version=RD-2022.3-EAP3-SNAPSHOT
+intellij_version=IC-223.6646.99-EAP-SNAPSHOT
+rider_version=RD-2022.3-EAP5-SNAPSHOT
#rider_version=RD-2022.3
build_common_code_with=rider
intellij_plugin_name=azure-toolkit-for-intellij
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
index 6f53172050..1f313d7718 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/platformPlugin.xml
@@ -6,7 +6,7 @@
Added:
- - Compatibility with Rider 2022.3 EAP
+ - Compatibility with Rider 2022.3 EAP 5
- Azure Functions: Add F# item templates for isolated worker (#635)
Fixed bugs:
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/Templates/README.md b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/Templates/README.md
index 2994c12099..fc8b138d42 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/Templates/README.md
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/ReSharper.Azure/src/Azure.Intellisense/Templates/README.md
@@ -9,23 +9,29 @@ Description |
[Blob Trigger](File/CSharp/DefaultWorker/CS_Blob_Trigger.md) |
[Blob Trigger](File/CSharp/IsolatedWorker/CS_Blob_Trigger.md) |
[Blob Trigger](File/FSharp/DefaultWorker/FS_Blob_Trigger.md) |
+[Blob Trigger](File/FSharp/IsolatedWorker/FS_Blob_Trigger.md) |
[CosmosDB Trigger](File/CSharp/DefaultWorker/CS_CosmosDB_Trigger.md) |
[CosmosDB Trigger](File/CSharp/IsolatedWorker/CS_CosmosDB_Trigger.md) |
[CosmosDB Trigger](File/FSharp/DefaultWorker/FS_CosmosDB_Trigger.md) |
+[CosmosDB Trigger](File/FSharp/IsolatedWorker/FS_CosmosDB_Trigger.md) |
[Durable Functions Orchestration](File/CSharp/DefaultWorker/CS_Durable_Functions_Orchestration.md) |
[Event Grid Trigger](File/CSharp/DefaultWorker/CS_Event_Grid_Trigger.md) |
[Event Grid Trigger](File/CSharp/IsolatedWorker/CS_Event_Grid_Trigger.md) |
[Event Grid Trigger](File/FSharp/DefaultWorker/FS_Event_Grid_Trigger.md) |
+[Event Grid Trigger](File/FSharp/IsolatedWorker/FS_Event_Grid_Trigger.md) |
[Event Hub Trigger](File/CSharp/DefaultWorker/CS_Event_Hub_Trigger.md) |
[Event Hub Trigger](File/CSharp/IsolatedWorker/CS_Event_Hub_Trigger.md) |
[Event Hub Trigger](File/FSharp/DefaultWorker/FS_Event_Hub_Trigger.md) |
+[Event Hub Trigger](File/FSharp/IsolatedWorker/FS_Event_Hub_Trigger.md) |
[HTTP Trigger](File/CSharp/DefaultWorker/CS_HTTP_Trigger.md) |
[HTTP Trigger](File/CSharp/IsolatedWorker/CS_HTTP_Trigger.md) |
[HTTP Trigger](File/FSharp/DefaultWorker/FS_HTTP_Trigger.md) |
+[HTTP Trigger](File/FSharp/IsolatedWorker/FS_HTTP_Trigger.md) |
[IoT Hub Trigger](File/CSharp/DefaultWorker/CS_IoT_Hub_Trigger.md) |
[Queue Trigger](File/CSharp/DefaultWorker/CS_Queue_Trigger.md) |
[Queue Trigger](File/CSharp/IsolatedWorker/CS_Queue_Trigger.md) |
[Queue Trigger](File/FSharp/DefaultWorker/FS_Queue_Trigger.md) |
+[Queue Trigger](File/FSharp/IsolatedWorker/FS_Queue_Trigger.md) |
[Service Bus Queue Trigger](File/CSharp/DefaultWorker/CS_Service_Bus_Queue_Trigger.md) |
[Service Bus Queue Trigger](File/CSharp/IsolatedWorker/CS_Service_Bus_Queue_Trigger.md) |
[Service Bus Topic Trigger](File/CSharp/DefaultWorker/CS_Service_Bus_Topic_Trigger.md) |
@@ -33,6 +39,7 @@ Description |
[Timer Trigger](File/CSharp/DefaultWorker/CS_Timer_Trigger.md) |
[Timer Trigger](File/CSharp/IsolatedWorker/CS_Timer_Trigger.md) |
[Timer Trigger](File/FSharp/DefaultWorker/FS_Timer_Trigger.md) |
+[Timer Trigger](File/FSharp/IsolatedWorker/FS_Timer_Trigger.md) |
### Live Templates
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
index 9c3848501a..17e088732e 100644
--- a/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
+++ b/PluginsAndFeatures/azure-toolkit-for-intellij/rider/resources/META-INF/plugin.xml
@@ -25,7 +25,7 @@
[3.50.0-2022.3]
- - Compatibility with Rider 2022.3 EAP
+ - Compatibility with Rider 2022.3 EAP 5
- Azure Functions: Add F# item templates for isolated worker (#635)
Fixed bugs: