diff --git a/0001-Add-openSUSE-cpe-links.patch b/0001-Add-openSUSE-cpe-links.patch
index 8c3e311..1909de4 100644
--- a/0001-Add-openSUSE-cpe-links.patch
+++ b/0001-Add-openSUSE-cpe-links.patch
@@ -8,11 +8,11 @@ Subject: [PATCH 1/5] Add openSUSE cpe links
cpe/openscap-cpe-oval.xml | 127 ++++++++++++++++++++++++++++++++++++++
2 files changed, 151 insertions(+)
-diff --git a/cpe/openscap-cpe-dict.xml b/cpe/openscap-cpe-dict.xml
-index 02d5361..cf52bee 100644
---- a/cpe/openscap-cpe-dict.xml
-+++ b/cpe/openscap-cpe-dict.xml
-@@ -53,4 +53,28 @@
+Index: openscap-1.3.10/cpe/openscap-cpe-dict.xml
+===================================================================
+--- openscap-1.3.10.orig/cpe/openscap-cpe-dict.xml
++++ openscap-1.3.10/cpe/openscap-cpe-dict.xml
+@@ -53,4 +53,32 @@
Fedora 35
oval:org.open-scap.cpe.fedora:def:35
@@ -36,16 +36,20 @@ index 02d5361..cf52bee 100644
+ openSUSE Leap 15.5
+ oval:org.open-scap.cpe.opensuse:def:155
+
++
++ openSUSE Leap 15.6
++ oval:org.open-scap.cpe.opensuse:def:156
++
+
+ openSUSE Tumbleweed
+ oval:org.open-scap.cpe.opensuse:def:9999
+
-diff --git a/cpe/openscap-cpe-oval.xml b/cpe/openscap-cpe-oval.xml
-index 6409940..a402c7f 100644
---- a/cpe/openscap-cpe-oval.xml
-+++ b/cpe/openscap-cpe-oval.xml
-@@ -690,6 +690,84 @@
+Index: openscap-1.3.10/cpe/openscap-cpe-oval.xml
+===================================================================
+--- openscap-1.3.10.orig/cpe/openscap-cpe-oval.xml
++++ openscap-1.3.10/cpe/openscap-cpe-oval.xml
+@@ -690,6 +690,97 @@
@@ -114,6 +118,19 @@ index 6409940..a402c7f 100644
+
+
+
++
++
++ openSUSE Leap 15.6
++
++ openSUSE Leap 15.6
++
++
++ The operating system installed on the system is openSUSE Leap 15.6
++
++
++
++
++
+
+
+ openSUSE Tumbleweed
@@ -130,7 +147,7 @@ index 6409940..a402c7f 100644
Wind River Linux
-@@ -1087,6 +1165,36 @@
+@@ -1087,6 +1178,41 @@
@@ -159,6 +176,11 @@ index 6409940..a402c7f 100644
+
+
+
++
++
++
++
+
+
@@ -167,7 +189,7 @@ index 6409940..a402c7f 100644
-@@ -1415,6 +1523,25 @@
+@@ -1415,6 +1541,28 @@
^15.0$
@@ -186,6 +208,9 @@ index 6409940..a402c7f 100644
+
+ ^15.5$
+
++
++ ^15.6$
++
+
+
+ ^\d{8}$
@@ -193,6 +218,3 @@ index 6409940..a402c7f 100644
+
+- 0001-Add-openSUSE-cpe-links.patch: added Leap 15.6
+
+-------------------------------------------------------------------
+Wed Mar 20 18:37:30 UTC 2024 - Dan Čermák
+
+- Rename oscap-docker to oscap-containers and provide oscap-podman as well
+ (Relates to jsc#SLE-12852)
+
-------------------------------------------------------------------
Wed Mar 20 08:56:12 UTC 2024 - Robert Frohl
diff --git a/openscap.spec b/openscap.spec
index 997ef92..acc310f 100644
--- a/openscap.spec
+++ b/openscap.spec
@@ -115,12 +115,15 @@ Requires: libopenscap%{sover} = %{version}
This package contains the development files (mainly C header files) for the
OpenSCAP C library.
-%package docker
-Summary: Docker plugin for OpenSCAP
+%package containers
+Summary: OpenSCAP plugin for scanning containers
Group: System/Libraries
+Provides: openscap-docker = %{version}-%{release}
+Obsoletes: openscap-docker < %{version}-%{release}
-%description docker
-This package contains the Docker support for OpenSCAP.
+%description containers
+This package contains plugins for scanning containers using OpenSCAP either via
+podman or docker.
%if 0%{?with_bindings}
%package -n python-openscap
@@ -291,9 +294,12 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
-%files docker
+%files containers
%{python3_sitelib}/oscap_docker_python
%{_bindir}/oscap-docker
+%{_bindir}/oscap-podman
+%{_mandir}/man8/oscap-podman.8*
+%{_mandir}/man8/oscap-docker.8*
%if 0%{?with_bindings}
%files -n python-openscap
@@ -316,10 +322,11 @@ mv %{buildroot}/%{_prefix}/libexec/oscap-remediate %{buildroot}/%{_bindir}
%{_bindir}/oscap-ssh
%{_bindir}/oscap-chroot
%{_bindir}/scap-as-rpm
-%{_bindir}/oscap-podman
%{_bindir}/oscap-run-sce-script
%{_sbindir}/rcoscap-scan
%{_datadir}/bash-completion/completions/*
+%exclude %{_mandir}/man8/oscap-podman.8*
+%exclude %{_mandir}/man8/oscap-docker.8*
%{_bindir}/oscap-remediate-offline
%{_prefix}/lib/systemd/system/oscap-remediate.service
%if 0%{?suse_version} != 1599