diff --git a/deploy/setup b/deploy/setup
index b32ac5d891..0ef2216abe 100755
--- a/deploy/setup
+++ b/deploy/setup
@@ -10,6 +10,8 @@ BRANCH=$3
 COMMIT=$4
 REVISION="ord-$BRANCH-$COMMIT"
 
+export DEBIAN_FRONTEND=noninteractive
+
 touch ~/.hushlogin
 
 hostnamectl set-hostname $DOMAIN
@@ -25,6 +27,8 @@ apt-get install --yes \
   ufw \
   vim
 
+apt-get remove --yes --auto-remove
+
 ufw default allow outgoing
 ufw default deny incoming
 
diff --git a/justfile b/justfile
index ddd55b2d7a..28d95d2efc 100644
--- a/justfile
+++ b/justfile
@@ -18,7 +18,9 @@ clippy:
   cargo clippy --all --all-targets -- --deny warnings
 
 deploy branch remote chain domain:
-  ssh root@{{domain}} 'mkdir -p deploy \
+  ssh root@{{domain}} '\
+    export DEBIAN_FRONTEND=noninteractive \
+    && mkdir -p deploy \
     && apt-get update --yes \
     && apt-get upgrade --yes \
     && apt-get install --yes git rsync'