diff --git a/plexus-velocity.changes b/plexus-velocity.changes
index dfa8c68..f4d67f9 100644
--- a/plexus-velocity.changes
+++ b/plexus-velocity.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun May 26 19:41:56 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use the org.eclipse.sisu:org.eclipse.sisu.plexus artifact to
+  avoid conflict/choise of providers
+
+-------------------------------------------------------------------
+Thu May 16 05:07:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use sisu-plexus instead of plexus-containers-container-default
+- Clean up the spec file
+
 -------------------------------------------------------------------
 Tue Mar 29 14:22:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/plexus-velocity.spec b/plexus-velocity.spec
index 98bed2f..5955e69 100644
--- a/plexus-velocity.spec
+++ b/plexus-velocity.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plexus-velocity
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,12 +30,9 @@ BuildRequires:  ant
 BuildRequires:  apache-commons-collections
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
-BuildRequires:  plexus-containers-container-default
+BuildRequires:  javapackages-local >= 6
+BuildRequires:  sisu-plexus
 BuildRequires:  velocity
-Requires:       mvn(commons-collections:commons-collections)
-Requires:       mvn(org.codehaus.plexus:plexus-container-default)
-Requires:       mvn(velocity:velocity)
 BuildArch:      noarch
 
 %description
@@ -58,11 +55,10 @@ find -name '*.jar' -delete
 cp -p %{SOURCE1} build.xml
 cp -p %{SOURCE2} LICENSE
 
-%pom_xpath_inject pom:project "<groupId>org.codehaus.plexus</groupId>"
-%pom_remove_parent
+%pom_change_dep :plexus-container-default org.eclipse.sisu:org.eclipse.sisu.plexus:0.9.0.M2
 
 mkdir -p lib
-build-jar-repository -s lib commons-collections plexus-containers/plexus-container-default velocity
+build-jar-repository -s lib commons-collections org.eclipse.sisu.plexus velocity
 
 %build
 ant jar javadoc
@@ -73,7 +69,7 @@ install -dm 0755 %{buildroot}%{_javadir}/%{name}
 install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
 %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}