diff --git a/src/main/java/org/etsi/osl/tmf/sim638/repo/ServiceActionQueueRepository.java b/src/main/java/org/etsi/osl/tmf/sim638/repo/ServiceActionQueueRepository.java
index af5de0e23f212f881874b18921d79726bcda0810..d6d7549da64ca23152a1d97cf89d5b20e2ed2e9f 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/repo/ServiceActionQueueRepository.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/repo/ServiceActionQueueRepository.java
@@ -21,6 +21,7 @@ package org.etsi.osl.tmf.sim638.repo;
 
 import java.util.List;
 import java.util.Optional;
+import org.etsi.osl.tmf.sim638.model.ServiceActionQueueAction;
 import org.etsi.osl.tmf.sim638.model.ServiceActionQueueItem;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
@@ -35,4 +36,11 @@ public interface ServiceActionQueueRepository extends CrudRepository<ServiceActi
 	Optional<ServiceActionQueueItem> findByUuid(String id);
 
 	List<ServiceActionQueueItem> findFirst10ByOrderByInsertedDate();
+
+  List<ServiceActionQueueItem> findByServiceRefIdAndAction(String serviceRefId,
+      ServiceActionQueueAction action);
+  
+
+  void deleteByServiceRefIdAndAction(String serviceRefId,
+      ServiceActionQueueAction action);
 }
diff --git a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
index 261fbabe330e75b6a3f4db34be2c667817d0c017..412b2876d884e9ef34140e85c76aaa07af71fdbb 100644
--- a/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
+++ b/src/main/java/org/etsi/osl/tmf/sim638/service/ServiceRepoService.java
@@ -799,6 +799,12 @@ public class ServiceRepoService {
 	
 	public ServiceActionQueueItem  addServiceActionQueueItem(@Valid ServiceActionQueueItem item) {
 		logger.debug("Will add ServiceActionQueueItem ServiceRefId: " + item.getServiceRefId() );
+		
+		//find any similar action inqueue and delete them, so to keep this one as the most recent
+		//List<ServiceActionQueueItem> result = this.serviceActionQueueRepo.findByServiceRefIdAndAction(item.getServiceRefId(), item.getAction());
+        //logger.debug("Will add ServiceActionQueueItem ServiceRefId result: " +result.size() );
+        this.serviceActionQueueRepo.deleteByServiceRefIdAndAction(item.getServiceRefId(), item.getAction());
+        
 		return this.serviceActionQueueRepo.save( item);
 	}
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e9d32ce5e55bd5e5032c45549fb027ea69fdf78b..fb8fddc20895d76086621d9810638e9ebfbe9502 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
-origins: http://localhost,http://localhost:13082,http://127.0.0.1:13082,https://localhost, 
+origins: http://localhost,http://localhost:8888,http://localhost:13082,http://127.0.0.1:13082,https://localhost, 
 permit-all: /tmf-api/**