diff --git a/build/initialization.sh b/build/initialization.sh
index c00c00442..873c1dcfc 100755
--- a/build/initialization.sh
+++ b/build/initialization.sh
@@ -97,7 +97,6 @@ touch /root/.docker/config.json
 docker run --privileged --rm tonistiigi/binfmt --install all
 docker network create -d bridge --subnet 172.18.0.1/16 start9 || true
 mkdir -p /etc/embassy
-hostnamectl set-hostname "embassy"
 systemctl enable embassyd.service embassy-init.service
 cat << EOF > /etc/tor/torrc
 SocksPort 0.0.0.0:9050
diff --git a/build/write-image.sh b/build/write-image.sh
index 1d1430dcf..ce27f5a42 100755
--- a/build/write-image.sh
+++ b/build/write-image.sh
@@ -53,6 +53,8 @@ sudo cp ENVIRONMENT.txt /tmp/eos-mnt/etc/embassy
 sudo cp GIT_HASH.txt /tmp/eos-mnt/etc/embassy
 sudo cp build/fstab /tmp/eos-mnt/etc/fstab
 sudo cp build/journald.conf /tmp/eos-mnt/etc/systemd/journald.conf
+sudo sed -i 's/raspberrypi/embassy/g' /tmp/eos-mnt/etc/hostname
+sudo sed -i 's/raspberrypi/embassy/g' /tmp/eos-mnt/etc/hosts
 
 # copy over cargo dependencies
 sudo cp cargo-deps/aarch64-unknown-linux-gnu/release/nc-broadcast /tmp/eos-mnt/usr/local/bin