diff --git a/systemvm/debian/etc/systemd/system/cloud.service b/systemvm/debian/etc/systemd/system/cloud.service
new file mode 100644
index 00000000000..e3824bf53c2
--- /dev/null
+++ b/systemvm/debian/etc/systemd/system/cloud.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=CloudStack Agent service
+After=cloud-early-config.service network.target cloud-postinit.service local-fs.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+WorkingDirectory=/usr/local/cloud/systemvm
+ExecStart=/usr/local/cloud/systemvm/_run.sh
+Restart=on-failure
diff --git a/systemvm/debian/lib/systemd/system/baremetal-vr.service b/systemvm/debian/lib/systemd/system/baremetal-vr.service
new file mode 100644
index 00000000000..f880f0ca18a
--- /dev/null
+++ b/systemvm/debian/lib/systemd/system/baremetal-vr.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=CloudStack Baremetal VR service
+After=network.target local-fs.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+WorkingDirectory=/opt/cloud/bin
+ExecStart=/usr/bin/python /opt/cloud/bin/baremetal-vr.py
+Restart=on-failure