diff --git a/frontend/src/components/ScenarioManagementModal.test.tsx b/frontend/src/components/ScenarioManagementModal.test.tsx
index 07bbfe601..2a64a2d5c 100644
--- a/frontend/src/components/ScenarioManagementModal.test.tsx
+++ b/frontend/src/components/ScenarioManagementModal.test.tsx
@@ -66,7 +66,7 @@ function renderModal(ctx: ScenarioContextType) {
   })
   const wrapper = ({ children }: { children: ReactNode }) => (
     <QueryClientProvider client={qc}>
-      <ScenarioContext.Provider value={ctx}>{children}</ScenarioContext.Provider>
+      <ScenarioContext value={ctx}>{children}</ScenarioContext>
       <Toaster />
     </QueryClientProvider>
   )
diff --git a/frontend/src/components/admin/PopulateFromPreviousYear.test.tsx b/frontend/src/components/admin/PopulateFromPreviousYear.test.tsx
index 0b3fc09bf..154099c74 100644
--- a/frontend/src/components/admin/PopulateFromPreviousYear.test.tsx
+++ b/frontend/src/components/admin/PopulateFromPreviousYear.test.tsx
@@ -55,7 +55,7 @@ function createWrapper(year = 2026) {
 
   return ({ children }: { children: React.ReactNode }) => (
     <QueryClientProvider client={queryClient}>
-      <CurrentYearContext.Provider value={mockYearContext}>{children}</CurrentYearContext.Provider>
+      <CurrentYearContext value={mockYearContext}>{children}</CurrentYearContext>
     </QueryClientProvider>
   )
 }
diff --git a/frontend/src/components/admin/RegistrationDatesConfig.test.tsx b/frontend/src/components/admin/RegistrationDatesConfig.test.tsx
index db991bfe3..626fb6a28 100644
--- a/frontend/src/components/admin/RegistrationDatesConfig.test.tsx
+++ b/frontend/src/components/admin/RegistrationDatesConfig.test.tsx
@@ -48,7 +48,7 @@ const createWrapper = (year = 2026) => {
 
   return ({ children }: { children: React.ReactNode }) => (
     <QueryClientProvider client={queryClient}>
-      <CurrentYearContext.Provider value={mockYearContext}>{children}</CurrentYearContext.Provider>
+      <CurrentYearContext value={mockYearContext}>{children}</CurrentYearContext>
     </QueryClientProvider>
   )
 }
diff --git a/frontend/src/components/metrics/MetricsTypeTabs.test.tsx b/frontend/src/components/metrics/MetricsTypeTabs.test.tsx
index fe773ca67..663d493e6 100644
--- a/frontend/src/components/metrics/MetricsTypeTabs.test.tsx
+++ b/frontend/src/components/metrics/MetricsTypeTabs.test.tsx
@@ -47,11 +47,11 @@ const renderWithRouter = (initialPath: string) => {
   return render(
     <QueryClientProvider client={queryClient}>
       <MemoryRouter initialEntries={[initialPath]}>
-        <CurrentYearContext.Provider value={mockYearContext}>
+        <CurrentYearContext value={mockYearContext}>
           <MetricsSessionProvider>
             <MetricsTypeTabs />
           </MetricsSessionProvider>
-        </CurrentYearContext.Provider>
+        </CurrentYearContext>
       </MemoryRouter>
     </QueryClientProvider>
   )
diff --git a/frontend/src/contexts/AuthContext.tsx b/frontend/src/contexts/AuthContext.tsx
index 5801ef9c9..e1378fd6b 100644
--- a/frontend/src/contexts/AuthContext.tsx
+++ b/frontend/src/contexts/AuthContext.tsx
@@ -231,7 +231,7 @@ export const AuthProvider = ({ children }: { children: ReactNode }) => {
     checkAuth,
   }
 
-  return <AuthContext.Provider value={value}>{children}</AuthContext.Provider>
+  return <AuthContext value={value}>{children}</AuthContext>
 }
 
 // eslint-disable-next-line react-refresh/only-export-components
diff --git a/frontend/src/contexts/CurrentYearContext.tsx b/frontend/src/contexts/CurrentYearContext.tsx
index cd3673746..8213559de 100644
--- a/frontend/src/contexts/CurrentYearContext.tsx
+++ b/frontend/src/contexts/CurrentYearContext.tsx
@@ -114,7 +114,7 @@ export function CurrentYearProvider({ children }: { children: ReactNode }) {
   )
 
   return (
-    <CurrentYearContext.Provider
+    <CurrentYearContext
       value={{
         currentYear,
         setCurrentYear,
@@ -124,6 +124,6 @@ export function CurrentYearProvider({ children }: { children: ReactNode }) {
       }}
     >
       {children}
-    </CurrentYearContext.Provider>
+    </CurrentYearContext>
   )
 }
