diff --git a/.gitignore b/.gitignore
index 6d74173..c153578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ coverage/
 /samples/netcoreapp/
 /samples/epiCloud/
 /samples/musicfestival-frontend-react/build/
+/samples/musicfestival-backend-dotnet/App_Data/
diff --git a/samples/ManagementSite/Alloy.ManagementSite.csproj b/samples/ManagementSite/Alloy.ManagementSite.csproj
index ca440e4..7245e24 100644
--- a/samples/ManagementSite/Alloy.ManagementSite.csproj
+++ b/samples/ManagementSite/Alloy.ManagementSite.csproj
@@ -4,7 +4,7 @@
     <NoWarn>NU5100;NU1803;NU1605;NU1504;</NoWarn>
 	  <CmsUIVersion>12.23.0</CmsUIVersion>
 	  <CmsCoreVersion>12.20.1</CmsCoreVersion>
-    <HeadlessFormVersion>0.1.1--inte-370</HeadlessFormVersion>
+    <HeadlessFormVersion>0.1.1--inte-380</HeadlessFormVersion>
     <ContentApiVersion>12.20.1</ContentApiVersion>
 	  <FormVersion>5.8.2-pre-021286</FormVersion>
   </PropertyGroup>
@@ -27,8 +27,6 @@
 	<PackageReference Include="EPiServer.ImageLibrary.ImageSharp" Version="2.0.1" />
   </ItemGroup>
 	<ItemGroup Label="HeadlessForm">
-        <PackageReference Include="Optimizely.Headless.Form.Service" Version="$(HeadlessFormVersion)" />
-        <PackageReference Include="Optimizely.Headless.Form.ContentGraph" Version="$(HeadlessFormVersion)" />
         <PackageReference Include="Optimizely.Cms.Preview1.Content.EPiServer" Version="$(ContentApiVersion)" />
         <PackageReference Include="Optimizely.ContentGraph.Cms" Version="3.5.1" />
 	</ItemGroup>
@@ -43,6 +41,9 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
+    <PackageReference Include="Optimizely.Headless.Form.ContentGraph" Version="$(HeadlessFormVersion)" />
+    <PackageReference Include="Optimizely.Headless.Form.Core" Version="$(HeadlessFormVersion)" />
+    <PackageReference Include="Optimizely.Headless.Form.Service" Version="$(HeadlessFormVersion)" />
   </ItemGroup>
   <PropertyGroup>
     <ApplicationIcon />
diff --git a/samples/ManagementSite/Nuget.config b/samples/ManagementSite/Nuget.config
index 23886a5..1b380bf 100644
--- a/samples/ManagementSite/Nuget.config
+++ b/samples/ManagementSite/Nuget.config
@@ -4,25 +4,22 @@
     <clear />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="optimizely" value="https://api.nuget.optimizely.com/v3/index.json" />
-    <add key="github.episerver" value="https://nuget.pkg.github.com/episerver/index.json" />
+    <add key="headlessform.local" value="..\NugetPackages\" />
   </packageSources>
   <packageSourceMapping>
     <packageSource key="nuget.org">
-      <package pattern="*" />
+        <package pattern="*" />
     </packageSource>
     <packageSource key="optimizely">
-		  <package pattern="EPiServer.*" />
-      <package pattern="Optimizely.*" />
-    </packageSource>
-		<packageSource key="github.episerver">
-      <package pattern="Optimizely.Headless.Form.*" />
-      <package pattern="Optimizely.Cms.*" />
+	    <package pattern="EPiServer.*" />
+        <package pattern="Optimizely.*" />
     </packageSource>
+  	<packageSource key="headlessform.local">
+        <package pattern="Optimizely.Headless.*" />
+		<package pattern="Optimizely.Cms.*" />
+		<package pattern="EPiServer.Forms.*" />
+		<package pattern="EPiServer.Forms" />
+		<package pattern="EPiServer.AddOns.*" />
+	</packageSource>
   </packageSourceMapping>
-  <packageSourceCredentials>
-    <github.episerver>
-      <add key="Username" value="Ignored" />
-      <add key="ClearTextPassword" value="%GitHubEpiserverPAT%" />
-    </github.episerver>
-  </packageSourceCredentials>
 </configuration>
