diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 500b9239..55170988 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -47,13 +47,13 @@ jobs:
       shell: bash
 
     - name: Publish
-      run: dotnet publish -c Debug -r ${{matrix.runtime}} /p:Version=${{ env.VERSION }}.${{ github.run_number }} -v m -o publish  ${{env.PROJECT_PATH}}
+      run: dotnet publish -c Release -r ${{matrix.runtime}} /p:Version=${{ env.VERSION }}.${{ github.run_number }} -v m -o publish  ${{env.PROJECT_PATH}}
       env:
         matrix.runtime: ${{ matrix.os == 'windows-latest' && 'win-x64' || matrix.os == 'ubuntu-latest' && 'linux-x64' || 'osx-x64' }}
 
     - name: Run Tests
       continue-on-error: true
-      run: dotnet test -c Debug -r ${{matrix.runtime}} --verbosity normal  ${{env.SOLUTION_PATH}} 
+      run: dotnet test -c Release -r ${{matrix.runtime}} --verbosity normal  ${{env.SOLUTION_PATH}} 
       env:
         matrix.runtime: ${{ matrix.os == 'windows-latest' && 'win-x64' || matrix.os == 'ubuntu-latest' && 'linux-x64' || 'osx-x64' }}
 
diff --git a/src/Angor.Test/Angor.Test.csproj b/src/Angor.Test/Angor.Test.csproj
index c6a9c380..02195e48 100644
--- a/src/Angor.Test/Angor.Test.csproj
+++ b/src/Angor.Test/Angor.Test.csproj
@@ -22,7 +22,7 @@
     <PackageReference Include="xunit" Version="2.9.2" />
 
     <PackageReference Include="Blockcore.Core" Version="1.2.42" />
-    <PackageReference Include="NBitcoin" Version="7.0.25" />
+    <PackageReference Include="NBitcoin" Version="7.0.46" />
 
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Angor.Test/DataBuilders/AngorScripts.cs b/src/Angor.Test/DataBuilders/AngorScripts.cs
index 98c9b6fa..7df1679e 100644
--- a/src/Angor.Test/DataBuilders/AngorScripts.cs
+++ b/src/Angor.Test/DataBuilders/AngorScripts.cs
@@ -27,8 +27,7 @@ public static Script CreateControlBlock(ProjectScripts scripts, Expression<Func<
 
             var script = func.Compile().Invoke(scripts);
             
-            ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(script.ToBytes()),
-                (byte)TaprootConstants.TAPROOT_LEAF_TAPSCRIPT);
+            ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(script.ToBytes()).ToTapScript(TapLeafVersion.C0));
 
             return new Script(controlBlock.ToBytes());
         }
@@ -81,8 +80,7 @@ public static (Script controlBlock, Script execute, Script[] secrets) CreateCont
                 throw new Exception("no secret found that matches the given scripts");
             }
 
-            ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(execute.ToBytes()),
-                (byte)TaprootConstants.TAPROOT_LEAF_TAPSCRIPT);
+            ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(execute.ToBytes()).ToTapScript(TapLeafVersion.C0));
 
             return (new Script(controlBlock.ToBytes()), execute, secretHashes.ToArray());
         }
@@ -94,7 +92,12 @@ private static TaprootSpendInfo BuildTaprootSpendInfo(ProjectScripts scripts)
 
             var scriptWeights = BuildTaprootScripts(scripts);
 
-            var treeInfo = TaprootSpendInfo.WithHuffmanTree(taprootKey, scriptWeights.ToArray());
+            // Transform the scripts to TapScript format
+            var tapScriptWeights = scriptWeights
+                .Select(sw => (sw.Item1, sw.Item2.ToTapScript(TapLeafVersion.C0)))
+                .ToList();
+
+            var treeInfo = TaprootSpendInfo.WithHuffmanTree(taprootKey, tapScriptWeights.ToArray());
 
             return treeInfo;
         }
diff --git a/src/Angor.Test/DataBuilders/InvestmentOperations.cs b/src/Angor.Test/DataBuilders/InvestmentOperations.cs
index c94f2b1c..3204869d 100644
--- a/src/Angor.Test/DataBuilders/InvestmentOperations.cs
+++ b/src/Angor.Test/DataBuilders/InvestmentOperations.cs
@@ -204,7 +204,7 @@ public Transaction SpendFounderStage(Network network, FounderContext context, in
 
             var allSpendingOutputs = signingContext.Select(s => s.spendingOutput.TxOut).ToArray();
             var trxData = spender.PrecomputeTransactionData(allSpendingOutputs); 
-            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.TaprootV1LeafHash) { SigHash = sighash };
+            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.ToTapScript(TapLeafVersion.C0).LeafHash) { SigHash = sighash };
             var hash = spender.GetSignatureHashTaproot(trxData, execData);
 
             var key = new Key(Encoders.Hex.DecodeData(founderPrivateKey));
