diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
index 6f5a23dba..68a032baa 100644
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
+++ b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/impl/SCIMUserManager.java
@@ -58,7 +58,6 @@
 import org.wso2.carbon.identity.scim2.common.utils.AttributeMapper;
 import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonConstants;
 import org.wso2.carbon.identity.scim2.common.utils.SCIMCommonUtils;
-import org.wso2.carbon.identity.scim2.common.utils.Scenarios;
 import org.wso2.carbon.user.api.ClaimMapping;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.PaginatedUserStoreManager;
@@ -6301,10 +6300,10 @@ private void publishEvent(User user, String eventName, boolean isAdminUpdate)
         properties.put(IdentityEventConstants.EventProperty.CREDENTIAL, user.getPassword());
         if (isAdminUpdate) {
             properties.put(IdentityEventConstants.EventProperty.SCENARIO,
-                    Scenarios.CREDENTIAL_UPDATE_BY_ADMIN_VIA_CONSOLE.name());
+                    IdentityEventConstants.EventProperty.Scenario.ScenarioTypes.POST_CREDENTIAL_UPDATE_BY_ADMIN);
         } else {
             properties.put(IdentityEventConstants.EventProperty.SCENARIO,
-                    Scenarios.CREDENTIAL_UPDATE_BY_USER_VIA_MY_ACCOUNT.name());
+                    IdentityEventConstants.EventProperty.Scenario.ScenarioTypes.POST_CREDENTIAL_UPDATE_BY_USER);
         }
 
         Event identityMgtEvent = new Event(eventName, properties);
diff --git a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java b/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java
deleted file mode 100644
index 8ba5d2d52..000000000
--- a/components/org.wso2.carbon.identity.scim2.common/src/main/java/org/wso2/carbon/identity/scim2/common/utils/Scenarios.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2024, WSO2 LLC. (http://www.wso2.com).
- *
- * WSO2 LLC. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.identity.scim2.common.utils;
-
-import org.apache.commons.lang.StringUtils;
-import org.wso2.carbon.identity.scim2.common.exceptions.IdentitySCIMException;
-
-/**
- * Enum which contains the scenarios.
- */
-public enum Scenarios {
-
-    CREDENTIAL_UPDATE_BY_ADMIN_VIA_CONSOLE,
-    CREDENTIAL_UPDATE_BY_USER_VIA_MY_ACCOUNT;
-
-    /**
-     * Get scenario which matches the given scenario name.
-     *
-     * @param scenarioName Name of the scenario
-     * @return Scenarios
-     * @throws IdentitySCIMException Invalid scenario
-     */
-    public static Scenarios getScenario(String scenarioName) throws IdentitySCIMException {
-
-        Scenarios[] scenarios = {
-                CREDENTIAL_UPDATE_BY_ADMIN_VIA_CONSOLE, CREDENTIAL_UPDATE_BY_USER_VIA_MY_ACCOUNT
-        };
-        if (StringUtils.isNotEmpty(scenarioName)) {
-            for (Scenarios scenario : scenarios) {
-                if (scenarioName.equals(scenario.name())) {
-                    return scenario;
-                }
-            }
-        }
-        throw new IdentitySCIMException("Invalid scenario: " + scenarioName);
-    }
-
-}
diff --git a/pom.xml b/pom.xml
index 98b4b8e3d..5630907e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,7 +285,7 @@
         <inbound.auth.oauth.version>6.5.3</inbound.auth.oauth.version>
         <commons-collections.version>3.2.0.wso2v1</commons-collections.version>
         <carbon.kernel.version>4.10.2</carbon.kernel.version>
-        <identity.framework.version>7.0.89</identity.framework.version>
+        <identity.framework.version>7.0.105</identity.framework.version>
         <junit.version>4.13.1</junit.version>
         <commons.lang.version>20030203.000129</commons.lang.version>
         <identity.governance.version>1.8.12</identity.governance.version>