diff --git a/samples/NugetPackages/optimizely.headless.form.contentgraph/0.1.1-inte-380/optimizely.headless.form.contentgraph.0.1.1-inte-380.nupkg b/samples/NugetPackages/optimizely.headless.form.contentgraph/0.1.1-inte-380/optimizely.headless.form.contentgraph.0.1.1-inte-380.nupkg
new file mode 100644
index 0000000..41c6937
Binary files /dev/null and b/samples/NugetPackages/optimizely.headless.form.contentgraph/0.1.1-inte-380/optimizely.headless.form.contentgraph.0.1.1-inte-380.nupkg differ
diff --git a/samples/NugetPackages/optimizely.headless.form.core/0.1.1-inte-380/optimizely.headless.form.core.0.1.1-inte-380.nupkg b/samples/NugetPackages/optimizely.headless.form.core/0.1.1-inte-380/optimizely.headless.form.core.0.1.1-inte-380.nupkg
new file mode 100644
index 0000000..a458a60
Binary files /dev/null and b/samples/NugetPackages/optimizely.headless.form.core/0.1.1-inte-380/optimizely.headless.form.core.0.1.1-inte-380.nupkg differ
diff --git a/samples/NugetPackages/optimizely.headless.form.service/0.1.1-inte-380/optimizely.headless.form.service.0.1.1-inte-380.nupkg b/samples/NugetPackages/optimizely.headless.form.service/0.1.1-inte-380/optimizely.headless.form.service.0.1.1-inte-380.nupkg
new file mode 100644
index 0000000..976331a
Binary files /dev/null and b/samples/NugetPackages/optimizely.headless.form.service/0.1.1-inte-380/optimizely.headless.form.service.0.1.1-inte-380.nupkg differ
diff --git a/samples/musicfestival-backend-dotnet/Controllers/ReactController.cs b/samples/musicfestival-backend-dotnet/Controllers/ReactController.cs
index a20956b..ee827ea 100644
--- a/samples/musicfestival-backend-dotnet/Controllers/ReactController.cs
+++ b/samples/musicfestival-backend-dotnet/Controllers/ReactController.cs
@@ -2,11 +2,8 @@
 using EPiServer.Web;
 using EPiServer.Web.Routing;
 using Microsoft.AspNetCore.Mvc;
-using Optimizely.Cms.Preview2.Content;
-using Optimizely.Cms.Preview2.Content.Models;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
+using Optimizely.Cms.Preview1.Content;
+using Optimizely.Cms.Preview1.Content.Models;
 
 namespace AlloyMvcTemplates.Controllers;
 [Route("api/[controller]")]
diff --git a/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj b/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj
index f140c42..967ba3f 100644
--- a/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj
+++ b/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj
@@ -7,6 +7,9 @@
     <ImplicitUsings>enable</ImplicitUsings>
   	  <CmsUIVersion>12.26.0</CmsUIVersion>
 	  <CmsCoreVersion>12.20.1</CmsCoreVersion>
+    <ContentApiVersion>12.20.1</ContentApiVersion>
+	  <FormVersion>5.8.2-pre-021286</FormVersion>
+    <HeadlessFormVersion>0.1.1--inte-380</HeadlessFormVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,13 +34,14 @@
     <PackageReference Include="EPiServer.ContentManagementApi" Version="3.9.1" />
     <PackageReference Include="EPiServer.OpenIDConnect" Version="3.9.1" />
     <PackageReference Include="EPiServer.OpenIDConnect.UI" Version="3.9.1" />
-    <PackageReference Include="EPiServer.Forms" Version="5.8.0" />
+    <PackageReference Include="EPiServer.Forms" Version="$(FormVersion)" />
   </ItemGroup>
 
   <ItemGroup Label="HeadlessForm">
-    <PackageReference Include="Optimizely.Headless.Form.Service" Version="0.1.0--inte-256" />
-    <PackageReference Include="Optimizely.Headless.Form.ContentGraph" Version="0.1.0--inte-256" />
-    <PackageReference Include="Optimizely.Cms.Preview2.Content.EPiServer" Version="12.20.1-ci-2644" />
+    <PackageReference Include="Optimizely.Headless.Form.ContentGraph" Version="$(HeadlessFormVersion)" />
+    <PackageReference Include="Optimizely.Headless.Form.Core" Version="$(HeadlessFormVersion)" />
+    <PackageReference Include="Optimizely.Headless.Form.Service" Version="$(HeadlessFormVersion)" />
+    <PackageReference Include="Optimizely.Cms.Preview1.Content.EPiServer" Version="$(ContentApiVersion)" />
     <PackageReference Include="Optimizely.ContentGraph.Cms" Version="3.5.1" />
   </ItemGroup>
 </Project>
diff --git a/samples/musicfestival-backend-dotnet/nuget.config b/samples/musicfestival-backend-dotnet/nuget.config
index 3e21f1c..aa7969d 100644
--- a/samples/musicfestival-backend-dotnet/nuget.config
+++ b/samples/musicfestival-backend-dotnet/nuget.config
@@ -1,7 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
 	<packageSources>
 		<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
 		<add key="optimizely" value="https://nuget.optimizely.com/feed/packages.svc/" />
-	</packageSources>
+    <add key="headlessform.local" value="..\NugetPackages\" />
+  </packageSources>
+  <packageSourceMapping>
+    <packageSource key="nuget.org">
+      <package pattern="*" />
+    </packageSource>
+    <packageSource key="optimizely">
+      <package pattern="EPiServer.*" />
+      <package pattern="Optimizely.*" />
+    </packageSource>
+    <packageSource key="headlessform.local">
+      <package pattern="Optimizely.Headless.*" />
+      <package pattern="Optimizely.Cms.*" />
+      <package pattern="EPiServer.Forms.*" />
+      <package pattern="EPiServer.Forms" />
+      <package pattern="EPiServer.AddOns.*" />
+    </packageSource>
+  </packageSourceMapping>
 </configuration>