diff --git a/elements/overcloud-partition-uefi/block-device-default.yaml b/elements/overcloud-partition-uefi/block-device-default.yaml
index 3164fa236..4c03c814f 100644
--- a/elements/overcloud-partition-uefi/block-device-default.yaml
+++ b/elements/overcloud-partition-uefi/block-device-default.yaml
@@ -13,7 +13,7 @@
             mount_point: /boot/efi
             fstab:
               options: "defaults"
-              fsck-passno: 1
+              fsck-passno: 2
       - name: BSP
         type: 'EF02'
         size: 8MiB
@@ -86,7 +86,7 @@
         mount_point: /var/log
         fstab:
             options: "rw,relatime"
-            fsck-passno: 3
+            fsck-passno: 2
 - mkfs:
     name: fs_audit
     base: lv_audit
@@ -95,7 +95,7 @@
         mount_point: /var/log/audit
         fstab:
             options: "rw,relatime"
-            fsck-passno: 4
+            fsck-passno: 2
 - mkfs:
     name: fs_home
     base: lv_home
diff --git a/elements/overcloud-partition-uefi/post-install.d/98-enable-tmp-mount b/elements/overcloud-partition-uefi/post-install.d/98-enable-tmp-mount
new file mode 100755
index 000000000..f9c24eb34
--- /dev/null
+++ b/elements/overcloud-partition-uefi/post-install.d/98-enable-tmp-mount
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eux
+
+# Ensure tmp.mount isn't masked, which is done in cloud images
+# such as CentOS-Stream-GenericCloud-8
+systemctl unmask tmp.mount
+systemctl enable tmp.mount
\ No newline at end of file
diff --git a/elements/overcloud-partition/block-device-default.yaml b/elements/overcloud-partition/block-device-default.yaml
index a735e8372..0c55dac86 100644
--- a/elements/overcloud-partition/block-device-default.yaml
+++ b/elements/overcloud-partition/block-device-default.yaml
@@ -73,7 +73,7 @@
         mount_point: /var/log
         fstab:
             options: "rw,relatime"
-            fsck-passno: 3
+            fsck-passno: 2
 - mkfs:
     name: fs_audit
     base: lv_audit
@@ -82,7 +82,7 @@
         mount_point: /var/log/audit
         fstab:
             options: "rw,relatime"
-            fsck-passno: 4
+            fsck-passno: 2
 - mkfs:
     name: fs_home
     base: lv_home
diff --git a/elements/overcloud-partition/post-install.d/99-enable-tmp-mount b/elements/overcloud-partition/post-install.d/99-enable-tmp-mount
new file mode 100755
index 000000000..f9c24eb34
--- /dev/null
+++ b/elements/overcloud-partition/post-install.d/99-enable-tmp-mount
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -eux
+
+# Ensure tmp.mount isn't masked, which is done in cloud images
+# such as CentOS-Stream-GenericCloud-8
+systemctl unmask tmp.mount
+systemctl enable tmp.mount
\ No newline at end of file