diff --git a/templates/411_process-ngcp-pro.yaml.tt2 b/templates/411_process-ngcp-pro.yaml.tt2
index 16a318d..6a5e7e9 100644
--- a/templates/411_process-ngcp-pro.yaml.tt2
+++ b/templates/411_process-ngcp-pro.yaml.tt2
@@ -28,7 +28,9 @@ process:
   glusterfs:
     running: true
 
-  hb_watchdog:
+  # We have to use a truncated process name because that's the COMM limit
+  # on Linux (15 characters).
+  ngcp-hb-watchdo:
     running: true
 
   heartbeat:
diff --git a/templates/510_init-daemons-ngcp.yaml.tt2 b/templates/510_init-daemons-ngcp.yaml.tt2
index 4d532ef..2b46d57 100644
--- a/templates/510_init-daemons-ngcp.yaml.tt2
+++ b/templates/510_init-daemons-ngcp.yaml.tt2
@@ -60,7 +60,7 @@ service:
     enabled: false
     running: [% is_lb && haproxy.enable == "yes" && general.ngcp_type == 'carrier' ? 'true' : 'false' %]
 
-  hb_watchdog.service:
+  ngcp-hb-watchdog.service:
     enabled: [% heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %]
     running: [% heartbeat.hb_watchdog.enable == 'yes' ? 'true' : 'false' %]