diff --git a/Samples/Directory.Packages.props b/Samples/Directory.Packages.props
index 352b73614b..3f24827b01 100644
--- a/Samples/Directory.Packages.props
+++ b/Samples/Directory.Packages.props
@@ -5,11 +5,9 @@
   <ItemGroup>
     <PackageVersion Include="UnitsNet" Version="5.65.0" />
     <PackageVersion Include="MahApps.Metro" Version="2.4.10" />
-    <PackageVersion Include="CommonServiceLocator" Version="2.0.4" />
     <PackageVersion Include="Prism.Container.Abstractions" Version="9.0.106" />
-    <PackageVersion Include="Prism.Unity" Version="7.1.0.431" />
-    <PackageVersion Include="Prism.Wpf" Version="7.1.0.431" />
+    <PackageVersion Include="Prism.Unity" Version="9.0.537" />
+    <PackageVersion Include="Prism.Wpf" Version="9.0.537" />
     <PackageVersion Include="Unity.Abstractions" Version="5.11.7" />
-    <PackageVersion Include="Unity.Container" Version="5.8.11" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/App.xaml.cs b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/App.xaml.cs
index 41c001cc97..9b9bf71e09 100644
--- a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/App.xaml.cs
+++ b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/App.xaml.cs
@@ -16,7 +16,7 @@ protected override void RegisterTypes(IContainerRegistry containerRegistry)
 
         protected override Window CreateShell()
         {
-            return new MainWindow();
+            return Container.Resolve<MainWindow>();
         }
     }
 }
diff --git a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/Converters/UnitToStringConverter.cs b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/Converters/UnitToStringConverter.cs
index 04dcdb901e..f7f2806f73 100644
--- a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/Converters/UnitToStringConverter.cs
+++ b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/Converters/UnitToStringConverter.cs
@@ -6,7 +6,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Markup;
-using CommonServiceLocator;
+using Prism.Ioc;
 using UnitsNet;
 using WpfMVVMSample.Settings;
 
@@ -22,7 +22,7 @@ public UnitToStringConverter()
         {
             if (!DesignerProperties.GetIsInDesignMode(new DependencyObject()))
             {
-                _settings = ServiceLocator.Current.GetInstance<SettingsManager>();
+                _settings = Prism.Ioc.ContainerLocator.Container.Resolve<SettingsManager>();
             }
         }
 
diff --git a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindow.xaml.cs b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindow.xaml.cs
index e0d2d6299d..2245d7f9cf 100644
--- a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindow.xaml.cs
+++ b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindow.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows;
 
 namespace WpfMVVMSample
 {
diff --git a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindowViewModel.cs b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindowViewModel.cs
index bb9a26aafd..0019962e88 100644
--- a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindowViewModel.cs
+++ b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MainWindowViewModel.cs
@@ -1,14 +1,5 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Prism.Mvvm;
 using UnitsNet;
-using UnitsNet.Units;
-using WpfMVVMSample.Converters;
-using WpfMVVMSample.Properties;
 using WpfMVVMSample.Settings;
 
 namespace WpfMVVMSample
diff --git a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj
index 04d852be7f..cb757e1ceb 100644
--- a/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj
+++ b/Samples/MvvmSample.Wpf/MvvmSample.Wpf/MvvmSample.Wpf.csproj
@@ -8,12 +8,8 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <ItemGroup>
-    <!-- managing these dependencies is a nightmare   -->
-    <!-- note: there also seem to be breaking changes in the later versions: was getting an InvalidOperationException while trying to access ServiceLocator.Current -->
-    <PackageReference Include="CommonServiceLocator" OverrideVersion="2.0.4"/>
-    <PackageReference Include="Prism.Unity" OverrideVersion="7.1.0.431" />
-    <PackageReference Include="Prism.Wpf" OverrideVersion="7.1.0.431"/>
-    <PackageReference Include="Unity.Container" OverrideVersion="5.8.11"/>
+    <PackageReference Include="Prism.Unity" />
+    <PackageReference Include="Prism.Wpf" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Configuration" />