diff --git a/multiapps-controller-api/pom.xml b/multiapps-controller-api/pom.xml
index cc4f9e1062..f09073914a 100644
--- a/multiapps-controller-api/pom.xml
+++ b/multiapps-controller-api/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/multiapps-controller-client/pom.xml b/multiapps-controller-client/pom.xml
index fb789b0979..ee29a9cbac 100644
--- a/multiapps-controller-client/pom.xml
+++ b/multiapps-controller-client/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/multiapps-controller-core-test/pom.xml b/multiapps-controller-core-test/pom.xml
index bf3ad14176..40fa182f2f 100644
--- a/multiapps-controller-core-test/pom.xml
+++ b/multiapps-controller-core-test/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/multiapps-controller-core/pom.xml b/multiapps-controller-core/pom.xml
index 14bbf16743..59a37acee7 100644
--- a/multiapps-controller-core/pom.xml
+++ b/multiapps-controller-core/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/clients/CustomServiceKeysClient.java b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/clients/CustomServiceKeysClient.java
index c47174dd43..9288715142 100644
--- a/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/clients/CustomServiceKeysClient.java
+++ b/multiapps-controller-core/src/main/java/org/cloudfoundry/multiapps/controller/core/cf/clients/CustomServiceKeysClient.java
@@ -103,7 +103,9 @@ public List<DeployedMtaServiceKey> getMappedResources() {
 
         public Map<String, CloudServiceInstance> getIncludedServiceInstancesMapping() {
             List<Object> serviceInstances = getIncludedResources().getOrDefault("service_instances", Collections.emptyList());
+
             return serviceInstances.stream()
+                                   .distinct()
                                    .map(service -> (Map<String, Object>) service)
                                    .collect(Collectors.toMap(service -> (String) service.get("guid"), resourceMapper::mapService));
 
diff --git a/multiapps-controller-coverage/pom.xml b/multiapps-controller-coverage/pom.xml
index ca5b51e39b..e93f3168b6 100644
--- a/multiapps-controller-coverage/pom.xml
+++ b/multiapps-controller-coverage/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/multiapps-controller-database-migration/pom.xml b/multiapps-controller-database-migration/pom.xml
index 8697680ba9..c5ebdbfa20 100644
--- a/multiapps-controller-database-migration/pom.xml
+++ b/multiapps-controller-database-migration/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/multiapps-controller-persistence-test/pom.xml b/multiapps-controller-persistence-test/pom.xml
index 939f6e50ad..a19c58d142 100644
--- a/multiapps-controller-persistence-test/pom.xml
+++ b/multiapps-controller-persistence-test/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/multiapps-controller-persistence/pom.xml b/multiapps-controller-persistence/pom.xml
index aeb89baf1a..2270a827a1 100644
--- a/multiapps-controller-persistence/pom.xml
+++ b/multiapps-controller-persistence/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/multiapps-controller-process/pom.xml b/multiapps-controller-process/pom.xml
index df41ea9312..0e59e14412 100644
--- a/multiapps-controller-process/pom.xml
+++ b/multiapps-controller-process/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/multiapps-controller-shutdown-client/pom.xml b/multiapps-controller-shutdown-client/pom.xml
index 1c175a4cf0..7d3a5043f9 100644
--- a/multiapps-controller-shutdown-client/pom.xml
+++ b/multiapps-controller-shutdown-client/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
diff --git a/multiapps-controller-web/pom.xml b/multiapps-controller-web/pom.xml
index 96354c015b..8adf114916 100644
--- a/multiapps-controller-web/pom.xml
+++ b/multiapps-controller-web/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.cloudfoundry.multiapps</groupId>
         <artifactId>multiapps-controller-parent</artifactId>
-        <version>1.183.0</version>
+        <version>1.184.0-SNAPSHOT</version>
     </parent>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 4e4d33ffde..7c2fc26609 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.cloudfoundry.multiapps</groupId>
     <artifactId>multiapps-controller-parent</artifactId>
-    <version>1.183.0</version>
+    <version>1.184.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>MultiApps Controller Parent</name>
     <description>Multi-Target Application (MTA) deployment service for Cloud Foundry</description>