diff --git a/building_manager.py b/building_manager.py
index eec77f0fd76a734bb265b3272c6281d44c2117f8..d5a3b506fbb7fa143972ffe742adcf8a4b2eda7f 100755
--- a/building_manager.py
+++ b/building_manager.py
@@ -1299,7 +1299,8 @@ def service_add_menu(base_dir):
         'Input an all lower case identifier:', style=st).ask()
 
     if service and host and identifier:
-        add_postgres_service(base_dir, host, postfix=identifier)
+        if service == Service.POSTGRES:
+            add_postgres_service(base_dir, host, postfix=identifier)
 
 
 def service_modify_menu(base_dir):
diff --git a/template_configs/docker-templates.yml b/template_configs/docker-templates.yml
index 9324e959c541179e7baad34eb09a023328bb43d3..db669fad6ae5b427575e13c68e8a706c73736f66 100644
--- a/template_configs/docker-templates.yml
+++ b/template_configs/docker-templates.yml
@@ -227,3 +227,14 @@ services:
             placement:
                 constraints:
                     - node.role == manager
+    zwave_oh:
+        image: docker
+        command: "docker run --rm --name device_oh --network habnet -v /etc/localtime:/etc/localtime:ro -v /etc/timezone:/etc/timezone:ro -v openhab_zwave_conf:/openhab/conf -v openhab_zwave_userdata:/openhab/userdata -p 9898:8080 openhab/openhab:2.4.0"
+        volumes:
+            - "/var/run/docker.sock:/var/run/docker.sock"
+        networks:
+            - habnet
+        deploy:
+            placement:
+                constraints:
+                    - node.labels.device == zwave