diff --git a/src/services/application-service.js b/src/services/application-service.js
index c55254e9..9f7e1973 100644
--- a/src/services/application-service.js
+++ b/src/services/application-service.js
@@ -313,25 +313,15 @@ const _updateMicroservices = async function (application, microservices, isCLI,
   for (const microservice of updatedMicroservices) {
     await MicroserviceService.createMicroserviceEndPoint(microservice, isCLI, transaction)
   }
-  iofogUuids
-    .filter(onlyUnique)
-    .filter((val) => val !== null)
-  for (const iofogUuid of iofogUuids) {
+  for (const iofogUuid of iofogUuids.filter(onlyUnique).filter((val) => val !== null)) {
     await ChangeTrackingService.update(iofogUuid, ChangeTrackingService.events.microserviceFull, transaction)
   }
-  oldMsvcsIofogUuids
-    .filter(onlyUnique)
-    .filter((val) => val !== null)
-    .forEach(async (iofogUuid) => {
-      await MicroserviceService.updateChangeTracking(true, iofogUuid, transaction)
-    })
-
-  updatedMsvcsUuid
-    .filter(onlyUnique)
-    .filter((val) => val !== null)
-    .forEach(async (iofogUuid) => {
-      await MicroserviceService.updateChangeTracking(true, iofogUuid, transaction)
-    })
+  for (const iofogUuid of oldMsvcsIofogUuids.filter(onlyUnique).filter((val) => val !== null)) {
+    await MicroserviceService.updateChangeTracking(true, iofogUuid, transaction)
+  }
+  for (const iofogUuid of updatedMsvcsUuid.filter(onlyUnique).filter((val) => val !== null)) {
+    await MicroserviceService.updateChangeTracking(true, iofogUuid, transaction)
+  }
 }
 
 const getUserApplicationsEndPoint = async function (isCLI, transaction) {
diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js
index 00c64cd9..a973921e 100644
--- a/src/services/microservices-service.js
+++ b/src/services/microservices-service.js
@@ -1709,13 +1709,15 @@ async function deleteMicroserviceEndPoint (microserviceUuid, microserviceData, i
 
 async function deleteNotRunningMicroservices (fog, transaction) {
   const microservices = await MicroserviceManager.findAllWithStatuses({ iofogUuid: fog.uuid }, transaction)
-  microservices
+  const toDelete = microservices
     .filter((microservice) => microservice.delete)
     .filter((microservice) => microservice.microserviceStatus.status === MicroserviceStates.UNKNOWN ||
       microservice.microserviceStatus.status === MicroserviceStates.STOPPING ||
       microservice.microserviceStatus.status === MicroserviceStates.DELETING ||
       microservice.microserviceStatus.status === MicroserviceStates.MARKED_FOR_DELETION)
-    .forEach(async (microservice) => { await deleteMicroserviceWithRoutesAndPortMappings(microservice, transaction) })
+  for (const microservice of toDelete) {
+    await deleteMicroserviceWithRoutesAndPortMappings(microservice, transaction)
+  }
 }
 
 async function createPortMappingEndPoint (microserviceUuid, portMappingData, isCLI, transaction) {