diff --git a/mock-core-configs/etc/mock/opensuse-leap-15.4-aarch64.cfg b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-aarch64.cfg
similarity index 74%
rename from mock-core-configs/etc/mock/opensuse-leap-15.4-aarch64.cfg
rename to mock-core-configs/etc/mock/eol/opensuse-leap-15.4-aarch64.cfg
index 447ce8e7d..e1065f1dd 100644
--- a/mock-core-configs/etc/mock/opensuse-leap-15.4-aarch64.cfg
+++ b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-aarch64.cfg
@@ -1,4 +1,4 @@
-include('templates/opensuse-leap-15.4.tpl')
+include('eol/templates/opensuse-leap-15.4.tpl')
 
 config_opts['root'] = 'opensuse-leap-15.4-aarch64'
 config_opts['target_arch'] = 'aarch64'
diff --git a/mock-core-configs/etc/mock/opensuse-leap-15.4-ppc64le.cfg b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-ppc64le.cfg
similarity index 74%
rename from mock-core-configs/etc/mock/opensuse-leap-15.4-ppc64le.cfg
rename to mock-core-configs/etc/mock/eol/opensuse-leap-15.4-ppc64le.cfg
index 41f7f0cdd..355f00f3f 100644
--- a/mock-core-configs/etc/mock/opensuse-leap-15.4-ppc64le.cfg
+++ b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-ppc64le.cfg
@@ -1,4 +1,4 @@
-include('templates/opensuse-leap-15.4.tpl')
+include('eol/templates/opensuse-leap-15.4.tpl')
 
 config_opts['root'] = 'opensuse-leap-15.4-ppc64le'
 config_opts['target_arch'] = 'ppc64le'
diff --git a/mock-core-configs/etc/mock/opensuse-leap-15.4-s390x.cfg b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-s390x.cfg
similarity index 73%
rename from mock-core-configs/etc/mock/opensuse-leap-15.4-s390x.cfg
rename to mock-core-configs/etc/mock/eol/opensuse-leap-15.4-s390x.cfg
index b8bc3e7f5..cab29195a 100644
--- a/mock-core-configs/etc/mock/opensuse-leap-15.4-s390x.cfg
+++ b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-s390x.cfg
@@ -1,4 +1,4 @@
-include('templates/opensuse-leap-15.4.tpl')
+include('eol/templates/opensuse-leap-15.4.tpl')
 
 config_opts['root'] = 'opensuse-leap-15.4-s390x'
 config_opts['target_arch'] = 's390x'
diff --git a/mock-core-configs/etc/mock/opensuse-leap-15.4-x86_64.cfg b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-x86_64.cfg
similarity index 73%
rename from mock-core-configs/etc/mock/opensuse-leap-15.4-x86_64.cfg
rename to mock-core-configs/etc/mock/eol/opensuse-leap-15.4-x86_64.cfg
index 26550776a..1a25567f4 100644
--- a/mock-core-configs/etc/mock/opensuse-leap-15.4-x86_64.cfg
+++ b/mock-core-configs/etc/mock/eol/opensuse-leap-15.4-x86_64.cfg
@@ -1,4 +1,4 @@
-include('templates/opensuse-leap-15.4.tpl')
+include('eol/templates/opensuse-leap-15.4.tpl')
 
 config_opts['root'] = 'opensuse-leap-15.4-x86_64'
 config_opts['target_arch'] = 'x86_64'
diff --git a/mock-core-configs/etc/mock/templates/opensuse-leap-15.4.tpl b/mock-core-configs/etc/mock/eol/templates/opensuse-leap-15.4.tpl
similarity index 100%
rename from mock-core-configs/etc/mock/templates/opensuse-leap-15.4.tpl
rename to mock-core-configs/etc/mock/eol/templates/opensuse-leap-15.4.tpl
diff --git a/releng/release-notes-next/leap-15-4.config b/releng/release-notes-next/leap-15-4.config
new file mode 100644
index 000000000..27941933d
--- /dev/null
+++ b/releng/release-notes-next/leap-15-4.config
@@ -0,0 +1 @@
+OpenSuse Leap 15.4 EOLed at 07 Dec 2023 so we moved the configs to `eol` directory.