diff --git a/examples/docker/docker-compose.yml b/examples/docker/docker-compose.yml
index ef60248..7587ae8 100644
--- a/examples/docker/docker-compose.yml
+++ b/examples/docker/docker-compose.yml
@@ -13,7 +13,7 @@
 # location: https://host1.local/
 #
 # Test SSL:
-# openssl s_client -showcerts -connect 127.0.0.1:443 --servername host1.local
+# openssl s_client -showcerts -connect 127.0.0.1:443 -servername host1.local
 
 version: "3"
 
diff --git a/examples/swarm/docker-compose.yml b/examples/swarm/docker-compose.yml
index d9000bf..d5fa394 100644
--- a/examples/swarm/docker-compose.yml
+++ b/examples/swarm/docker-compose.yml
@@ -13,7 +13,7 @@
 # location: https://host1.local/
 #
 # Test SSL:
-# openssl s_client -showcerts -connect 127.0.0.1:443 --servername host1.local
+# openssl s_client -showcerts -connect 127.0.0.1:443 -servername host1.local
 
 version: "3"
 
diff --git a/src/processor/__init__.py b/src/processor/__init__.py
index 6fe66e8..90c5972 100644
--- a/src/processor/__init__.py
+++ b/src/processor/__init__.py
@@ -129,7 +129,10 @@ class Docker(ProcessorInterface):
     def inspect_network(self):
         self.parsed_object = {}
         for container in self.client.containers.list():
-            self.parsed_object[container.name] = container.labels
+            ip_address = container.attrs["NetworkSettings"]["IPAddress"]
+            if not ip_address:
+                ip_address = list(container.attrs["NetworkSettings"]["Networks"].values())[0]["IPAddress"]
+            self.parsed_object[ip_address] = container.labels
 
 
 class Swarm(ProcessorInterface):
@@ -140,7 +143,7 @@ class Swarm(ProcessorInterface):
     def inspect_network(self):
         self.parsed_object = {}
         for container in self.client.services.list():
-            self.parsed_object[container.attrs["Spec"]["Name"]] = container.attrs["Spec"]["Labels"]
+            self.parsed_object[container.attrs["Endpoint"]["VirtualIPs"][0]["Addr"].split("/")[0]] = container.attrs["Spec"]["Labels"]
 
 
 class Kubernetes(ProcessorInterface):