diff --git a/docker-compose.yml b/docker-compose.yml
index 1c03d9c..94d831f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   all-all-fake-connector:
-    image: ernestio/all-all-fake-connector:1.4.1
+    image: ernestio/all-all-fake-connector:1.5.0
     links:
     - nats
     - redis
@@ -10,7 +10,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   api-gateway:
-    image: ernestio/api-gateway:1.4.1
+    image: ernestio/api-gateway:1.5.0
     ports:
     - 8080:8080
     links:
@@ -21,7 +21,7 @@ services:
       JWT_SECRET: GENERATEDJWTSECRET
       NATS_URI: nats://nats:4222
   aws-definition-mapper:
-    image: ernestio/aws-definition-mapper:1.4.1
+    image: ernestio/aws-definition-mapper:1.5.0
     links:
     - nats
     - redis
@@ -31,7 +31,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   config-store:
-    image: ernestio/config-store:1.4.1
+    image: ernestio/config-store:1.5.0
     entrypoint: /go/bin/config-store -config /etc/ernest/config.json
     volumes:
     - ./config/config-store/:/etc/ernest/
@@ -40,7 +40,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   datacenter-store:
-    image: ernestio/datacenter-store:1.4.1
+    image: ernestio/datacenter-store:1.5.0
     links:
     - nats
     depends_on:
@@ -48,7 +48,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   definition-mapper:
-    image: ernestio/definition-mapper:1.4.1
+    image: ernestio/definition-mapper:1.5.0
     links:
     - nats
     - redis
@@ -58,7 +58,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   execution-adapter:
-    image: ernestio/execution-adapter:1.4.1
+    image: ernestio/execution-adapter:1.5.0
     links:
     - nats
     depends_on:
@@ -66,7 +66,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   execution-builder:
-    image: ernestio/execution-builder:1.4.1
+    image: ernestio/execution-builder:1.5.0
     links:
     - nats
     - redis
@@ -75,7 +75,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   execution-run-salt-connector:
-    image: ernestio/execution-run-salt-connector:1.4.1
+    image: ernestio/execution-run-salt-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -83,7 +83,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-adapter:
-    image: ernestio/firewall-adapter:1.4.1
+    image: ernestio/firewall-adapter:1.5.0
     links:
     - nats
     depends_on:
@@ -91,7 +91,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-builder:
-    image: ernestio/firewall-builder:1.4.1
+    image: ernestio/firewall-builder:1.5.0
     links:
     - nats
     - redis
@@ -100,7 +100,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-creator-aws-connector:
-    image: ernestio/firewall-creator-aws-connector:1.4.1
+    image: ernestio/firewall-creator-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -108,7 +108,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-creator-vcloud-connector:
-    image: ernestio/firewall-creator-vcloud-connector:1.4.1
+    image: ernestio/firewall-creator-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -116,7 +116,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-deleter-aws-connector:
-    image: ernestio/firewall-deleter-aws-connector:1.4.1
+    image: ernestio/firewall-deleter-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -124,7 +124,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-updater-aws-connector:
-    image: ernestio/firewall-updater-aws-connector:1.4.1
+    image: ernestio/firewall-updater-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -132,15 +132,32 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   firewall-updater-vcloud-connector:
-    image: ernestio/firewall-updater-vcloud-connector:1.4.1
+    image: ernestio/firewall-updater-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
     - config-store
     environment:
       NATS_URI: nats://nats:4222
+  generic-adapter:
+    image: ernestio/generic-adapter:1.5.0
+    links:
+    - nats
+    depends_on:
+    - config-store
+    environment:
+      NATS_URI: nats://nats:4222
+  generic-builder:
+    image: ernestio/generic-builder:1.5.0
+    links:
+    - nats
+    - redis
+    depends_on:
+    - config-store
+    environment:
+      NATS_URI: nats://nats:4222
   group-store:
-    image: ernestio/group-store:1.4.1
+    image: ernestio/group-store:1.5.0
     links:
     - nats
     depends_on:
@@ -148,7 +165,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-adapter:
-    image: ernestio/instance-adapter:1.4.1
+    image: ernestio/instance-adapter:1.5.0
     links:
     - nats
     depends_on:
@@ -156,7 +173,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-builder:
-    image: ernestio/instance-builder:1.4.1
+    image: ernestio/instance-builder:1.5.0
     links:
     - nats
     - redis
@@ -165,7 +182,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-creator-aws-connector:
-    image: ernestio/instance-creator-aws-connector:1.4.1
+    image: ernestio/instance-creator-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -173,7 +190,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-creator-vcloud-connector:
-    image: ernestio/instance-creator-vcloud-connector:1.4.1
+    image: ernestio/instance-creator-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -181,7 +198,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-deleter-aws-connector:
-    image: ernestio/instance-deleter-aws-connector:1.4.1
+    image: ernestio/instance-deleter-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -189,7 +206,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-deleter-vcloud-connector:
-    image: ernestio/instance-deleter-vcloud-connector:1.4.1
+    image: ernestio/instance-deleter-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -197,7 +214,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-updater-aws-connector:
-    image: ernestio/instance-updater-aws-connector:1.4.1
+    image: ernestio/instance-updater-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -205,7 +222,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   instance-updater-vcloud-connector:
-    image: ernestio/instance-updater-vcloud-connector:1.4.1
+    image: ernestio/instance-updater-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -213,7 +230,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   monit:
-    image: ernestio/monit:1.4.1
+    image: ernestio/monit:1.5.0
     ports:
     - 22000:22000
     links:
