diff --git a/armadietto.service b/armadietto.service
new file mode 100644
index 0000000..3511d73
--- /dev/null
+++ b/armadietto.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=remoteStorage server
+After=local-fs.target
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=10
+User=armadietto
+ExecStart=/usr/local/bin/armadietto -c /usr/share/armadietto/config.json
+
+[Install]
+WantedBy=basic.target
\ No newline at end of file
diff --git a/upnp.service b/upnp.service
new file mode 100644
index 0000000..f48f5be
--- /dev/null
+++ b/upnp.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Upnp service
+After=yunohost-firewall.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/yunohost firewall upnp enable
+ExecStop=/usr/bin/yunohost firewall upnp disable
+ExecReload=/usr/bin/yunohost firewall upnp reload
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target