diff --git a/.m2/settings.xml b/.m2/settings.xml
deleted file mode 100644
index 8317041cd2..0000000000
--- a/.m2/settings.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  ~ Copyright (c) 2018 - 2023, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
-  ~
-  ~ Entgra (Pvt) Ltd. 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.
-  -->
-
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                          https://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>maven-snapshots</id>
-            <username>${env.MAVEN_REPO_USER}</username>
-            <password>${env.MAVEN_REPO_PASS}</password>
-        </server>
-    </servers>
-</settings>
diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java
index 9b380f14ee..c85d2d968c 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java
@@ -1527,8 +1527,15 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
 
     @Override
     public boolean updateGeofence(GeofenceData geofenceData, int fenceId)
-            throws GeoLocationBasedServiceException, EventConfigurationException {
+            throws GeoLocationBasedServiceException {
+
+        EventConfigurationProviderService eventConfigService;
+        eventConfigService = DeviceManagementDataHolder.getInstance().getEventConfigurationService();
+
         int tenantId;
+        List<Integer> groupIdsToDelete = new ArrayList<>();
+        List<Integer> groupIdsToAdd = new ArrayList<>();
+
         try {
             tenantId = DeviceManagementDAOUtil.getTenantId();
         } catch (DeviceManagementDAOException e) {
@@ -1543,8 +1550,6 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
             int updatedRowCount = geofenceDAO.updateGeofence(geofenceData, fenceId);
             savedGroupIds = geofenceDAO.getGroupIdsOfGeoFence(fenceId);
             geofenceData.setId(fenceId);
-            List<Integer> groupIdsToDelete = new ArrayList<>();
-            List<Integer> groupIdsToAdd = new ArrayList<>();
             for (Integer savedGroupId : savedGroupIds) {
                 if (!geofenceData.getGroupIds().contains(savedGroupId)) {
                     groupIdsToDelete.add(savedGroupId);
@@ -1558,6 +1563,18 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
             geofenceDAO.deleteGeofenceGroupMapping(groupIdsToDelete, fenceId);
             geofenceDAO.createGeofenceGroupMapping(geofenceData, groupIdsToAdd);
             EventManagementDAOFactory.commitTransaction();
+            try {
+                if (!groupIdsToDelete.isEmpty()) {
+                    eventConfigService.createEventOperationTask(OperationMgtConstants.OperationCodes.EVENT_REVOKE,
+                            DeviceManagementConstants.EventServices.GEOFENCE,
+                            new GeoFenceEventMeta(geofenceData), tenantId, groupIdsToDelete);
+                }
+            } catch (EventConfigurationException e) {
+                String msg = "Failed while creating EVENT_REVOKE operation creation task entry while updating geo fence "
+                        + geofenceData.getFenceName() + " of the tenant " + tenantId;
+                log.error(msg, e);
+                throw new GeoLocationBasedServiceException(msg, e);
+            }
             if (updatedRowCount > 0) {
                 GeoCacheManagerImpl.getInstance().updateGeoFenceInCache(geofenceData, fenceId, tenantId);
             }