diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh
index fa7e5e2..13e3f1b 100755
--- a/.install/scuttlebutt.sh
+++ b/.install/scuttlebutt.sh
@@ -92,11 +92,24 @@ scuttlebutt() {
 }
 EOF
 
-    cat > ~/.zen/launch-oasis.sh <<EOF
-#!/bin/bash
-oasis --allow-host $nodename --host $nodename
+echo "CREATE SYSTEMD oasis SERVICE >>>>>>>>>>>>>>>>>>"
+cat > /tmp/oasis.service <<EOF
+[Unit]
+Description=OASIS Scuttlebutt Gateway
+After=network.target
+
+[Service]
+User=_USER_
+ExecStart=/usr/local/bin/oasis --host $nodename --allow-host $nodename
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
 EOF
 
+sudo cp -f /tmp/oasis.service /etc/systemd/system/
+sudo sed -i "s/_USER_/$USER/g" /etc/systemd/system/oasis.service
+
 	echo "
          _      __ __ _  
  _ _ .__|_o _  (_ (_ |_) 
@@ -112,13 +125,13 @@ __)|_| \ \/ |_| \ || || |_ ... SCUTTLEBUTT ... OK?
                            
 '
 	echo "Launching oasis"
-    oasis --allow-host $nodename --host $nodename &
+
+sudo systemctl daemon-reload || err "Restart OASIS"
+sudo systemctl enable oasis || err "Enable OASIS daemon"
+
     echo " http://$nodename:3000 "
     echo
-	echo "ADD ~/.zen/launch-oasis.sh TO YOUR '/etc/rc.local' !!! Or use patchwork. "
     sleep $((1 + RANDOM % 5))
-	echo "LAUNCHING OASIS NODE MANAGER http://$nodename:3000"
-
     echo "IF YOU ARE A PUB consider protect it behind password nginx redirect !!!"
 
     echo "3 seconds before ssb_INIT.sh..."