diff --git a/packages/sysutils/systemd/system.d/getty@tty0.service b/packages/sysutils/systemd/system.d/getty@tty0.service
index 68226b1c2b..3a91930297 100644
--- a/packages/sysutils/systemd/system.d/getty@tty0.service
+++ b/packages/sysutils/systemd/system.d/getty@tty0.service
@@ -8,8 +8,7 @@ ConditionPathExists=/dev/tty0
 [Service]
 ExecStart=-/sbin/agetty -o '-p -- \\u' --noissue --noclear --nohostname - $TERM
 Type=idle
-Restart=always
-RestartSec=0
+Restart=no
 UtmpIdentifier=%I
 StandardInput=tty
 StandardOutput=tty
diff --git a/projects/ArchR/devices/RK3326/linux/linux.aarch64.conf b/projects/ArchR/devices/RK3326/linux/linux.aarch64.conf
index 70f7ff1173..0c2b571432 100644
--- a/projects/ArchR/devices/RK3326/linux/linux.aarch64.conf
+++ b/projects/ArchR/devices/RK3326/linux/linux.aarch64.conf
@@ -105,10 +105,10 @@ CONFIG_BPF_UNPRIV_DEFAULT_OFF=y
 # CONFIG_BPF_PRELOAD is not set
 # end of BPF subsystem
 
-CONFIG_PREEMPT_VOLUNTARY_BUILD=y
+CONFIG_PREEMPT_BUILD=y
 # CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
 # CONFIG_PREEMPT_RT is not set
 # CONFIG_PREEMPT_DYNAMIC is not set
 
@@ -550,10 +550,10 @@ CONFIG_PM_SLEEP_SMP=y
 # CONFIG_PM_USERSPACE_AUTOSLEEP is not set
 # CONFIG_PM_WAKELOCKS is not set
 CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_PM_ADVANCED_DEBUG is not set
 # CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_PM_SLEEP_DEBUG is not set
 # CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_CLK=y
 CONFIG_PM_GENERIC_DOMAINS=y
@@ -1590,7 +1590,7 @@ CONFIG_WANT_DEV_COREDUMP=y
 CONFIG_ALLOW_DEV_COREDUMP=y
 CONFIG_DEV_COREDUMP=y
 # CONFIG_DEBUG_DRIVER is not set
-CONFIG_DEBUG_DEVRES=y
+# CONFIG_DEBUG_DEVRES is not set
 # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 CONFIG_GENERIC_CPU_DEVICES=y
@@ -5090,8 +5090,8 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 # end of Generic IOMMU Pagetable Support
 
 # CONFIG_IOMMU_DEBUGFS is not set
-CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
-# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
+# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set
+CONFIG_IOMMU_DEFAULT_DMA_LAZY=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_OF_IOMMU=y
 CONFIG_IOMMU_DMA=y
@@ -6695,7 +6695,7 @@ CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y
 #
 # printk and dmesg options
 #
-CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_TIME is not set
 # CONFIG_PRINTK_CALLER is not set
 # CONFIG_STACKTRACE_BUILD_ID is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
@@ -6708,7 +6708,7 @@ CONFIG_SYMBOLIC_ERRNAME=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # end of printk and dmesg options
 
-CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_KERNEL is not set
 CONFIG_DEBUG_MISC=y
 
 #
@@ -6739,8 +6739,8 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE=""
-CONFIG_DEBUG_FS=y
-CONFIG_DEBUG_FS_ALLOW_ALL=y
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_FS_ALLOW_ALL is not set
 # CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set
 # CONFIG_DEBUG_FS_ALLOW_NONE is not set
 CONFIG_HAVE_ARCH_KGDB=y
@@ -6786,7 +6786,7 @@ CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y
 # CONFIG_DEBUG_VM_PGTABLE is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
-CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 # CONFIG_MEM_ALLOC_PROFILING is not set
 CONFIG_HAVE_ARCH_KASAN=y
diff --git a/projects/ArchR/packages/archr/system.d/archr-report-stats.timer b/projects/ArchR/packages/archr/system.d/archr-report-stats.timer
index b99a16d0de..b5fb640adf 100644
--- a/projects/ArchR/packages/archr/system.d/archr-report-stats.timer
+++ b/projects/ArchR/packages/archr/system.d/archr-report-stats.timer
@@ -1,5 +1,6 @@
 [Unit]
 Description=Timer to report anonymous ArchR install statistics
+ConditionPathExists=/storage/.cache/services/stats.enabled
 
 [Timer]
 OnBootSec=5min