@@ -224,7 +241,7 @@ services:
       JWT_SECRET: GENERATEDJWTSECRET
       NATS_URI: nats://nats:4222
   nat-adapter:
-    image: ernestio/nat-adapter:1.4.1
+    image: ernestio/nat-adapter:1.5.0
     links:
     - nats
     depends_on:
@@ -232,7 +249,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   nat-builder:
-    image: ernestio/nat-builder:1.4.1
+    image: ernestio/nat-builder:1.5.0
     links:
     - nats
     - redis
@@ -241,7 +258,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   nat-creator-aws-connector:
-    image: ernestio/nat-creator-aws-connector:1.4.1
+    image: ernestio/nat-creator-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -249,7 +266,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   nat-creator-vcloud-connector:
-    image: ernestio/nat-creator-vcloud-connector:1.4.1
+    image: ernestio/nat-creator-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -257,7 +274,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   nat-deleter-aws-connector:
-    image: ernestio/nat-deleter-aws-connector:1.4.1
+    image: ernestio/nat-deleter-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -265,7 +282,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   nat-updater-aws-connector:
-    image: ernestio/nat-updater-aws-connector:1.4.1
+    image: ernestio/nat-updater-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -273,7 +290,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   nat-updater-vcloud-connector:
-    image: ernestio/nat-updater-vcloud-connector:1.4.1
+    image: ernestio/nat-updater-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -285,7 +302,7 @@ services:
     ports:
     - 4222:4222
   network-adapter:
-    image: ernestio/network-adapter:1.4.1
+    image: ernestio/network-adapter:1.5.0
     links:
     - nats
     depends_on:
@@ -293,7 +310,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   network-builder:
-    image: ernestio/network-builder:1.4.1
+    image: ernestio/network-builder:1.5.0
     links:
     - nats
     - redis
@@ -302,7 +319,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   network-creator-aws-connector:
-    image: ernestio/network-creator-aws-connector:1.4.1
+    image: ernestio/network-creator-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -310,7 +327,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   network-creator-vcloud-connector:
-    image: ernestio/network-creator-vcloud-connector:1.4.1
+    image: ernestio/network-creator-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -318,7 +335,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   network-deleter-aws-connector:
-    image: ernestio/network-deleter-aws-connector:1.4.1
+    image: ernestio/network-deleter-aws-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -326,7 +343,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   network-deleter-vcloud-connector:
-    image: ernestio/network-deleter-vcloud-connector:1.4.1
+    image: ernestio/network-deleter-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -353,7 +370,7 @@ services:
   redis:
     image: redis
   router-adapter:
-    image: ernestio/router-adapter:1.4.1
+    image: ernestio/router-adapter:1.5.0
     links:
     - nats
     depends_on:
@@ -361,7 +378,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   router-builder:
-    image: ernestio/router-builder:1.4.1
+    image: ernestio/router-builder:1.5.0
     links:
     - nats
     - redis
@@ -370,7 +387,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   router-creator-vcloud-connector:
-    image: ernestio/router-creator-vcloud-connector:1.4.1
+    image: ernestio/router-creator-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -378,7 +395,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   router-deleter-vcloud-connector:
-    image: ernestio/router-deleter-vcloud-connector:1.4.1
+    image: ernestio/router-deleter-vcloud-connector:1.5.0
     links:
     - nats
     depends_on:
@@ -386,7 +403,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   service-store:
-    image: ernestio/service-store:1.4.1
+    image: ernestio/service-store:1.5.0
     links:
     - nats
     depends_on:
@@ -394,7 +411,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   user-store:
-    image: ernestio/user-store:1.4.1
+    image: ernestio/user-store:1.5.0
     links:
     - nats
     depends_on:
@@ -402,7 +419,7 @@ services:
     environment:
       NATS_URI: nats://nats:4222
   vcloud-definition-mapper:
-    image: ernestio/vcloud-definition-mapper:1.4.1
+    image: ernestio/vcloud-definition-mapper:1.5.0
     links:
     - nats
     - redis
@@ -411,8 +428,24 @@ services:
     - config-store
     environment:
       NATS_URI: nats://nats:4222
+  vpc-creator-aws-connector:
+    image: ernestio/vpc-creator-aws-connector:1.5.0
+    links:
+    - nats
+    depends_on:
+    - config-store
+    environment:
+      NATS_URI: nats://nats:4222
+  vpc-deleter-aws-connector:
+    image: ernestio/vpc-deleter-aws-connector:1.5.0
+    links:
+    - nats
+    depends_on:
+    - config-store
+    environment:
+      NATS_URI: nats://nats:4222
   workflow-manager:
-    image: ernestio/workflow-manager:1.4.1
+    image: ernestio/workflow-manager:1.5.0
     links:
     - nats
     - redis