diff --git a/Solutions/Okta Single Sign-On/Package/3.1.2.zip b/Solutions/Okta Single Sign-On/Package/3.1.2.zip
index 4d1ab12f470..aaf3128782b 100644
Binary files a/Solutions/Okta Single Sign-On/Package/3.1.2.zip and b/Solutions/Okta Single Sign-On/Package/3.1.2.zip differ
diff --git a/Solutions/Okta Single Sign-On/Package/mainTemplate.json b/Solutions/Okta Single Sign-On/Package/mainTemplate.json
index 946b694f161..b136d884aa7 100644
--- a/Solutions/Okta Single Sign-On/Package/mainTemplate.json	
+++ b/Solutions/Okta Single Sign-On/Package/mainTemplate.json	
@@ -296,22 +296,22 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "FullName",
                         "columnName": "actor_alternateId_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   },
                   {
+                    "entityType": "IP",
                     "fieldMappings": [
                       {
                         "identifier": "Address",
                         "columnName": "ClientIP"
                       }
-                    ],
-                    "entityType": "IP"
+                    ]
                   }
                 ]
               }
@@ -418,13 +418,13 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "FullName",
                         "columnName": "actor_alternateId_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   }
                 ]
               }
@@ -531,13 +531,13 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "IP",
                     "fieldMappings": [
                       {
                         "identifier": "Address",
                         "columnName": "client_ipAddress_s"
                       }
-                    ],
-                    "entityType": "IP"
+                    ]
                   }
                 ]
               }
@@ -641,6 +641,7 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "Name",
@@ -650,17 +651,16 @@
                         "identifier": "DisplayName",
                         "columnName": "actor_displayName_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   },
                   {
+                    "entityType": "IP",
                     "fieldMappings": [
                       {
                         "identifier": "Address",
                         "columnName": "client_ipAddress_s"
                       }
-                    ],
-                    "entityType": "IP"
+                    ]
                   }
                 ],
                 "customDetails": {
@@ -770,6 +770,7 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "Name",
@@ -779,17 +780,16 @@
                         "identifier": "DisplayName",
                         "columnName": "actor_displayName_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   },
                   {
+                    "entityType": "IP",
                     "fieldMappings": [
                       {
                         "identifier": "Address",
                         "columnName": "client_ipAddress_s"
                       }
-                    ],
-                    "entityType": "IP"
+                    ]
                   }
                 ],
                 "customDetails": {
@@ -797,8 +797,8 @@
                   "SessionId": "[variables('_SessionId')]"
                 },
                 "alertDetailsOverride": {
-                  "alertDescriptionFormat": "This query identifies users seen login from new geo location/country {{Location}} as well as a new device and performing critical operations\n",
-                  "alertDisplayNameFormat": "New Device/Location {{Location}} sign-in along with critical operation"
+                  "alertDisplayNameFormat": "New Device/Location {{Location}} sign-in along with critical operation",
+                  "alertDescriptionFormat": "This query identifies users seen login from new geo location/country {{Location}} as well as a new device and performing critical operations\n"
                 }
               }
             },
@@ -901,6 +901,7 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "Name",
@@ -910,8 +911,7 @@
                         "identifier": "DisplayName",
                         "columnName": "actor_displayName_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   }
                 ]
               }
@@ -1015,6 +1015,7 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "Name",
@@ -1024,17 +1025,16 @@
                         "identifier": "DisplayName",
                         "columnName": "actor_displayName_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   },
                   {
+                    "entityType": "IP",
                     "fieldMappings": [
                       {
                         "identifier": "Address",
                         "columnName": "client_ipAddress_s"
                       }
-                    ],
-                    "entityType": "IP"
+                    ]
                   }
                 ],
                 "customDetails": {
@@ -1141,6 +1141,7 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "Name",
@@ -1150,17 +1151,16 @@
                         "identifier": "DisplayName",
                         "columnName": "actor_displayName_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   },
                   {
+                    "entityType": "IP",
                     "fieldMappings": [
                       {
                         "identifier": "Address",
                         "columnName": "client_ipAddress_s"
                       }
-                    ],
-                    "entityType": "IP"
+                    ]
                   }
                 ]
               }
@@ -1268,6 +1268,7 @@
                 ],
                 "entityMappings": [
                   {
+                    "entityType": "Account",
                     "fieldMappings": [
                       {
                         "identifier": "Name",
@@ -1277,8 +1278,7 @@
                         "identifier": "DisplayName",
                         "columnName": "actor_displayName_s"
                       }
-                    ],
-                    "entityType": "Account"
+                    ]
                   }
                 ]
               }
@@ -2560,16 +2560,20 @@
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "[variables('dataConnectorCCPVersion')]",
           "parameters": {
-            "apikey": {
-              "defaultValue": "-NA-",
-              "type": "securestring",
-              "minLength": 1
+            "innerWorkspace": {
+              "defaultValue": "[parameters('workspace')]",
+              "type": "string"
             },
             "domainname": {
               "defaultValue": "Enter domainname value",
               "type": "string",
               "minLength": 1
             },
+            "apikey": {
+              "defaultValue": "-NA-",
+              "type": "securestring",
+              "minLength": 4
+            },
             "connectorDefinitionName": {
               "defaultValue": "Okta Single Sign-On",
               "type": "string",
@@ -2618,7 +2622,7 @@
               }
             },
             {
-              "name": "[concat(parameters('workspace'),'/Microsoft.SecurityInsights/', '{{innerWorkspace}}/Microsoft.SecurityInsights/OktaDCV1_{{domainname}}')]",
+              "name": "[[concat(parameters('innerWorkspace'), '/Microsoft.SecurityInsights', '/OktaDCV1_', parameters('domainname'))]",
               "apiVersion": "2023-02-01-preview",
               "type": "Microsoft.OperationalInsights/workspaces/providers/dataConnectors",
               "location": "[parameters('workspace-location')]",
@@ -4799,7 +4803,7 @@
           ],
           "metadata": {
             "comments": "This OKTA connector uses okta API to perform different actions on the user accounts.",
-            "lastUpdateTime": "2025-01-06T15:31:31.854Z",
+            "lastUpdateTime": "2025-01-30T12:53:51.440Z",
             "releaseNotes": {
               "version": "1.0",
               "title": "[variables('blanks')]",