diff --git a/easybuild/easyblocks/l/lammps.py b/easybuild/easyblocks/l/lammps.py
index 2769014eab0..02d5c478a29 100644
--- a/easybuild/easyblocks/l/lammps.py
+++ b/easybuild/easyblocks/l/lammps.py
@@ -34,6 +34,7 @@
 import os
 import re
 import tempfile
+import copy
 from easybuild.tools import LooseVersion
 
 import easybuild.tools.environment as env
@@ -41,7 +42,7 @@
 from easybuild.framework.easyconfig import CUSTOM, MANDATORY
 from easybuild.tools.build_log import EasyBuildError, print_warning, print_msg
 from easybuild.tools.config import build_option
-from easybuild.tools.filetools import copy_dir
+from easybuild.tools.filetools import copy_dir, mkdir
 from easybuild.tools.modules import get_software_root, get_software_version
 from easybuild.tools.run import run_cmd
 from easybuild.tools.systemtools import get_shared_lib_ext
@@ -53,7 +54,11 @@
     'SNB',  # Intel Sandy/Ivy Bridge CPU (AVX 1)
     'HSW',  # Intel Haswell CPU (AVX 2)
     'BDW',  # Intel Broadwell Xeon E-class CPU (AVX 2 + transactional mem)
+    'SKL',  # Intel Skylake Client CPU
     'SKX',  # Intel Sky Lake Xeon E-class HPC CPU (AVX512 + transactional mem)
+    'ICL',  # Intel Ice Lake Client CPU (AVX512)
+    'ICX',  # Intel Ice Lake Xeon Server CPU (AVX512)
+    'SPR',  # Intel Sapphire Rapids Xeon Server CPU (AVX512)
     'KNC',  # Intel Knights Corner Xeon Phi
     'KNL',  # Intel Knights Landing Xeon Phi
 ]
@@ -86,15 +91,21 @@
     'TURING75',  # NVIDIA Turing generation CC 7.5 GPU
     'AMPERE80',  # NVIDIA Ampere generation CC 8.0 GPU
     'AMPERE86',  # NVIDIA Ampere generation CC 8.6 GPU
+    'ADA89',  # NVIDIA Ada Lovelace generation CC 8.9 GPU
     'HOPPER90',  # NVIDIA Hopper generation CC 9.0 GPU
     'VEGA900',  # AMD GPU MI25 GFX900
     'VEGA906',  # AMD GPU MI50/MI60 GFX906
     'VEGA908',  # AMD GPU MI100 GFX908
+    'VEGA90A',  # AMD GPU MI200 GFX90A
+    'NAVI1030',  # AMD GPU MI200 GFX90A
+    'NAVI1100',  # AMD GPU RX7900XTX
     'INTEL_GEN',  # Intel GPUs Gen9+
+    'INTEL_DG1',  # Intel Iris XeMAX GPU
     'INTEL_GEN9',  # Intel GPU Gen9
     'INTEL_GEN11',  # Intel GPU Gen11
     'INTEL_GEN12LP',  # Intel GPU Gen12LP
     'INTEL_XEHP',  # Intel GPUs Xe-HP
