diff --git a/building_manager.py b/building_manager.py
index 32eb9c18275b8fd6d9f20a1dd7f47a4f852cc3e7..09490e62806a4dc779212adfb5f0a2fd01ea96fa 100755
--- a/building_manager.py
+++ b/building_manager.py
@@ -63,11 +63,11 @@ EDIT_FILES = {
 }
 CONSTRAINTS = {"building": "node.labels.building"}
 SERVICES = {
-    "sftp": "sftp_X",
-    "openhab": "openhab_X",
-    "nodered": "nodered_X",
-    "postgres": "postgres_X",
-    "mqtt": "mqtt_X"
+    "sftp": "sftp",
+    "openhab": "openhab",
+    "nodered": "nodered",
+    "postgres": "postgres",
+    "mqtt": "mqtt"
 }
 FRONTEND_SERVICES = {
     "openhab": "OpenHAB",
diff --git a/template_configs/docker-templates.yml b/template_configs/docker-templates.yml
index e27a44d41c000d628a854f8d62a96094531c7945..389f2856451dc140a20a1465d15cf4e8738507e0 100644
--- a/template_configs/docker-templates.yml
+++ b/template_configs/docker-templates.yml
@@ -7,8 +7,8 @@ networks:
         attachable: true
 
 configs:
-    backup_config_X:
-        file: ./volumerize/backup_config_X.json
+    backup_config:
+        file: ./volumerize/backup_config.json
     sftp_config:
         file: ./ssh/sshd_config
     sftp_users:
@@ -54,7 +54,7 @@ volumes:
     backup_cache:
 
 services:
-    backup_X:
+    backup:
         image: blacklabelops/volumerize
         volumes:
             - "openhab_userdata:/source/openhab_userdata"
@@ -83,7 +83,7 @@ services:
             placement:
                 constraints:
                     - node.labels.building == X
-    sftp_X:
+    sftp:
         image: "atmoz/sftp"
         volumes:
             - "openhab_userdata:/home/ohadmin/openhab_userdata"
@@ -110,7 +110,7 @@ services:
             placement:
                 constraints:
                     - node.labels.building == X
-    openhab_X:
+    openhab:
         image: "openhab/openhab:2.4.0-amd64-debian"
         volumes:
             - "/etc/localtime:/etc/localtime:ro"
@@ -130,7 +130,7 @@ services:
             placement:
                 constraints:
                     - node.labels.building == X
-    nodered_X:
+    nodered:
         image: "nodered/node-red-docker"
         volumes:
             - "nodered_data:/data"
@@ -148,7 +148,7 @@ services:
             placement:
                 constraints:
                     - node.labels.building == X
-    mqtt_X:
+    mqtt:
         image: "eclipse-mosquitto"
         volumes:
             - "mosquitto_data:/mosquitto/data"
@@ -164,7 +164,7 @@ services:
             placement:
                 constraints:
                     - node.labels.building == X
-    db_X:
+    db:
         image: "influxdb"
         volumes:
             - "influxdb_data:/var/lib/influxdb"
@@ -187,7 +187,7 @@ services:
             placement:
                 constraints:
                     - node.labels.building == X
-    postgres_X:
+    postgres:
         image: "postgres"
         volumes:
             - "postgres_data:/var/lib/postgresql/data/pgdata"