diff --git a/components/DataTable/samples/Dependencies.props b/components/DataTable/samples/Dependencies.props
index e622e1df4..3fada6598 100644
--- a/components/DataTable/samples/Dependencies.props
+++ b/components/DataTable/samples/Dependencies.props
@@ -9,6 +9,16 @@
     For UWP / WinAppSDK / Uno packages, place the package references here.
 -->
 <Project>
+    <!-- WinUI 2 / UWP / Uno -->
+    <ItemGroup Condition="'$(IsUwp)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '2')">
+        <PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.0.0-beta.1"/>
+    </ItemGroup>
+
+    <!-- WinUI 3 / WinAppSdk / Uno -->
+    <ItemGroup Condition="'$(IsWinAppSdk)' == 'true' OR ('$(IsUno)' == 'true' AND '$(WinUIMajorVersion)' == '3')">
+        <PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.0-beta.1"/>
+    </ItemGroup>
+
     <!-- WinUI 2 / UWP -->
     <ItemGroup Condition="'$(IsUwp)' == 'true'">
         <!-- <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Primitives" Version="7.1.2"/> -->
diff --git a/components/DataTable/src/Dependencies.props b/components/DataTable/src/Dependencies.props
index 502311afe..be4306195 100644
--- a/components/DataTable/src/Dependencies.props
+++ b/components/DataTable/src/Dependencies.props
@@ -17,7 +17,6 @@
         <PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.0.0-beta.2"/>
-        <PackageReference Include="CommunityToolkit.Uwp.Controls.HeaderedControls" Version="8.0.0-beta.1"/>
     </ItemGroup>
 
     <!-- WinUI 3 / WinAppSdk / Uno -->
@@ -25,6 +24,5 @@
         <PackageReference Include="CommunityToolkit.WinUI.Converters" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.WinUI.Extensions" Version="8.0.0-beta.1"/>
         <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.0-beta.2"/>
-        <PackageReference Include="CommunityToolkit.WinUI.Controls.HeaderedControls" Version="8.0.0-beta.1"/>
     </ItemGroup>
 </Project>
diff --git a/components/DataTable/tests/DataTableColumnAutoSizeTestPage.xaml b/components/DataTable/tests/DataTableColumnAutoSizeTestPage.xaml
index d4b9d1799..7544ef977 100644
--- a/components/DataTable/tests/DataTableColumnAutoSizeTestPage.xaml
+++ b/components/DataTable/tests/DataTableColumnAutoSizeTestPage.xaml
@@ -8,15 +8,15 @@
       Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
       mc:Ignorable="d">
 
-    <controls:HeaderedItemsControl>
-        <controls:HeaderedItemsControl.Header>
+    <ListView>
+        <ListView.Header>
             <controls:DataTable>
                 <controls:DataColumn DesiredWidth="Auto" />
                 <!--  Need 2nd column to force size of available for testing  -->
                 <controls:DataColumn DesiredWidth="*" />
             </controls:DataTable>
-        </controls:HeaderedItemsControl.Header>
-        <controls:HeaderedItemsControl.ItemTemplate>
+        </ListView.Header>
+        <ListView.ItemTemplate>
             <DataTemplate x:DataType="x:String">
                 <controls:DataRow>
                     <Border MinWidth="50"
@@ -26,16 +26,16 @@
                     <Border Tag="ExtraArea" />
                 </controls:DataRow>
             </DataTemplate>
-        </controls:HeaderedItemsControl.ItemTemplate>
-        <controls:HeaderedItemsControl.ItemContainerStyle>
+        </ListView.ItemTemplate>
+        <ListView.ItemContainerStyle>
             <Style TargetType="ListViewItem">
                 <Setter Property="HorizontalContentAlignment" Value="Stretch" />
             </Style>
-        </controls:HeaderedItemsControl.ItemContainerStyle>
+        </ListView.ItemContainerStyle>
 
         <!--  Content  -->
         <x:String>1</x:String>
         <x:String>SuperLongString</x:String>
         <x:String>Short</x:String>
-    </controls:HeaderedItemsControl>
+    </ListView>
 </Page>