diff --git a/deploy-initial b/deploy-initial
index b00f92e..5ddf6de 100755
--- a/deploy-initial
+++ b/deploy-initial
@@ -63,6 +63,8 @@ ssh $remote "arch-chroot /mnt groupadd -g 2000 io_uring"
 
 ssh $remote "umask 077 && dd if=/dev/random of=/mnt/swapfile bs=1M count=$swap status=progress"
 
+ssh $remote "arch-chroot chsh -s /usr/bin/fish"
+
 password=$(head -c32 <(tr -dc A-Za-z0-9 </dev/random))
 echo password: $password
 ssh $remote "echo root:$password | arch-chroot /mnt chpasswd"
diff --git a/packages/0.grapheneos.network b/packages/0.grapheneos.network
index df73d0f..e19bdb5 100644
--- a/packages/0.grapheneos.network
+++ b/packages/0.grapheneos.network
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/0.grapheneos.org b/packages/0.grapheneos.org
index 2379e64..fd3fd11 100644
--- a/packages/0.grapheneos.org
+++ b/packages/0.grapheneos.org
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/0.ns2.grapheneos.org b/packages/0.ns2.grapheneos.org
index f475422..9775096 100644
--- a/packages/0.ns2.grapheneos.org
+++ b/packages/0.ns2.grapheneos.org
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 geoip
 geoipupdate
 grub
diff --git a/packages/0.releases.grapheneos.org b/packages/0.releases.grapheneos.org
index 2379e64..fd3fd11 100644
--- a/packages/0.releases.grapheneos.org
+++ b/packages/0.releases.grapheneos.org
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/1.grapheneos.network b/packages/1.grapheneos.network
index dca5a10..b55e0c8 100644
--- a/packages/1.grapheneos.network
+++ b/packages/1.grapheneos.network
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/1.grapheneos.org b/packages/1.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/1.grapheneos.org
+++ b/packages/1.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/1.ns2.grapheneos.org b/packages/1.ns2.grapheneos.org
index d5a77d9..a7c1519 100644
--- a/packages/1.ns2.grapheneos.org
+++ b/packages/1.ns2.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 geoip
 geoipupdate
 grub
diff --git a/packages/1.releases.grapheneos.org b/packages/1.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/1.releases.grapheneos.org
+++ b/packages/1.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/2.grapheneos.network b/packages/2.grapheneos.network
index dca5a10..b55e0c8 100644
--- a/packages/2.grapheneos.network
+++ b/packages/2.grapheneos.network
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/2.grapheneos.org b/packages/2.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/2.grapheneos.org
+++ b/packages/2.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/2.ns2.grapheneos.org b/packages/2.ns2.grapheneos.org
index d5a77d9..a7c1519 100644
--- a/packages/2.ns2.grapheneos.org
+++ b/packages/2.ns2.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 geoip
 geoipupdate
 grub
diff --git a/packages/2.releases.grapheneos.org b/packages/2.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/2.releases.grapheneos.org
+++ b/packages/2.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/3.grapheneos.network b/packages/3.grapheneos.network
index dca5a10..b55e0c8 100644
--- a/packages/3.grapheneos.network
+++ b/packages/3.grapheneos.network
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/3.grapheneos.org b/packages/3.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/3.grapheneos.org
+++ b/packages/3.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/3.releases.grapheneos.org b/packages/3.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/3.releases.grapheneos.org
+++ b/packages/3.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/4.releases.grapheneos.org b/packages/4.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/4.releases.grapheneos.org
+++ b/packages/4.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/5.releases.grapheneos.org b/packages/5.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/5.releases.grapheneos.org
+++ b/packages/5.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/6.releases.grapheneos.org b/packages/6.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/6.releases.grapheneos.org
+++ b/packages/6.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/7.releases.grapheneos.org b/packages/7.releases.grapheneos.org
index 3a8a2cc..515f2c1 100644
--- a/packages/7.releases.grapheneos.org
+++ b/packages/7.releases.grapheneos.org
@@ -3,6 +3,7 @@ bash-completion
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/attestation.app b/packages/attestation.app
index b2ab140..e6a3cf0 100644
--- a/packages/attestation.app
+++ b/packages/attestation.app
@@ -5,6 +5,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/discuss.grapheneos.org b/packages/discuss.grapheneos.org
index f047f72..f76be1a 100644
--- a/packages/discuss.grapheneos.org
+++ b/packages/discuss.grapheneos.org
@@ -7,6 +7,7 @@ chrony
 cloud-guest-utils
 composer
 conntrack-tools
+fish
 geoipupdate
 grub
 htop
diff --git a/packages/grapheneos.social b/packages/grapheneos.social
index b303d57..6d92685 100644
--- a/packages/grapheneos.social
+++ b/packages/grapheneos.social
@@ -5,6 +5,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 imagemagick
diff --git a/packages/mail.grapheneos.org b/packages/mail.grapheneos.org
index 3fd425e..a52a0a1 100644
--- a/packages/mail.grapheneos.org
+++ b/packages/mail.grapheneos.org
@@ -6,6 +6,7 @@ chrony
 cloud-guest-utils
 conntrack-tools
 dovecot
+fish
 grub
 htop
 ioping
diff --git a/packages/matrix.grapheneos.org b/packages/matrix.grapheneos.org
index 324b27a..e96c2b8 100644
--- a/packages/matrix.grapheneos.org
+++ b/packages/matrix.grapheneos.org
@@ -5,6 +5,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 git
 grub
 htop
diff --git a/packages/ns1.grapheneos.org b/packages/ns1.grapheneos.org
index f475422..9775096 100644
--- a/packages/ns1.grapheneos.org
+++ b/packages/ns1.grapheneos.org
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 geoip
 geoipupdate
 grub
diff --git a/packages/ns1.staging.grapheneos.org b/packages/ns1.staging.grapheneos.org
index f475422..9775096 100644
--- a/packages/ns1.staging.grapheneos.org
+++ b/packages/ns1.staging.grapheneos.org
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 geoip
 geoipupdate
 grub
diff --git a/packages/staging.attestation.app b/packages/staging.attestation.app
index b2ab140..e6a3cf0 100644
--- a/packages/staging.attestation.app
+++ b/packages/staging.attestation.app
@@ -5,6 +5,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping
diff --git a/packages/staging.grapheneos.org b/packages/staging.grapheneos.org
index 2379e64..fd3fd11 100644
--- a/packages/staging.grapheneos.org
+++ b/packages/staging.grapheneos.org
@@ -4,6 +4,7 @@ certbot
 chrony
 cloud-guest-utils
 conntrack-tools
+fish
 grub
 htop
 ioping