diff --git a/frontend/src/contexts/LockGroupContext.tsx b/frontend/src/contexts/LockGroupContext.tsx
index 6a5245db6..c781a81f9 100644
--- a/frontend/src/contexts/LockGroupContext.tsx
+++ b/frontend/src/contexts/LockGroupContext.tsx
@@ -405,7 +405,7 @@ export function LockGroupProvider({ children }: LockGroupProviderProps) {
   }
 
   return (
-    <LockGroupContext.Provider value={value}>
+    <LockGroupContext value={value}>
       {children}
       <GroupConflictDialog
         isOpen={conflictConfirm.dialogState.isOpen}
@@ -415,7 +415,7 @@ export function LockGroupProvider({ children }: LockGroupProviderProps) {
         onConfirm={conflictConfirm.dialogState.onConfirm}
         onCancel={conflictConfirm.dialogState.onCancel}
       />
-    </LockGroupContext.Provider>
+    </LockGroupContext>
   )
 }
 
diff --git a/frontend/src/contexts/MetricsSessionContext.test.tsx b/frontend/src/contexts/MetricsSessionContext.test.tsx
index e890df201..db2c16679 100644
--- a/frontend/src/contexts/MetricsSessionContext.test.tsx
+++ b/frontend/src/contexts/MetricsSessionContext.test.tsx
@@ -124,9 +124,9 @@ function createWrapper(initialPath: string = '/analytics/registration') {
     return (
       <QueryClientProvider client={queryClient}>
         <MemoryRouter initialEntries={[initialPath]}>
-          <CurrentYearContext.Provider value={mockYearContext}>
+          <CurrentYearContext value={mockYearContext}>
             <MetricsSessionProvider>{children}</MetricsSessionProvider>
-          </CurrentYearContext.Provider>
+          </CurrentYearContext>
         </MemoryRouter>
       </QueryClientProvider>
     )
@@ -308,13 +308,13 @@ describe('MetricsSessionContext', () => {
       render(
         <QueryClientProvider client={queryClient}>
           <MemoryRouter initialEntries={['/analytics/registration?year=2025']}>
-            <CurrentYearContext.Provider value={mockYearContext}>
+            <CurrentYearContext value={mockYearContext}>
               <MetricsSessionProvider>
                 <TestSetter sessionCmId={1001} />
                 <YearParamViewer />
                 <UrlParamViewer />
               </MetricsSessionProvider>
-            </CurrentYearContext.Provider>
+            </CurrentYearContext>
           </MemoryRouter>
         </QueryClientProvider>
       )
diff --git a/frontend/src/contexts/MetricsSessionContext.tsx b/frontend/src/contexts/MetricsSessionContext.tsx
index 3e9bee6b7..0a95e4203 100644
--- a/frontend/src/contexts/MetricsSessionContext.tsx
+++ b/frontend/src/contexts/MetricsSessionContext.tsx
@@ -286,5 +286,5 @@ export function MetricsSessionProvider({ children }: { children: ReactNode }) {
     ]
   )
 
-  return <MetricsSessionContext.Provider value={value}>{children}</MetricsSessionContext.Provider>
+  return <MetricsSessionContext value={value}>{children}</MetricsSessionContext>
 }
diff --git a/frontend/src/contexts/ProgramContext.tsx b/frontend/src/contexts/ProgramContext.tsx
index 216b8b22d..5e0b5b775 100644
--- a/frontend/src/contexts/ProgramContext.tsx
+++ b/frontend/src/contexts/ProgramContext.tsx
@@ -39,9 +39,7 @@ export function ProgramProvider({ children }: { children: ReactNode }) {
   }, [])
 
   return (
-    <ProgramContext.Provider value={{ currentProgram, setProgram, clearProgram }}>
-      {children}
-    </ProgramContext.Provider>
+    <ProgramContext value={{ currentProgram, setProgram, clearProgram }}>{children}</ProgramContext>
   )
 }
 
diff --git a/frontend/src/contexts/ScenarioContext.tsx b/frontend/src/contexts/ScenarioContext.tsx
index 9389bffc1..a707a685c 100644
--- a/frontend/src/contexts/ScenarioContext.tsx
+++ b/frontend/src/contexts/ScenarioContext.tsx
@@ -243,5 +243,5 @@ export const ScenarioProvider: FC<ScenarioProviderProps> = ({ children }) => {
     clearScenario,
   }
 
-  return <ScenarioContext.Provider value={value}>{children}</ScenarioContext.Provider>
+  return <ScenarioContext value={value}>{children}</ScenarioContext>
 }
diff --git a/frontend/src/contexts/ThemeContext.tsx b/frontend/src/contexts/ThemeContext.tsx
index c53cf53af..4ce5ac6da 100644
--- a/frontend/src/contexts/ThemeContext.tsx
+++ b/frontend/src/contexts/ThemeContext.tsx
@@ -115,7 +115,7 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
   }, [])
 
   return (
-    <ThemeContext.Provider
+    <ThemeContext
       value={{
         theme,
         resolvedTheme,
@@ -125,6 +125,6 @@ export function ThemeProvider({ children }: { children: ReactNode }) {
       }}
     >
       {children}
-    </ThemeContext.Provider>
+    </ThemeContext>
   )
 }
