diff --git a/templates/application/check_nextcloud_mounts.py b/templates/application/check_nextcloud_mounts.py
index cd304e6..6edde37 100644
--- a/templates/application/check_nextcloud_mounts.py
+++ b/templates/application/check_nextcloud_mounts.py
@@ -10,6 +10,8 @@ buckets = []
 bucket_count = {}
 containers = {}
 exit = 0
+base_message = "OK: no duplicate mounts"
+perf_data = ""
 
 get_containers = subprocess.Popen('/usr/local/bin/get_containers', stdout=subprocess.PIPE).stdout.read()
 containers = get_containers.decode().splitlines()
@@ -22,13 +24,11 @@ for container in containers:
     for items in mount_data:
         buckets.append(items["configuration"]["bucket"])
     bucket_count = dict(Counter(buckets))
-    for i, (k, v) in enumerate(bucket_count.items()):
+    for k, v in bucket_count.items():
         if v > 1:
-            if i == 0:
-                print("WARNING: buckets with multiple mounts")
-                print(f"bucket {k} is mounted {v} times | {k}_num_mounts={v}")
-            else:
-                print(f"bucket {k} is mounted {v} times | {k}_num_mounts={v}")
+            base_message = "WARNING: buckets with multiple mounts |"
+            perf_data += f" {k}={v}"
 #            lets do exit 0 for now
 #            exit = 1
+print(base_message + perf_data)
 sys.exit(exit)