diff --git a/stage0/00-configure-apt/files/oxmc.sources b/stage0/00-configure-apt/files/oxmc.sources
index 95ae782..a80d918 100644
--- a/stage0/00-configure-apt/files/oxmc.sources
+++ b/stage0/00-configure-apt/files/oxmc.sources
@@ -2,4 +2,4 @@ Types: deb
 URIs: https://cdn.oxmc.me/apt
 Suites: RELEASE
 Components: main
-Signed-By: /usr/share/keyrings/oxmc.gpg
\ No newline at end of file
+Signed-By: /usr/share/keyrings/oxmc.pgp
\ No newline at end of file
diff --git a/stage1/01-sys-tweaks/00-run.sh b/stage1/01-sys-tweaks/00-run.sh
index a2354ae..711eb48 100755
--- a/stage1/01-sys-tweaks/00-run.sh
+++ b/stage1/01-sys-tweaks/00-run.sh
@@ -1,8 +1,13 @@
 #!/bin/bash -e
 
-install -v -m 644 files/fstab "${ROOTFS_DIR}/etc/fstab"
 install -m 755 files/system-readonly "${ROOTFS_DIR}/sbin/"
 
+if [ "${ARCH}" = "amd64" ]; then
+	install -m 644 files/fstab-amd64 "${ROOTFS_DIR}/etc/fstab"
+elif [ "${ARCH}" = "arm64" ]; then
+	install -m 644 files/fstab-rpi "${ROOTFS_DIR}/etc/fstab"
+fi
+
 on_chroot << EOF
 # Create a system user
 useradd -r -M -d / system
diff --git a/stage1/01-sys-tweaks/files/fstab-amd64 b/stage1/01-sys-tweaks/files/fstab-amd64
new file mode 100644
index 0000000..19b08f7
--- /dev/null
+++ b/stage1/01-sys-tweaks/files/fstab-amd64
@@ -0,0 +1,4 @@
+proc            /proc           proc    defaults          0       0
+BOOTDEV         /boot           vfat    defaults          0       2
+EFIDEV          /boot/efi       vfat    defaults          0       2
+ROOTDEV         /               ext4    defaults,noatime  0       1
diff --git a/stage1/01-sys-tweaks/files/fstab b/stage1/01-sys-tweaks/files/fstab-rpi
similarity index 100%
rename from stage1/01-sys-tweaks/files/fstab
rename to stage1/01-sys-tweaks/files/fstab-rpi