diff --git a/backend/format_node_disk b/backend/format_node_disk
index a5c8996..fa26305 100755
--- a/backend/format_node_disk
+++ b/backend/format_node_disk
@@ -1,23 +1,5 @@
 #!/bin/bash
 
-# Stop node
-systemctl stop node
-sleep 10
+screen -dmS disk /opt/apolloapi/backend/format_node_disk_c
 
-# Umount disk, remove existing partition
-umount /media/nvme
-parted /dev/nvme0n1 rm 1
-
-# Format disk
-parted /dev/nvme0n1 mklabel gpt -s
-parted -a opt /dev/nvme0n1 mkpart primary ext4 0% 100% -s
-mkfs.ext4 /dev/nvme0n1p1
-
-#configure node drive
-mount /dev/nvme0n1p1 /media/nvme
-tune2fs -m .1 /dev/nvme0n1p1
-mkdir /media/nvme/Bitcoin
-chown -R futurebit /media/nvme/Bitcoin/
-
-#Start node
-systemctl start node
\ No newline at end of file
+sleep 75
diff --git a/backend/format_node_disk_c b/backend/format_node_disk_c
new file mode 100755
index 0000000..4764716
--- /dev/null
+++ b/backend/format_node_disk_c
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Stop node + swap
+systemctl stop node
+swapoff /media/nvme/swapfile
+sleep 10
+
+# Umount disk, remove existing partition
+umount /media/nvme
+wipefs -af /dev/nvme0n1
+
+# Format disk
+parted /dev/nvme0n1 mklabel gpt -s
+parted -a opt /dev/nvme0n1 mkpart primary ext4 0% 100% -s
+mkfs.ext4 /dev/nvme0n1p1 -F
+
+#configure node drive
+mount /dev/nvme0n1p1 /media/nvme
+tune2fs -m .1 /dev/nvme0n1p1
+mkdir /media/nvme/Bitcoin
+chown -R futurebit /media/nvme/Bitcoin/
+
+#Start node + swap
+systemctl start swap
+systemctl start node
\ No newline at end of file
diff --git a/backend/install b/backend/install
index 9cf04fe..d0f3eb4 100755
--- a/backend/install
+++ b/backend/install
@@ -99,12 +99,14 @@ cp $APOLLO_DIR/backend/apollo-miner/bin/$arch/apollo-miner $APOLLO_DIR/backend/a
 echo -e "${YELLOW} ---> Installing systemd files${NC}"
 
 
-cp $APOLLO_DIR/backend/apollo-ui.service /etc/systemd/system/
-cp $APOLLO_DIR/backend/apollo-miner.service /etc/systemd/system/
-cp $APOLLO_DIR/backend/node.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/apollo-ui.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/apollo-miner.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/node.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/swap.service /etc/systemd/system/
 
 systemctl daemon-reload
 
+systemctl enable swap
 systemctl enable apollo-ui
 systemctl enable apollo-miner
 systemctl enable node
diff --git a/backend/apollo-miner.service b/backend/systemd/apollo-miner.service
similarity index 100%
rename from backend/apollo-miner.service
rename to backend/systemd/apollo-miner.service
diff --git a/backend/apollo-ui.service b/backend/systemd/apollo-ui.service
similarity index 100%
rename from backend/apollo-ui.service
rename to backend/systemd/apollo-ui.service
diff --git a/backend/node.service b/backend/systemd/node.service
similarity index 100%
rename from backend/node.service
rename to backend/systemd/node.service
diff --git a/backend/systemd/start_swap.sh b/backend/systemd/start_swap.sh
new file mode 100755
index 0000000..15084f8
--- /dev/null
+++ b/backend/systemd/start_swap.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+DEVICE=/dev/nvme0n1p1
+SWAPFILE=/media/nvme/swapfile
+
+if [ -b "$DEVICE"  ]; then
+	if [ ! -f "$SWAPFILE" ]; then
+		fallocate -l 2G $SWAPFILE
+		chmod 600 $SWAPFILE
+		mkswap $SWAPFILE
+	fi
+	swapon /media/nvme/swapfile
+else
+	exit 0
+fi
diff --git a/backend/systemd/swap.service b/backend/systemd/swap.service
new file mode 100644
index 0000000..b66ff4f
--- /dev/null
+++ b/backend/systemd/swap.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=swap
+After=multi-user.target rc-local.service
+
+[Service]
+Type=simple
+User=root
+#Start:
+ExecStart=/opt/apolloapi/backend/start_swap.sh
+WorkingDirectory=/media/nvme
+
+[Install]
+WantedBy=multi-user.target
diff --git a/backend/update_system b/backend/update_system
index 6068a94..861d47b 100755
--- a/backend/update_system
+++ b/backend/update_system
@@ -25,16 +25,25 @@ echo "90" > $TMPFILE
 ### SYSTEMD ###
 echo -e "${YELLOW} ---> Updating systemd files${NC}"
 
-cp $APOLLO_DIR/backend/apollo-ui.service /etc/systemd/system/
-cp $APOLLO_DIR/backend/apollo-miner.service /etc/systemd/system/
-cp $APOLLO_DIR/backend/node.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/apollo-ui.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/apollo-miner.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/node.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/swap.service /etc/systemd/system/
+cp $APOLLO_DIR/backend/systemd/start_swap.sh $APOLLO_DIR/backend/start_swap.sh
 
 echo -e "${YELLOW} ---> Reloading systemd${NC}"
 systemctl daemon-reload
 
-echo "100" > $TMPFILE
+
 
 echo -e "${YELLOW} ---> Restarting APP${NC}"
-systemctl restart apollo-ui
+systemctl enable swap
+systemctl start swap
 systemctl restart node
 systemctl restart apollo-miner
+
+#Restart UI after old version of UI finishes update progress
+( sleep 1 ; systemctl restart apollo-ui ) &
+
+echo "100" > $TMPFILE
+