diff --git a/docker-compose-production.yml b/docker-compose-production.yml
index 12eddbf..d6a817a 100644
--- a/docker-compose-production.yml
+++ b/docker-compose-production.yml
@@ -1,3 +1,9 @@
+ambassador:
+  image: cpuguy83/docker-grand-ambassador
+  volumes:
+    - "/var/run/docker.sock:/var/run/docker.sock"
+  command: "-name surveil_surveil_1 -name surveil_alignak_1"
+
 surveil:
   #build: .
   image: surveil/surveil:0.13.1
diff --git a/surveil/cmd/surveil_os_interface.py b/surveil/cmd/surveil_os_interface.py
index 00a2228..47c32cb 100644
--- a/surveil/cmd/surveil_os_interface.py
+++ b/surveil/cmd/surveil_os_interface.py
@@ -177,13 +177,13 @@ def main():
                           file=sys.stderr)
 
             # Tags
-            instance_tags = daemon_config["SURVEIL_DEFAULT_TAGS"]
+            instance_tags = daemon_config["SURVEIL_DEFAULT_TAGS"].split(',')
             surveil_metadata_tags = event['payload']['metadata'].get(
                 'surveil_tags',
                 None
             )
             if surveil_metadata_tags is not None:
-                instance_tags += ',' + surveil_metadata_tags
+                instance_tags += surveil_metadata_tags.split(',')
 
             sclient.config.hosts.create(
                 host_name=event['payload']['hostname'],