diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 25f21ab..c62833f 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -9,18 +9,23 @@ server="$1"
   exit 1
 }
 
-[[ "$server" == "testnet" ]] && server="164.92.249.180"
-[[ "$server" == "staging" ]] && server="149.36.48.100"
+[[ "$server" == "testnet" ]] && server="root@prod-brain-1"
+[[ "$server" == "staging" ]] && server="root@staging-brain-1"
 
 cargo build --release --bin brain
 ssh $server systemctl stop detee-brain.service
 scp target/release/brain $server:/usr/local/bin/detee-brain
 ssh $server mkdir -p /etc/detee/brain/
 scp scripts/detee-brain.service $server:/etc/systemd/system/detee-brain.service
-scp surql/detee-brain-contracts.service $server:/etc/systemd/system/detee-brain-contracts.service
-scp surql/detee-brain-contracts.timer $server:/etc/systemd/system/detee-brain-contracts.timer
-scp surql/brain-timer.sh $server:/etc/detee/brain/brain-timer.sh
-scp surql/timer.sql $server:/etc/detee/brain/timer.surql
 ssh $server systemctl daemon-reload
 ssh $server systemctl start detee-brain.service
-ssh $server systemctl enable --now detee-brain-contracts.timer
+
+[[ "$2" == "--timer" ]] && {
+  scp surql/detee-brain-contracts.service $server:/etc/systemd/system/detee-brain-contracts.service
+  scp surql/detee-brain-contracts.timer $server:/etc/systemd/system/detee-brain-contracts.timer
+  scp surql/brain-timer.sh $server:/etc/detee/brain/brain-timer.sh
+  scp surql/timer.sql $server:/etc/detee/brain/timer.surql
+  ssh $server systemctl daemon-reload
+  ssh $server systemctl enable detee-brain-contracts.timer
+  ssh $server systemctl restart detee-brain-contracts.timer
+}
diff --git a/scripts/detee-brain.service b/scripts/detee-brain.service
index 2ba0028..9b8a5e8 100644
--- a/scripts/detee-brain.service
+++ b/scripts/detee-brain.service
@@ -1,11 +1,14 @@
 [Unit]
 Description=DeTEE Brain
 After=network.target
+Requires=surrealdb.service
+After=surrealdb.service
 
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/detee-brain
-Restart=always
+Restart=on-failure
+RestartSec=15s
 
 [Install]
 WantedBy=multi-user.target
diff --git a/surql/brain-timer.sh b/surql/brain-timer.sh
index 90d54a4..2a4e0f1 100755
--- a/surql/brain-timer.sh
+++ b/surql/brain-timer.sh
@@ -2,11 +2,8 @@
 
 source /etc/detee/brain/config.ini
 
-import="docker run -i --rm --net=host \
-  --volume "/etc/detee/brain/timer.surql:/timer.surql" \
-  surrealdb/surrealdb:latest import \
+surreal import \
   --endpoint "http://${DB_URL}" \
   --username $DB_USER --password "$DB_PASS" \
-  --namespace $DB_NAMESPACE --database $DB_NAME"
-
-$import timer.surql
+  --namespace $DB_NAMESPACE --database $DB_NAME \
+  /etc/detee/brain/timer.surql