diff --git a/samples/ManagementSite/Alloy.ManagementSite.csproj b/samples/ManagementSite/Alloy.ManagementSite.csproj
index f27631b..2e1a6c1 100644
--- a/samples/ManagementSite/Alloy.ManagementSite.csproj
+++ b/samples/ManagementSite/Alloy.ManagementSite.csproj
@@ -4,9 +4,9 @@
     <NoWarn>NU5100;NU1803;NU1605;NU1504;</NoWarn>
 	  <CmsUIVersion>12.23.0</CmsUIVersion>
 	  <CmsCoreVersion>12.20.1</CmsCoreVersion>
-    <HeadlessFormVersion>0.1.1--inte-380</HeadlessFormVersion>
+    <HeadlessFormVersion>0.1.1-inte-380</HeadlessFormVersion>
     <ContentApiVersion>12.20.1</ContentApiVersion>
-	  <FormVersion>5.8.2-pre-021286</FormVersion>
+	  <FormVersion>5.8.2</FormVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="EPiServer.CMS.AspNetCore" Version="$(CmsCoreVersion)" />
diff --git a/samples/ManagementSite/Nuget.config b/samples/ManagementSite/Nuget.config
index 1b380bf..735016a 100644
--- a/samples/ManagementSite/Nuget.config
+++ b/samples/ManagementSite/Nuget.config
@@ -13,13 +13,13 @@
     <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.Forms.*" />
+		<package pattern="Optimizely.Cms.*" />
 		<package pattern="EPiServer.AddOns.*" />
 	</packageSource>
+	<packageSource key="headlessform.local">
+		<package pattern="Optimizely.Headless.*" />
+	</packageSource>
   </packageSourceMapping>
 </configuration>
diff --git a/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj b/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj
index 25b72d7..854ab2a 100644
--- a/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj
+++ b/samples/musicfestival-backend-dotnet/MusicFestival.Backend.csproj
@@ -8,8 +8,8 @@
   	  <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>
+	  <FormVersion>5.8.2</FormVersion>
+    <HeadlessFormVersion>0.1.1-inte-380</HeadlessFormVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/musicfestival-backend-dotnet/nuget.config b/samples/musicfestival-backend-dotnet/nuget.config
index aa7969d..5efc96f 100644
--- a/samples/musicfestival-backend-dotnet/nuget.config
+++ b/samples/musicfestival-backend-dotnet/nuget.config
@@ -12,13 +12,13 @@
     <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>
+    <packageSource key="headlessform.local">
+      <package pattern="Optimizely.Headless.*" />
+    </packageSource>
   </packageSourceMapping>
 </configuration>