diff --git a/config/comment-server.target b/config/comment-server.target
new file mode 100644
index 0000000..afdcc05
--- /dev/null
+++ b/config/comment-server.target
@@ -0,0 +1,8 @@
+[Unit]
+Description="LBRY Comment Server Watchdog"
+After=network.target
+Requires=comment-server@5921.service comment-server@5922.service comment-server@5923.service comment-server@5924.service
+
+
+[Install]
+WantedBy=multi-user.target
diff --git a/config/comment-server@.service b/config/comment-server@.service
new file mode 100644
index 0000000..e453fe4
--- /dev/null
+++ b/config/comment-server@.service
@@ -0,0 +1,15 @@
+[Unit]
+Description="LBRY Comment Server #%i"
+PartOf=comment-server.target
+
+[Service]
+Type=simple
+User=oleg
+WorkingDirectory=/home/lbry/comment-server/
+ExecStart=/home/lbry/comment-server/venv/bin/commentserv --port %i
+Restart=on-failure
+KillMode=process
+
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file