diff --git a/roles/koschei/files/koschei.py b/roles/koschei/files/koschei.py
index 909c1ecbaf..5839a3212a 100644
--- a/roles/koschei/files/koschei.py
+++ b/roles/koschei/files/koschei.py
@@ -1,3 +1,7 @@
+import socket
+
+hostname = socket.gethostname().split('.', 1)[0]
+
 config = {
-    "name": "koschei",
+    "name": "koschei.%s" % hostname,
 }