diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml
index d637ea8f83..eace9e893f 100644
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@@ -338,9 +338,9 @@ outputs:
                 - name: dhcp_haproxy
                   cmd: >-
                       $(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then
-                      echo "/usr/sbin/haproxy -Ds";
+                      echo "exec /usr/sbin/haproxy -Ds";
                       else
-                      echo "/usr/sbin/haproxy -Ws"; fi)
+                      echo "exec /usr/sbin/haproxy -Ws"; fi)
                   kill_script: haproxy-kill
       docker_config:
         step_4:
diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml
index 227bfcff2a..15a05e4cba 100644
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@@ -286,20 +286,20 @@ outputs:
                 loop_var: l3_wrapper_item
               loop:
                 - name: l3_keepalived
-                  cmd: /usr/sbin/keepalived -n -l -D
+                  cmd: exec /usr/sbin/keepalived -n -l -D
                   kill_script: keepalived-kill
                 - name: l3_haproxy
                   cmd: >-
                       $(if [ -f /usr/sbin/haproxy-systemd-wrapper ]; then
-                      echo "/usr/sbin/haproxy -Ds";
+                      echo "exec /usr/sbin/haproxy -Ds";
                       else
-                      echo "/usr/sbin/haproxy -Ws"; fi)
+                      echo "exec /usr/sbin/haproxy -Ws"; fi)
                   kill_script: haproxy-kill
                 - name: l3_dibbler
-                  cmd: /usr/sbin/dibbler-client run
+                  cmd: exec /usr/sbin/dibbler-client run
                   kill_script: dibbler-kill
                 - name: l3_radvd
-                  cmd: /usr/sbin/radvd -n
+                  cmd: exec /usr/sbin/radvd -n
                   kill_script: radvd-kill
       docker_config:
         step_4: