diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fd5cd657..ee0aaeed1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,13 +31,14 @@ This file is used to list changes made in each version of the AWS ParallelCluste
 - Upgrade Intel MPI Library to 2021.12.1.8 (from 2021.9.0.43482).
 
 **BUG FIXES**
-- Fixed an issue that prevented cluster updates from including EFS filesystems with encryption in transit.
-- Fixed an issue that prevented slurmctld and slurmdbd services from restarting on head node reboot when
+- Fix an issue that prevented cluster updates from including EFS filesystems with encryption in transit.
+- Fix an issue that prevented slurmctld and slurmdbd services from restarting on head node reboot when
   EFS is used for shared internal data. 
 - On Ubuntu systems, remove default logrotate configuration for cloud-init log files that clashed with the
   configuration coming from Parallelcluster.
 - Removing `/etc/profile.d/pcluster.sh` so that it's not executed at every user login and 
   `cfn_bootstrap_virtualenv` is not added in PATH environment variable.
+- Fix image build failure with RHEL 8.10 or newer.
 
 3.9.3
 ------
diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_redhat8.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_redhat8.rb
index a33d92849..412d0014a 100644
--- a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_redhat8.rb
+++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_redhat8.rb
@@ -26,14 +26,16 @@
 action :setup do
   version = node['platform_version']
   log "Installing FSx for Lustre. Platform version: #{version}, kernel version: #{node['cluster']['kernel_release']}"
-  if version.to_f < 8.2
-    raise "FSx for Lustre is not supported in this RHEL version #{version}, supported versions are >= 8.2"
-  elsif version.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
-    # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
-    # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
-    raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of RHEL #{version}, please update the kernel version"
-  else
-    action_install_lustre
+  if version.length == 3 # If version is 8.10 or more, this block is skipped
+    if version.to_f < 8.2
+      raise "FSx for Lustre is not supported in this RHEL version #{version}, supported versions are >= 8.2"
+    elsif version.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
+      # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
+      # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
+      raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of RHEL #{version}, please update the kernel version"
+    else
+      action_install_lustre
+    end
   end
 end
 
diff --git a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb
index 7a723bf03..0c981f27d 100644
--- a/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb
+++ b/cookbooks/aws-parallelcluster-environment/resources/lustre/lustre_rocky8.rb
@@ -26,14 +26,16 @@
 action :setup do
   version = node['platform_version']
   log "Installing FSx for Lustre. Platform version: #{version}, kernel version: #{node['cluster']['kernel_release']}"
-  if version.to_f < 8.2
-    raise "FSx for Lustre is not supported in this Rocky Linux version #{version}, supported versions are >= 8.2"
-  elsif version.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
-    # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
-    # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
-    raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of Rocky Linux #{version}, please update the kernel version"
-  else
-    action_install_lustre
+  if version.length == 3 # If version is 8.10 or more, this block is skipped
+    if version.to_f < 8.2
+      raise "FSx for Lustre is not supported in this Rocky Linux version #{version}, supported versions are >= 8.2"
+    elsif version.to_f == 8.7 && (node['cluster']['kernel_release'].include?("4.18.0-425.3.1.el8") || node['cluster']['kernel_release'].include?("4.18.0-425.13.1.el8_7"))
+      # Rhel8.7 kernel 4.18.0-425.3.1.el8 and 4.18.0-425.13.1.el8_7 has broken kABI compat
+      # See https://access.redhat.com/solutions/6985596 and https://github.com/openzfs/zfs/issues/14724
+      raise "FSx for Lustre is not supported in kernel version #{node['cluster']['kernel_release']} of Rocky Linux #{version}, please update the kernel version"
+    else
+      action_install_lustre
+    end
   end
 end
 
diff --git a/kitchen.docker.yml b/kitchen.docker.yml
index f1808e2c4..62f36520a 100644
--- a/kitchen.docker.yml
+++ b/kitchen.docker.yml
@@ -70,7 +70,7 @@ platforms:
         kernel_release: '5.15.0-1028-aws'
   - name: rhel8
     driver:
-      image: <% if ENV['KITCHEN_RHEL8_IMAGE'] %> <%= ENV['KITCHEN_RHEL8_IMAGE'] %> <% else %> registry.access.redhat.com/ubi8/ubi:8.9 <% end %>
+      image: <% if ENV['KITCHEN_RHEL8_IMAGE'] %> <%= ENV['KITCHEN_RHEL8_IMAGE'] %> <% else %> registry.access.redhat.com/ubi8/ubi <% end %>
       intermediate_instructions:
         - RUN chmod +t /tmp
     attributes:
@@ -81,7 +81,7 @@ platforms:
         kernel_release: '4.18.0-477.13.1.el8_7.fake-value' # Use 477 version to match 8.8 kernel version available on docker
   - name: rocky8
     driver:
-      image: <% if ENV['KITCHEN_ROCKY8_IMAGE'] %> <%= ENV['KITCHEN_ROCKY8_IMAGE'] %> <% else %> dokken/rockylinux-8:sha-f885abd <% end %>
+      image: <% if ENV['KITCHEN_ROCKY8_IMAGE'] %> <%= ENV['KITCHEN_ROCKY8_IMAGE'] %> <% else %> dokken/rockylinux-8 <% end %>
     attributes:
       cluster:
         base_os: rocky8