diff --git a/frontend/src/hooks/useRunSweep.test.tsx b/frontend/src/hooks/useRunSweep.test.tsx
index 0c65a072f..bbb3438c7 100644
--- a/frontend/src/hooks/useRunSweep.test.tsx
+++ b/frontend/src/hooks/useRunSweep.test.tsx
@@ -17,9 +17,9 @@ const wrapper = ({ children }: { children: ReactNode }) => {
   const qc = new QueryClient({ defaultOptions: { queries: { retry: false } } })
   const authCtx = createMockAuthContext({ user: createMockUser() })
   return (
-    <AuthContext.Provider value={authCtx}>
+    <AuthContext value={authCtx}>
       <QueryClientProvider client={qc}>{children}</QueryClientProvider>
-    </AuthContext.Provider>
+    </AuthContext>
   )
 }
 
diff --git a/frontend/src/pages/metrics/MetricsLayout.test.tsx b/frontend/src/pages/metrics/MetricsLayout.test.tsx
index 7541c2174..3f22d8db1 100644
--- a/frontend/src/pages/metrics/MetricsLayout.test.tsx
+++ b/frontend/src/pages/metrics/MetricsLayout.test.tsx
@@ -57,7 +57,7 @@ const renderWithRouter = (initialPath: string, childText = 'Child Content') => {
       { value: authCtx },
       <QueryClientProvider client={queryClient}>
         <MemoryRouter initialEntries={[initialPath]}>
-          <CurrentYearContext.Provider value={mockYearContext}>
+          <CurrentYearContext value={mockYearContext}>
             <Routes>
               <Route path="/analytics/*" element={<MetricsLayout />}>
                 <Route path="registration/*" element={<TestChild text={childText} />} />
@@ -67,7 +67,7 @@ const renderWithRouter = (initialPath: string, childText = 'Child Content') => {
                 <Route path="trends" element={<TestChild text="Trends" />} />
               </Route>
             </Routes>
-          </CurrentYearContext.Provider>
+          </CurrentYearContext>
         </MemoryRouter>
       </QueryClientProvider>
     )
diff --git a/frontend/src/pages/metrics/retention/BunkRetentionPage.test.tsx b/frontend/src/pages/metrics/retention/BunkRetentionPage.test.tsx
index bca5dc94a..4c5e690ae 100644
--- a/frontend/src/pages/metrics/retention/BunkRetentionPage.test.tsx
+++ b/frontend/src/pages/metrics/retention/BunkRetentionPage.test.tsx
@@ -48,11 +48,11 @@ function renderPage() {
   return render(
     <QueryClientProvider client={queryClient}>
       <MemoryRouter initialEntries={['/analytics/retention/bunks']}>
-        <CurrentYearContext.Provider value={mockYearContext}>
+        <CurrentYearContext value={mockYearContext}>
           <Routes>
             <Route path="/analytics/retention/bunks" element={<BunkRetentionPage />} />
           </Routes>
-        </CurrentYearContext.Provider>
+        </CurrentYearContext>
       </MemoryRouter>
     </QueryClientProvider>
   )
diff --git a/frontend/src/pages/metrics/retention/StaffCabinAnalysisPage.test.tsx b/frontend/src/pages/metrics/retention/StaffCabinAnalysisPage.test.tsx
index f74585248..0b44e4499 100644
--- a/frontend/src/pages/metrics/retention/StaffCabinAnalysisPage.test.tsx
+++ b/frontend/src/pages/metrics/retention/StaffCabinAnalysisPage.test.tsx
@@ -47,11 +47,11 @@ function renderPage() {
   return render(
     <QueryClientProvider client={queryClient}>
       <MemoryRouter initialEntries={['/analytics/retention/staff']}>
-        <CurrentYearContext.Provider value={mockYearContext}>
+        <CurrentYearContext value={mockYearContext}>
           <Routes>
             <Route path="/analytics/retention/staff" element={<StaffCabinAnalysisPage />} />
           </Routes>
-        </CurrentYearContext.Provider>
+        </CurrentYearContext>
       </MemoryRouter>
     </QueryClientProvider>
   )
diff --git a/frontend/src/providers/BunkRequestProvider.tsx b/frontend/src/providers/BunkRequestProvider.tsx
index ceba51e43..f0bf08b9d 100644
--- a/frontend/src/providers/BunkRequestProvider.tsx
+++ b/frontend/src/providers/BunkRequestProvider.tsx
@@ -123,5 +123,5 @@ export function BunkRequestProvider({ sessionCmId, children }: BunkRequestProvid
     ]
   )
 
-  return <BunkRequestContext.Provider value={value}>{children}</BunkRequestContext.Provider>
+  return <BunkRequestContext value={value}>{children}</BunkRequestContext>
 }
diff --git a/frontend/src/providers/CamperHistoryProvider.tsx b/frontend/src/providers/CamperHistoryProvider.tsx
index b26105478..4573279bd 100644
--- a/frontend/src/providers/CamperHistoryProvider.tsx
+++ b/frontend/src/providers/CamperHistoryProvider.tsx
@@ -148,5 +148,5 @@ export function CamperHistoryProvider({
     error: error,
   }
 
-  return <CamperHistoryContext.Provider value={value}>{children}</CamperHistoryContext.Provider>
+  return <CamperHistoryContext value={value}>{children}</CamperHistoryContext>
 }