diff --git a/0001-Migrate-to-plexus-containers-container-default.patch b/0001-Migrate-to-plexus-containers-container-default.patch
index 5fe7ecc..266b90c 100644
--- a/0001-Migrate-to-plexus-containers-container-default.patch
+++ b/0001-Migrate-to-plexus-containers-container-default.patch
@@ -34,7 +34,7 @@ index f2f3437..5e39fcf 100644
 +            }
 +            catch ( ComponentLookupException e )
 +            {
-+                throw new ComponentInstantiationException( e );
++                throw new ComponentInstantiationException( "", e );
 +            }
 +
              throw new ComponentInstantiationException( "Cannot build component for: " +
diff --git a/plexus-bsh-factory.changes b/plexus-bsh-factory.changes
index 50038b5..0a99d01 100644
--- a/plexus-bsh-factory.changes
+++ b/plexus-bsh-factory.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu May 16 04:58:40 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+- Modified patch:
+  * 0001-Migrate-to-plexus-containers-container-default.patch
+    + fix to work with both plexus-containers-container-default
+      and sisu-plexus
+
 -------------------------------------------------------------------
 Tue Feb 20 14:42:08 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec
index e481661..b3790ba 100644
--- a/plexus-bsh-factory.spec
+++ b/plexus-bsh-factory.spec
@@ -40,8 +40,8 @@ BuildRequires:  bsh2
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  plexus-classworlds >= 2
-BuildRequires:  plexus-containers-container-default
 BuildRequires:  plexus-utils
+BuildRequires:  sisu-plexus
 BuildArch:      noarch
 
 %description
@@ -66,7 +66,7 @@ cp -p %{SOURCE3} .
 %build
 mkdir -p lib
 
-build-jar-repository -s lib plexus/classworlds plexus/utils plexus-containers/plexus-container-default bsh2/bsh
+build-jar-repository -s lib plexus/classworlds plexus/utils org.eclipse.sisu.plexus bsh2/bsh
 %{ant} \
   jar javadoc