diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index 4163da2e..bae1af56 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -52,6 +52,17 @@ MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
 MESH_INSTALL_SETUP=/root/.initial_mesh_setup
 MESH_AMNESIC=/root/.amnesic
 
+function create_ram_disk {
+	ramdisk_size_mb=$1
+	if [ ! -d /mnt/ramdisk ]; then
+		mkdir -p /mnt/ramdisk
+	fi
+	if ! grep -q "ramdisk" /etc/fstab; then
+		mount -t tmpfs -o size=${ramdisk_size_mb}m tmpfs /mnt/ramdisk
+		echo "tmpfs       /mnt/ramdisk tmpfs   nodev,nosuid,noexec,nodiratime,size=${ramdisk_size_mb}M   0 0" >> /etc/fstab
+	fi
+}
+
 function set_hostname {
 	DEFAULT_DOMAIN_NAME="$1"
 
@@ -543,7 +554,7 @@ function mesh_amnesic {
 		echo 'Type=oneshot' >> /etc/systemd/system/amnesic.service
 		echo 'RemainAfterExit=true' >> /etc/systemd/system/amnesic.service
 		echo 'ExecStart=/bin/true' >> /etc/systemd/system/amnesic.service
-		echo 'ExecStop=/usr/bin/amnesic' >> /etc/systemd/system/amnesic.service
+		echo "ExecStop=/usr/bin/amnesic $MY_USERNAME" >> /etc/systemd/system/amnesic.service
 		echo '' >> /etc/systemd/system/amnesic.service
 		echo '[Install]' >> /etc/systemd/system/amnesic.service
 		echo 'WantedBy=multi-user.target' >> /etc/systemd/system/amnesic.service
@@ -599,6 +610,7 @@ if [ -f $MESH_INSTALL_SETUP ]; then
 
 	echo $'Beginning mesh node setup' >> $INSTALL_LOG
 	enable_batman_daemon
+	create_ram_disk 1
 	change_avahi_name
 	regenerate_ssh_host_keys
 	configure_zeronet_blog