diff --git a/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb b/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
index 3b89a6b5732dde0a397f51b75db18ca1a8dae17c..dab0fc80a2a7259b69cea24188efc09c8f6db1cd 100644
--- a/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
+++ b/Golden_Repo/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
@@ -12,11 +12,8 @@ toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
 
 source_urls = ['https://tukaani.org/xz/']
 sources = [SOURCELOWER_TAR_BZ2]
-patches = ['XZ-5.2.2_compat-libs.patch']
 checksums = [
     '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df',  # xz-5.2.5.tar.bz2
-    # XZ-5.2.2_compat-libs.patch
-    '578da3ea2ddb551972891a60fe31478b16a516d6ea8b6aa3af89e1d558adb703',
 ]
 
 builddependencies = [
diff --git a/Overlays/hdfml_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb b/Overlays/hdfml_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b89a6b5732dde0a397f51b75db18ca1a8dae17c
--- /dev/null
+++ b/Overlays/hdfml_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.5'
+
+homepage = 'https://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://tukaani.org/xz/']
+sources = [SOURCELOWER_TAR_BZ2]
+patches = ['XZ-5.2.2_compat-libs.patch']
+checksums = [
+    '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df',  # xz-5.2.5.tar.bz2
+    # XZ-5.2.2_compat-libs.patch
+    '578da3ea2ddb551972891a60fe31478b16a516d6ea8b6aa3af89e1d558adb703',
+]
+
+builddependencies = [
+    # use gettext built with system toolchain as build dep to avoid cyclic dependency (XZ -> gettext -> libxml2 -> XZ)
+    ('gettext', '0.21', '', SYSTEM),
+    ('binutils', '2.37'),
+]
+
+# may become useful in non-x86 archs
+# configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+    'files': ['bin/lzmainfo', 'bin/unxz', 'bin/xz'],
+    'dirs': []
+}
+
+sanity_check_commands = [
+    "xz --help",
+    "unxz --help",
+]
+
+moduleclass = 'tools'
diff --git a/Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb b/Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
new file mode 100644
index 0000000000000000000000000000000000000000..3b89a6b5732dde0a397f51b75db18ca1a8dae17c
--- /dev/null
+++ b/Overlays/jusuf_overlay/x/XZ/XZ-5.2.5-GCCcore-11.2.0.eb
@@ -0,0 +1,41 @@
+easyblock = 'ConfigureMake'
+
+name = 'XZ'
+version = '5.2.5'
+
+homepage = 'https://tukaani.org/xz/'
+description = "xz: XZ utilities"
+
+site_contacts = 'sc@fz-juelich.de'
+
+toolchain = {'name': 'GCCcore', 'version': '11.2.0'}
+
+source_urls = ['https://tukaani.org/xz/']
+sources = [SOURCELOWER_TAR_BZ2]
+patches = ['XZ-5.2.2_compat-libs.patch']
+checksums = [
+    '5117f930900b341493827d63aa910ff5e011e0b994197c3b71c08a20228a42df',  # xz-5.2.5.tar.bz2
+    # XZ-5.2.2_compat-libs.patch
+    '578da3ea2ddb551972891a60fe31478b16a516d6ea8b6aa3af89e1d558adb703',
+]
+
+builddependencies = [
+    # use gettext built with system toolchain as build dep to avoid cyclic dependency (XZ -> gettext -> libxml2 -> XZ)
+    ('gettext', '0.21', '', SYSTEM),
+    ('binutils', '2.37'),
+]
+
+# may become useful in non-x86 archs
+# configopts = ' --disable-assembler '
+
+sanity_check_paths = {
+    'files': ['bin/lzmainfo', 'bin/unxz', 'bin/xz'],
+    'dirs': []
+}
+
+sanity_check_commands = [
+    "xz --help",
+    "unxz --help",
+]
+
+moduleclass = 'tools'