@@ -287,7 +287,7 @@ public List<string> FounderSignInvestorRecoveryTransactions(InvestorContext cont
             
             var hash = stageTransaction.GetSignatureHashTaproot(new[] { investmentTransaction.Outputs[i+2] },
                 new TaprootExecutionData(0, 
-                        new NBitcoin.Script(scriptStages.Recover.ToBytes()).TaprootV1LeafHash)
+                        new NBitcoin.Script(scriptStages.Recover.ToBytes()).ToTapScript(TapLeafVersion.C0).LeafHash)
                     { SigHash = sigHash });
 
             
@@ -329,7 +329,7 @@ public void AddWitScriptToInvestorRecoveryTransactions(InvestorContext context,
 
             var hash = stageTransaction.GetSignatureHashTaproot(new[] { investmentTransaction.Outputs[index + 2] },
                 new TaprootExecutionData(0,
-                        new NBitcoin.Script(projectScripts.Recover.ToBytes()).TaprootV1LeafHash)
+                        new NBitcoin.Script(projectScripts.Recover.ToBytes()).ToTapScript(TapLeafVersion.C0).LeafHash)
                     { SigHash = sigHash });
             
             var investorSignature = key.SignTaprootKeySpend(hash, sigHash);
@@ -446,7 +446,7 @@ public Transaction RecoverEndOfProjectFunds(Network network, InvestorContext con
 
             var allSpendingOutputs = signingContext.Select(s => s.spendingOutput.TxOut).ToArray();
             var trxData = spender.PrecomputeTransactionData(allSpendingOutputs);
-            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.TaprootV1LeafHash) { SigHash = sighash };
+            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.ToTapScript(TapLeafVersion.C0).LeafHash) { SigHash = sighash };
             var hash = spender.GetSignatureHashTaproot(trxData, execData);
 
             var key = new Key(Encoders.Hex.DecodeData(investorPrivateKey));
@@ -566,7 +566,7 @@ public Transaction RecoverFundsNoPenalty(Network network, InvestorContext contex
 
             var allSpendingOutputs = signingContext.Select(s => s.spendingOutput.TxOut).ToArray();
             var trxData = spender.PrecomputeTransactionData(allSpendingOutputs);
-            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.TaprootV1LeafHash) { SigHash = sighash };
+            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.ToTapScript(TapLeafVersion.C0).LeafHash) { SigHash = sighash };
             var hash = spender.GetSignatureHashTaproot(trxData, execData);
 
             var key = new Key(Encoders.Hex.DecodeData(investorPrivateKey));
diff --git a/src/Angor/Client/Angor.Client.csproj b/src/Angor/Client/Angor.Client.csproj
index fa6ed8c1..3497b235 100644
--- a/src/Angor/Client/Angor.Client.csproj
+++ b/src/Angor/Client/Angor.Client.csproj
@@ -11,7 +11,7 @@
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
     <PackageReference Include="Blockcore.Core" Version="1.2.42" />
     <PackageReference Include="HtmlAgilityPack" Version="1.11.71" />
-    <PackageReference Include="NBitcoin" Version="7.0.25" />
+    <PackageReference Include="NBitcoin" Version="7.0.46" />
     <PackageReference Include="Nostr.Client" Version="2.0.0" />
     <PackageReference Include="System.Text.Json" Version="9.0.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
diff --git a/src/Angor/Shared/Angor.Shared.csproj b/src/Angor/Shared/Angor.Shared.csproj
index 59b5ccde..1f948dbd 100644
--- a/src/Angor/Shared/Angor.Shared.csproj
+++ b/src/Angor/Shared/Angor.Shared.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Blockcore.Core" Version="1.2.42" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
-    <PackageReference Include="NBitcoin" Version="7.0.25" />
+    <PackageReference Include="NBitcoin" Version="7.0.46" />
     <PackageReference Include="Nostr.Client" Version="2.0.0" />
   </ItemGroup>
 
