diff --git a/bff/.config/dotnet-tools.json b/.config/dotnet-tools.json
similarity index 100%
rename from bff/.config/dotnet-tools.json
rename to .config/dotnet-tools.json
diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs
index 35b75e148..1db0ee560 100644
--- a/.github/workflow-gen/Program.cs
+++ b/.github/workflow-gen/Program.cs
@@ -211,7 +211,7 @@ void GenerateTemplatesReleaseWorkflow(Product product)
 
     workflow.On
         .WorkflowDispatch()
-        .Inputs(new StringInput("version", "Version in format X.Y.Z or X.Y.Z-preview.", true, "0.0.0"));
+        .InputVersionBranchAndTagOverride();
 
     workflow.EnvDefaults();
 
@@ -232,11 +232,13 @@ void GenerateTemplatesReleaseWorkflow(Product product)
     job.StepGitRemoveExistingTagIfConfigured(product, contexts);
     job.StepGitPushTag(product, contexts);
 
+    job.StepToolRestore();
+
     job.Step()
         .Name("build templates")
         .Run("dotnet run --project build");
 
-    job.StepToolRestore();
+    job.StepPack(product.Solution);
 
     job.StepSign(always: true);
 
diff --git a/.github/workflows/templates-release.yml b/.github/workflows/templates-release.yml
index a7d4fa200..d31373ae5 100644
--- a/.github/workflows/templates-release.yml
+++ b/.github/workflows/templates-release.yml
@@ -9,6 +9,16 @@ on:
         type: string
         required: true
         default: '0.0.0'
+      branch:
+        description: '(Optional) the name of the branch to release from'
+        type: string
+        required: false
+        default: 'main'
+      remove-tag-if-exists:
+        description: 'If set, will remove the existing tag. Use this if you have issues with the previous release action'
+        type: boolean
+        required: false
+        default: false
 env:
   DOTNET_NOLOGO: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -55,10 +65,12 @@ jobs:
       run: |-
         git tag -a templates-${{ github.event.inputs.version }} -m "Release v${{ github.event.inputs.version }}"
         git push origin templates-${{ github.event.inputs.version }}
-    - name: build templates
-      run: dotnet run --project build
     - name: Tool restore
       run: dotnet tool restore
+    - name: build templates
+      run: dotnet run --project build
+    - name: Pack ../artifacts/templates.csproj
+      run: dotnet pack -c Release ../artifacts/templates.csproj -o artifacts
     - name: Sign packages
       run: |-
         for file in artifacts/*.nupkg; do
diff --git a/identity-server/.config/dotnet-tools.json b/identity-server/.config/dotnet-tools.json
deleted file mode 100644
index 1ea259456..000000000
--- a/identity-server/.config/dotnet-tools.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "NuGetKeyVaultSignTool": {
-      "version": "3.2.3",
-      "commands": [
-        "NuGetKeyVaultSignTool"
-      ]
-    }
-  }
-}
\ No newline at end of file
diff --git a/templates.props b/templates.props
index 4674a7624..20d3b7192 100644
--- a/templates.props
+++ b/templates.props
@@ -39,4 +39,11 @@
     <None Include="$(PackageReadmePath)" Pack="true" PackagePath="" />
     <None Include="../LICENSE" Pack="true" PackagePath="" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MinVer">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/templates/templates.csproj b/templates/templates.csproj
index 2f489c768..4cb3d729c 100644
--- a/templates/templates.csproj
+++ b/templates/templates.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <PackageId>Duende.Templates</PackageId>
     <Description>Templates for Duende Identity Server and Duende BFF </Description>
     <PackageTags>dotnet-new;templates;duende;bff;</PackageTags>