diff --git a/libcontainers-common.changes b/libcontainers-common.changes
index 8b4cb0c..6619623 100644
--- a/libcontainers-common.changes
+++ b/libcontainers-common.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
 Wed Apr 24 14:56:17 UTC 2024 - Danish Prakash <danish.prakash@suse.com>
 
-- Remove registry.opensuse.org and docker.io from the unqualified search
-  registries on ALP and SLE 15 SP6+ (jsc#SMO-376, jsc#PED-8289)
+- Introduce new subpackage that ships registries.conf that uses
+  registry.suse.com as the only unqualified registry while pulling images on
+  SL Micro and SP6. (jsc#SMO-376, jsc#PED-8289)
 
 -------------------------------------------------------------------
 Mon Apr  8 15:15:18 UTC 2024 - Danish Prakash <danish.prakash@suse.com>
diff --git a/libcontainers-common.spec b/libcontainers-common.spec
index e32b7e0..5b91ea5 100644
--- a/libcontainers-common.spec
+++ b/libcontainers-common.spec
@@ -58,6 +58,12 @@ Requires(post): %{_bindir}/sed
 Requires:       (libcontainers-sles-mounts if (product(SUSE_SLE) or product(SLE-Micro)))
 Requires:       libcontainers-policy >= %{version}
 Suggests:       (libcontainers-policy-openSUSE if openSUSE-release)
+# Default to SUSE registry on SL Micro,
+# keep SUSE, openSUSE and dockerhub registries otherwise.
+# (jsc#SMO-376, jsc#PED-8289)
+Requires:       registries-conf >= %{version}
+Suggests:       (registries-conf-suse if (product(SL-Micro) or (product(SUSE_SLE) >= 15.5)))
+Suggests:       (registries-conf-default if openSUSE-release)
 Provides:       libcontainers-image = %{version}
 Provides:       libcontainers-storage = %{version}
 Obsoletes:      libcontainers-image < %{version}
@@ -94,6 +100,23 @@ Conflicts:      libcontainers-openSUSE-policy
 %description -n libcontainers-default-policy
 This package ships the default /etc/containers/policy.json
 
+%package -n registries-conf-suse
+Summary:                Defaults to SUSE Registry on SL Micro
+Provides:               registries-conf = %{version}-%{release}
+RemovePathPostfixes:    .suse
+Conflicts:              registries-conf-default
+
+%description -n registries-conf-suse
+Ships the upstream registries.conf with registry.opensuse.org and registry.suse.com as additional unqualified search registries.
+
+%package -n registries-conf-default
+Summary:                Add SUSE and openSUSE registries to be used to pull images along with dockerhub
+Provides:               registries-conf = %{version}-%{release}
+RemovePathPostfixes:    .default
+Conflicts:              registries-conf-suse
+
+%description -n registries-conf-default
+Modifes registries.conf to allow SUSE and openSUSE registries to be used to pull images along with dockerhub.
 
 %prep
 cp %{SOURCE9} .
@@ -104,12 +127,6 @@ cp %{SOURCE9} .
 sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %_builddir/containers.conf
 %endif
 
-cp %{SOURCE6} .
-# Default to SUSE registry on SLE 15 SP6 & ALP code stream
-%if 0%{?suse_version} == 1600 || 0%{?sle_version} >= 150600
-sed -i 's/unqualified-search-registries.*/unqualified-search-registries = \["registry.suse.com"\]/' $(basename %{SOURCE6})
-%endif
-
 %setup -q -Tcq -b0 -b1 -b8
 # copy the LICENSE file in the build root
 cp %{SOURCE2} .
@@ -146,6 +163,9 @@ cat >>%{SOURCE5} <<EOL
 %{_sysconfdir}/zypp/credentials.d/SCCcredentials:%{_sysconfdir}/zypp/credentials.d/SCCcredentials
 EOL
 
+# Default to SUSE registry on SL Micro
+sed 's/unqualified-search-registries.*/unqualified-search-registries = \["registry.suse.com"\]/' %{SOURCE6} > registries.conf.suse
+
 cd common-%{commonver}
 %make_build docs
 cd ..
@@ -184,7 +204,8 @@ install -D -m 0644 common-%{commonver}/docs/containers.conf.5 %{buildroot}/%{_ma
 install -D -m 0644 %{SOURCE12} %{buildroot}/%{_sysconfdir}/containers/policy.json.openSUSE
 install -D -m 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/containers/policy.json.default
 
-install -D -m 0644 $(basename %{SOURCE6}) %{buildroot}/%{_sysconfdir}/containers/registries.conf
+install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf.default
+install -D -m 0644 registries.conf.suse %{buildroot}/%{_sysconfdir}/containers/registries.conf.suse
 
 %post
 # Comment out ostree_repo if it's blank [boo#1189893]
@@ -206,7 +227,6 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
 %config(noreplace) %{_sysconfdir}/containers/seccomp.json
 %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.conf
 %{_datadir}/containers/seccomp.json
 %{_datadir}/containers/containers.conf
 
@@ -224,4 +244,10 @@ sed -i 's/ostree_repo = ""/\#ostree_repo = ""/g' %{_sysconfdir}/containers/stora
 %files -n libcontainers-default-policy
 %config(noreplace) %{_sysconfdir}/containers/policy.json.default
 
+%files -n registries-conf-suse
+%config(noreplace) %{_sysconfdir}/containers/registries.conf.suse
+
+%files -n registries-conf-default
+%config(noreplace) %{_sysconfdir}/containers/registries.conf.default
+
 %changelog