diff --git a/projects/ArchR/packages/sysutils/busybox/scripts/init b/projects/ArchR/packages/sysutils/busybox/scripts/init
index 19277134db..7a229424b3 100755
--- a/projects/ArchR/packages/sysutils/busybox/scripts/init
+++ b/projects/ArchR/packages/sysutils/busybox/scripts/init
@@ -26,7 +26,7 @@
 /usr/bin/busybox mount -t proc proc /proc
 /usr/bin/busybox mount -t sysfs sysfs /sys
 # /run options have to match what systemd uses by default
-/usr/bin/busybox mount -t tmpfs -o mode=755,size=20%,nr_inodes=800k,nosuid,nodev,strictatime tmpfs /run
+/usr/bin/busybox mount -t tmpfs -o mode=755,size=20%,nr_inodes=800k,nosuid,nodev,noatime tmpfs /run
 
 # Populate /dev with block device nodes (mdev) and wait for MMC
 echo /usr/bin/busybox > /proc/sys/kernel/hotplug 2>/dev/null
diff --git a/projects/ArchR/packages/sysutils/busybox/system.d/shell.service b/projects/ArchR/packages/sysutils/busybox/system.d/shell.service
index 8508cd75b4..460a43e221 100644
--- a/projects/ArchR/packages/sysutils/busybox/system.d/shell.service
+++ b/projects/ArchR/packages/sysutils/busybox/system.d/shell.service
@@ -9,8 +9,8 @@ WorkingDirectory=/storage
 ExecStartPre=/bin/sh -c 'echo -en "\033[?25h"'
 ExecStart=/bin/sh -c 'clear; lsb_release; . /etc/profile; exec /bin/sh'
 
-Restart=always
-RestartSec=0
+Restart=on-failure
+RestartSec=5
 StandardInput=tty
 TTYPath=/dev/tty1
 TTYReset=yes
diff --git a/projects/ArchR/packages/sysutils/powerstate/system.d/powerstate.service b/projects/ArchR/packages/sysutils/powerstate/system.d/powerstate.service
index 4ae2ca26bf..1f67889fa8 100644
--- a/projects/ArchR/packages/sysutils/powerstate/system.d/powerstate.service
+++ b/projects/ArchR/packages/sysutils/powerstate/system.d/powerstate.service
@@ -8,8 +8,8 @@ StartLimitIntervalSec=0
 Environment=HOME=/storage
 EnvironmentFile=/etc/profile
 ExecStart=/usr/bin/powerstate
-Restart=always
-RestartSec=1
+Restart=on-failure
+RestartSec=10
 
 [Install]
 WantedBy=multi-user.target
diff --git a/projects/ArchR/packages/sysutils/systemd/config/sysctl.d/archr.conf b/projects/ArchR/packages/sysutils/systemd/config/sysctl.d/archr.conf
index 6c0b662389..ff83989657 100644
--- a/projects/ArchR/packages/sysutils/systemd/config/sysctl.d/archr.conf
+++ b/projects/ArchR/packages/sysutils/systemd/config/sysctl.d/archr.conf
@@ -2,3 +2,6 @@ vm.swappiness=1
 kernel.nmi_watchdog=0
 vm.laptop_mode=5
 vm.dirty_writeback_centisecs=1500
+vm.vfs_cache_pressure=200
+vm.dirty_ratio=5
+vm.dirty_background_ratio=2
diff --git a/projects/ArchR/packages/ui/emulationstation/system.d/emustation.service b/projects/ArchR/packages/ui/emulationstation/system.d/emustation.service
index d6f85239f5..8d58161744 100644
--- a/projects/ArchR/packages/ui/emulationstation/system.d/emustation.service
+++ b/projects/ArchR/packages/ui/emulationstation/system.d/emustation.service
@@ -13,9 +13,10 @@ ExecStartPre=/usr/bin/es_settings
 ExecStart=/usr/bin/emulationstation --log-path /var/log --no-splash
 KillMode=process
 TimeoutStopSec=3
-Restart=always
-RestartSec=2
-StartLimitInterval=0
+Restart=on-failure
+RestartSec=5
+StartLimitIntervalSec=60
+StartLimitBurst=3
 
 [Install]
 WantedBy=archr.target
diff --git a/projects/ArchR/packages/ui/emulationstation/system.d/essway.service b/projects/ArchR/packages/ui/emulationstation/system.d/essway.service
index e51c7f97c7..a81a2c6f23 100644
--- a/projects/ArchR/packages/ui/emulationstation/system.d/essway.service
+++ b/projects/ArchR/packages/ui/emulationstation/system.d/essway.service
@@ -12,8 +12,10 @@ Environment=HOME=/storage
 EnvironmentFile=/etc/profile
 ExecStart=/usr/bin/start_es.sh
 WorkingDirectory=/storage
-Restart=always
-RestartSec=2
+Restart=on-failure
+RestartSec=5
+StartLimitIntervalSec=60
+StartLimitBurst=3
 
 [Install]
 WantedBy=archr.target
\ No newline at end of file