diff --git a/Makefile b/Makefile
index 2ee02c62..90f65af9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PACKER_VERSION := 1.10.0
+PACKER_VERSION := 1.10.1
 PWN_HOSTNAME := pwnagotchi
 PWN_VERSION := $(shell cut -d"'" -f2 < pwnagotchi/_version.py)
 
diff --git a/builder/data/etc/systemd/system/pwnagotchi.service b/builder/data/etc/systemd/system/pwnagotchi.service
index b48f7dfe..2810e3f5 100644
--- a/builder/data/etc/systemd/system/pwnagotchi.service
+++ b/builder/data/etc/systemd/system/pwnagotchi.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=pwnagotchi Deep Reinforcement Learning instrumenting bettercap for WiFI pwning.
-Documentation=https://pwnagotchi.ai
+Documentation=https://pwnagotchi.org
 Wants=network.target
 After=pwngrid-peer.service
 
@@ -8,6 +8,7 @@ After=pwngrid-peer.service
 Type=simple
 WorkingDirectory=~
 ExecStart=/usr/bin/pwnagotchi-launcher
+ExecStopPost=/usr/bin/bash -c "if egrep -qi  'personality.clear_on_exit[ =]*true' /etc/pwnagotchi/config.toml ; then /usr/local/bin/pwnagotchi --clear; fi"
 Restart=always
 RestartSec=30
 TasksMax=infinity
diff --git a/pwnagotchi/defaults.toml b/pwnagotchi/defaults.toml
index b175fff1..b6f2eaa8 100644
--- a/pwnagotchi/defaults.toml
+++ b/pwnagotchi/defaults.toml
@@ -156,6 +156,8 @@ personality.bond_encounters_factor = 20000
 personality.throttle_a = 0.4
 personality.throttle_d = 0.9
 
+personality.clear_on_exit = true # clear display when shutting down cleanly
+
 ui.fps = 0.0
 ui.font.name = "DejaVuSansMono" # for japanese: fonts-japanese-gothic
 ui.font.size_offset = 0 # will be added to the font size