+    'INTEL_PVC',  # Intel GPU Ponte Vecchio
 ] + INTEL_PACKAGE_ARCH_LIST
 
 KOKKOS_LEGACY_ARCH_MAPPING = {
@@ -146,8 +157,8 @@
 def translate_lammps_version(version):
     """Translate the LAMMPS version into something that can be used in a comparison"""
     items = [x for x in re.split('(\\d+)', version) if x]
-    if len(items) != 3:
-        raise ValueError("Version %s does not have 3 elements" % version)
+    if len(items) < 3:
+        raise ValueError("Version %s does not have (at least) 3 elements" % version)
     month_map = {
        "JAN": '01',
        "FEB": '02',
@@ -198,6 +209,9 @@ def __init__(self, *args, **kwargs):
             for cc in KOKKOS_GPU_ARCH_TABLE.keys():
                 KOKKOS_GPU_ARCH_TABLE[cc] = KOKKOS_GPU_ARCH_TABLE[cc].lower().title()
 
+        self.kokkos_cpu_mapping = copy.deepcopy(KOKKOS_CPU_MAPPING)
+        self.update_kokkos_cpu_mapping()
+
     @staticmethod
     def extra_options(**kwargs):
         """Custom easyconfig parameters for LAMMPS"""
@@ -211,6 +225,15 @@ def extra_options(**kwargs):
         extra_vars['separate_build_dir'][0] = True
         return extra_vars
 
+    def update_kokkos_cpu_mapping(self):
+
+        if LooseVersion(self.cur_version) >= LooseVersion(translate_lammps_version('31Mar2017')):
+            self.kokkos_cpu_mapping['neoverse_n1'] = 'ARMV81'
+            self.kokkos_cpu_mapping['neoverse_v1'] = 'ARMV81'
+
+        if LooseVersion(self.cur_version) >= LooseVersion(translate_lammps_version('21sep2021')):
+            self.kokkos_cpu_mapping['a64fx'] = 'A64FX'
+
     def prepare_step(self, *args, **kwargs):
         """Custom prepare step for LAMMPS."""
         super(EB_LAMMPS, self).prepare_step(*args, **kwargs)
@@ -278,6 +301,11 @@ def configure_step(self, **kwargs):
                 else:
                     self.cfg.update('configopts', with_opt + 'no')
 
+        if get_software_root('MDI'):
+            # Disable auto-downloading/building MDI dependency:
+            if '-DDOWNLOAD_MDI_DEFAULT=' not in self.cfg['configopts']:
+                self.cfg.update('configopts', '-DDOWNLOAD_MDI_DEFAULT=OFF')
+
         # Disable auto-downloading/building Eigen dependency:
         if '-DDOWNLOAD_EIGEN3=' not in self.cfg['configopts']:
             self.cfg.update('configopts', '-DDOWNLOAD_EIGEN3=no')
@@ -308,7 +336,10 @@ def configure_step(self, **kwargs):
             self.cfg.update('configopts', pkg_opt + 'on')
 
         # grab the architecture so we can check if we have Intel hardware (also used for Kokkos below)
-        processor_arch, gpu_arch = get_kokkos_arch(cuda_cc, self.cfg['kokkos_arch'], cuda=self.cuda)
+        processor_arch, gpu_arch = get_kokkos_arch(self.kokkos_cpu_mapping,
+                                                   cuda_cc,
+                                                   self.cfg['kokkos_arch'],
+                                                   cuda=self.cuda)
         # arch names changed between some releases :(
         if LooseVersion(self.cur_version) < LooseVersion(self.ref_version):
             if processor_arch in KOKKOS_LEGACY_ARCH_MAPPING.keys():
@@ -428,6 +459,32 @@ def install_step(self):
         copy_dir(examples_dir, os.path.join(self.installdir, 'examples'), symlinks=True)
         potentials_dir = os.path.join(self.start_dir, 'potentials')
         copy_dir(potentials_dir, os.path.join(self.installdir, 'potentials'))
+        if LooseVersion(self.cur_version) >= LooseVersion(translate_lammps_version('2Aug2023')):
+            # From ver 2Aug2023:
+            # "make install in a CMake based installation will no longer install
+            # the LAMMPS python module. make install-python can be used for that"
+            # https://github.com/lammps/lammps/releases/tag/stable_2Aug2023
+            pyshortver = '.'.join(get_software_version('Python').split('.')[:2])
+            site_packages = os.path.join(self.installdir, 'lib', 'python%s' % pyshortver, 'site-packages')
+
+            mkdir(site_packages, parents=True)
+
+            self.lammpsdir = os.path.join(self.builddir, '%s-stable_%s' % (self.name.lower(), self.version))
+            self.python_dir = os.path.join(self.lammpsdir, 'python')
+
+            # The -i flag is added through a patch to the lammps source file python/install.py
+            # This patch is necessary because the current lammps only allows
+            # the lammps python package to be installed system-wide or in user site-packages
+            cmd = 'python %(python_dir)s/install.py -p %(python_dir)s/lammps \
+                   -l %(builddir)s/easybuild_obj/liblammps.so \
+                   -v %(lammpsdir)s/src/version.h -w %(builddir)s/easybuild_obj -i %(site_packages)s' % {
+                'python_dir': self.python_dir,
+                'builddir': self.builddir,
+                'lammpsdir': self.lammpsdir,
+                'site_packages': site_packages,
+            }
+
+            run_cmd(cmd, log_all=True, simple=False)
 
     def sanity_check_step(self, *args, **kwargs):
         """Run custom sanity checks for LAMMPS files, dirs and commands."""
@@ -443,13 +500,19 @@ def sanity_check_step(self, *args, **kwargs):
 
         custom_commands = [
             # LAMMPS test - you need to call specific test file on path
-            """python -c 'from lammps import lammps; l=lammps(); l.file("%s")'""" %
+            'from lammps import lammps; l=lammps(); l.file("%s")' %
             # Examples are part of the install with paths like (installdir)/examples/filename/in.filename
             os.path.join(self.installdir, "examples", "%s" % check_file, "in.%s" % check_file)
             # And this should be done for every file specified above
             for check_file in check_files
         ]
 
+        # mpirun command needs an l.finalize() in the sanity check from LAMMPS 29Sep2021
+        if LooseVersion(self.cur_version) >= LooseVersion(translate_lammps_version('29Sep2021')):
+            custom_commands = [cmd + '; l.finalize()' for cmd in custom_commands]
+
+        custom_commands = ["""python -c '%s'""" % cmd for cmd in custom_commands]
+
         # Execute sanity check commands within an initialized MPI in MPI enabled toolchains
         if self.toolchain.options.get('usempi', None):
             custom_commands = [self.toolchain.mpi_cmd_for(cmd, 1) for cmd in custom_commands]
@@ -500,11 +563,11 @@ def get_cuda_gpu_arch(cuda_cc):
     return 'sm_%s' % str(sorted(cuda_cc, reverse=True)[0]).replace(".", "")
 
 
-def get_kokkos_arch(cuda_cc, kokkos_arch, cuda=None):
+def get_kokkos_arch(kokkos_cpu_mapping, cuda_cc, kokkos_arch, cuda=None):
     """
     Return KOKKOS ARCH in LAMMPS required format, which is 'CPU_ARCH' and 'GPU_ARCH'.
 
-    see: https://lammps.sandia.gov/doc/Build_extras.html#kokkos
+    see: https://docs.lammps.org/Build_extras.html#kokkos
     """
     if cuda is None or not isinstance(cuda, bool):
         cuda = get_software_root('CUDA')
@@ -523,7 +586,7 @@ def get_kokkos_arch(cuda_cc, kokkos_arch, cuda=None):
         warning_msg = "kokkos_arch not set. Trying to auto-detect CPU arch."
         print_warning(warning_msg)
 
-        processor_arch = KOKKOS_CPU_MAPPING.get(get_cpu_arch())
+        processor_arch = kokkos_cpu_mapping.get(get_cpu_arch())
 
         if not processor_arch:
             error_msg = "Couldn't determine CPU architecture, you need to set 'kokkos_arch' manually."