diff --git a/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs b/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs
index 25e63d92..0bf7c039 100644
--- a/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs
+++ b/src/Angor/Shared/ProtocolNew/FounderTransactionActions.cs
@@ -62,7 +62,9 @@ public SignatureInfo SignInvestorRecoveryTransactions(ProjectInfo projectInfo, s
         {
             var scriptStages = _investmentScriptBuilder.BuildProjectScriptsForStage(projectInfo, investorKey, stageIndex, secretHash);
 
-            var execData = new TaprootExecutionData(stageIndex, new NBitcoin.Script(scriptStages.Recover.ToBytes()).TaprootV1LeafHash) { SigHash = sigHash };
+            var tapScript = new NBitcoin.Script(scriptStages.Recover.ToBytes()).ToTapScript(TapLeafVersion.C0);
+
+            var execData = new TaprootExecutionData(stageIndex, tapScript.LeafHash) { SigHash = sigHash };
             var hash = nbitcoinRecoveryTransaction.GetSignatureHashTaproot(outputs, execData);
 
             var sig = key.SignTaprootKeySpend(hash, sigHash).ToString();
@@ -123,8 +125,10 @@ public TransactionInfo SpendFounderStage(ProjectInfo projectInfo, IEnumerable<st
         {
             var scriptToExecute = new NBitcoin.Script(input.WitScript[1]);
             var controlBlock = input.WitScript[2];
-            
-            var execData = new TaprootExecutionData(inputIndex, scriptToExecute.TaprootV1LeafHash) { SigHash = sigHash };
+
+            var tapScript = scriptToExecute.ToTapScript(TapLeafVersion.C0);
+
+            var execData = new TaprootExecutionData(inputIndex, tapScript.LeafHash) { SigHash = sigHash };
             var hash = spendingTransaction.GetSignatureHashTaproot(trxData, execData);
             
             var sig = key.SignTaprootKeySpend(hash, sigHash);
diff --git a/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs b/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs
index 4378d493..83ae9f43 100644
--- a/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs
+++ b/src/Angor/Shared/ProtocolNew/InvestorTransactionActions.cs
@@ -246,7 +246,9 @@ public Transaction AddSignaturesToRecoverSeederFundsTransaction(ProjectInfo proj
             var scriptStages = _investmentScriptBuilder.BuildProjectScriptsForStage(projectInfo, investorKey, stageIndex, secretHash);
             var controlBlock = _taprootScriptBuilder.CreateControlBlock(scriptStages, _ => _.Recover);
 
-            var execData = new TaprootExecutionData(stageIndex, new NBitcoin.Script(scriptStages.Recover.ToBytes()).TaprootV1LeafHash) { SigHash = sigHash };
+            var tapScript = new NBitcoin.Script(scriptStages.Recover.ToBytes()).ToTapScript(TapLeafVersion.C0);
+
+            var execData = new TaprootExecutionData(stageIndex, tapScript.LeafHash) { SigHash = sigHash };
             var hash = nbitcoinRecoveryTransaction.GetSignatureHashTaproot(outputs, execData);
 
             _logger.LogInformation($"project={projectInfo.ProjectIdentifier}; investor-pubkey={key.PubKey.ToHex()}; stage={stageIndex}; hash={hash}");
@@ -290,7 +292,9 @@ public bool CheckInvestorRecoverySignatures(ProjectInfo projectInfo, Transaction
         {
             var scriptStages = _investmentScriptBuilder.BuildProjectScriptsForStage(projectInfo, investorKey, stageIndex, secretHash);
 
-            var execData = new TaprootExecutionData(stageIndex, new NBitcoin.Script(scriptStages.Recover.ToBytes()).TaprootV1LeafHash) { SigHash = sigHash };
+            var tapScript = new NBitcoin.Script(scriptStages.Recover.ToBytes()).ToTapScript(TapLeafVersion.C0);
+
+            var execData = new TaprootExecutionData(stageIndex, tapScript.LeafHash) { SigHash = sigHash };
             var hash = nBitcoinRecoveryTransaction.GetSignatureHashTaproot(outputs, execData);
             var sig = founderSignatures.Signatures.First(f => f.StageIndex == stageIndex).Signature;
 
diff --git a/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs b/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs
index 4365cf29..a820c479 100644
--- a/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs
+++ b/src/Angor/Shared/ProtocolNew/Scripts/TaprootScriptBuilder.cs
@@ -25,8 +25,7 @@ public Script CreateControlBlock(ProjectScripts scripts, Expression<Func<Project
 
         var script = scriptSelector.Compile().Invoke(scripts);
             
-        ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(script.ToBytes()),
-            (byte)TaprootConstants.TAPROOT_LEAF_TAPSCRIPT);
+        ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(script.ToBytes()).ToTapScript(TapLeafVersion.C0));
 
         return new Script(controlBlock.ToBytes());
     }
@@ -79,8 +78,7 @@ public Script CreateControlBlock(ProjectScripts scripts, Expression<Func<Project
             throw new Exception("no secret found that matches the given scripts");
         }
 
-        ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(execute.ToBytes()),
-            (byte)TaprootConstants.TAPROOT_LEAF_TAPSCRIPT);
+        ControlBlock controlBlock = treeInfo.GetControlBlock(new NBitcoin.Script(execute.ToBytes()).ToTapScript(TapLeafVersion.C0));
 
         return (new Script(controlBlock.ToBytes()), execute, secretHashes.ToArray());
     }
@@ -91,7 +89,12 @@ private static TaprootSpendInfo BuildTaprootSpendInfo(ProjectScripts scripts)
 
         var scriptWeights = BuildTaprootScripts(scripts);
 
-        var treeInfo = TaprootSpendInfo.WithHuffmanTree(taprootKey, scriptWeights.ToArray());
+        // Transform the scripts to TapScript format
+        var tapScriptWeights = scriptWeights
+            .Select(sw => (sw.Item1, sw.Item2.ToTapScript(TapLeafVersion.C0)))
+            .ToList();
+
+        var treeInfo = TaprootSpendInfo.WithHuffmanTree(taprootKey, tapScriptWeights.ToArray());
 
         return treeInfo;
     }
diff --git a/src/Angor/Shared/ProtocolNew/SeederTransactionActions.cs b/src/Angor/Shared/ProtocolNew/SeederTransactionActions.cs
index 54854f01..63080df8 100644
--- a/src/Angor/Shared/ProtocolNew/SeederTransactionActions.cs
+++ b/src/Angor/Shared/ProtocolNew/SeederTransactionActions.cs
@@ -82,7 +82,9 @@ public Transaction AddSignaturesToRecoverSeederFundsTransaction(ProjectInfo proj
 
             var controlBlock = _taprootScriptBuilder.CreateControlBlock(projectScripts, _ => _.Recover);
 
-            var execData = new TaprootExecutionData(stageIndex, new NBitcoin.Script(projectScripts.Recover.ToBytes()).TaprootV1LeafHash) { SigHash = sigHash };
+            var tapScript = new NBitcoin.Script(projectScripts.Recover.ToBytes()).ToTapScript(TapLeafVersion.C0);
+
+            var execData = new TaprootExecutionData(stageIndex, tapScript.LeafHash) { SigHash = sigHash };
             var hash = nbitcoinRecoveryTransaction.GetSignatureHashTaproot(outputs, execData);
 
             _logger.LogInformation($"project={projectInfo.ProjectIdentifier}; seeder-pubkey={key.PubKey.ToHex()}; stage={stageIndex}; hash={hash}");
diff --git a/src/Angor/Shared/ProtocolNew/TransactionBuilders/SpendingTransactionBuilder.cs b/src/Angor/Shared/ProtocolNew/TransactionBuilders/SpendingTransactionBuilder.cs
index a68ce9d8..6f975b17 100644
--- a/src/Angor/Shared/ProtocolNew/TransactionBuilders/SpendingTransactionBuilder.cs
+++ b/src/Angor/Shared/ProtocolNew/TransactionBuilders/SpendingTransactionBuilder.cs
@@ -77,7 +77,7 @@ public TransactionInfo BuildRecoverInvestorRemainingFundsInProject(string invest
                     input.WitScript[input.WitScript.PushCount - 2]); //control block is the last and execute one before it
 
             var hash = spendingTrx.GetSignatureHashTaproot(trxData,
-                new TaprootExecutionData(inputIndex, scriptToExecute.TaprootV1LeafHash) { SigHash = sigHash });
+                new TaprootExecutionData(inputIndex, scriptToExecute.ToTapScript(TapLeafVersion.C0).LeafHash) { SigHash = sigHash });
 
             var sig = key.SignTaprootKeySpend(hash, sigHash);