diff --git a/src/vpk/Velopack.Build/MSBuildLogger.cs b/src/vpk/Velopack.Build/MSBuildLogger.cs
index 865ae9de..8bc63207 100644
--- a/src/vpk/Velopack.Build/MSBuildLogger.cs
+++ b/src/vpk/Velopack.Build/MSBuildLogger.cs
@@ -29,7 +29,7 @@ public class MSBuildLogger(TaskLoggingHelper loggingHelper) : ILogger, IFancyCon
         try {
             await fn(x => { }).ConfigureAwait(false);
         } catch (Exception ex) {
-            this.LogError(ex, "Error running task {0}", name);
+            this.LogError(ex, "Error running task {taskName}", name);
             throw;
         }
     }
@@ -39,7 +39,7 @@ public class MSBuildLogger(TaskLoggingHelper loggingHelper) : ILogger, IFancyCon
         try {
             return await fn(x => { }).ConfigureAwait(false);
         } catch (Exception ex) {
-            this.LogError(ex, "Error running task {0}", name);
+            this.LogError(ex, "Error running task {taskName}", name);
             throw;
         }
     }
diff --git a/src/vpk/Velopack.Build/PublishTask.cs b/src/vpk/Velopack.Build/PublishTask.cs
index 293f5105..7c78419f 100644
--- a/src/vpk/Velopack.Build/PublishTask.cs
+++ b/src/vpk/Velopack.Build/PublishTask.cs
@@ -1,4 +1,5 @@
-using System.Threading;
+using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
@@ -17,17 +18,19 @@ public class PublishTask : MSBuildAsyncTask
 
     public string? ApiKey { get; set; }
 
-    public double Timeout { get; set; } = 30d;
+    public string? Timeout { get; set; }
 
     public bool WaitForLive { get; set; }
 
     protected override async Task<bool> ExecuteAsync(CancellationToken cancellationToken)
     {
+        TimeSpan timeout = Timeout == null ? TimeSpan.FromMinutes(30) : TimeSpan.Parse(Timeout);
+
         //System.Diagnostics.Debugger.Launch();
         var options = new VelopackFlowServiceOptions {
             VelopackBaseUrl = ServiceUrl,
             ApiKey = ApiKey,
-            Timeout = Timeout,
+            Timeout = timeout,
         };
 
         var loginOptions = new VelopackFlowLoginOptions() {
@@ -37,8 +40,7 @@ public class PublishTask : MSBuildAsyncTask
         };
 
         var client = new VelopackFlowServiceClient(options, Logger, Logger);
-        CancellationToken token = CancellationToken.None;
-        if (!await client.LoginAsync(loginOptions, false, token)) {
+        if (!await client.LoginAsync(loginOptions, false, cancellationToken).ConfigureAwait(false)) {
             Logger.LogWarning("Not logged into Velopack Flow service, skipping publish. Please run vpk login.");
             return true;
         }
diff --git a/src/vpk/Velopack.Build/Velopack.Build.targets b/src/vpk/Velopack.Build/Velopack.Build.targets
index add61e71..329f91b5 100644
--- a/src/vpk/Velopack.Build/Velopack.Build.targets
+++ b/src/vpk/Velopack.Build/Velopack.Build.targets
@@ -23,6 +23,8 @@
       <VelopackPackAuthors Condition="'$(VelopackPackAuthors)' == ''">$(Authors)</VelopackPackAuthors>
       <VelopackTargetRuntime Condition="'$(VelopackTargetRuntime)' == ''">$(RuntimeIdentifier)</VelopackTargetRuntime>
       <VelopackShortcuts Condition="'$(VelopackShortcuts)' == ''">Desktop,StartMenuRoot</VelopackShortcuts>
+      <VelopackHttpTimeout Condition="'$(VelopackHttpTimeout)' == ''">00:30:00</VelopackHttpTimeout>
+      <VelopackWaitForLive Condition="'$(VelopackWaitForLive)' == ''">false</VelopackWaitForLive>
 
       <!-- Allows a cross platform app (eg. Avalonia) to specify all three via csproj and have them applied correctly -->
       <!-- TODO: this should probably switch based on the target RID and not the current OS, but we currently don't 
@@ -100,6 +102,8 @@
       ServiceUrl="$(VelopackFlowServiceUrl)"
       ApiKey="$(VelopackFlowApiKey)"
       Channel="$(VelopackChannel)"
+      Timeout="$(VelopackHttpTimeout)"
+      WaitForLive="$(VelopackWaitForLive)"
     />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/vpk/Velopack.Flow/VelopackFlowServiceClient.cs b/src/vpk/Velopack.Flow/VelopackFlowServiceClient.cs
index 788629d5..69d83e35 100644
--- a/src/vpk/Velopack.Flow/VelopackFlowServiceClient.cs
+++ b/src/vpk/Velopack.Flow/VelopackFlowServiceClient.cs
@@ -52,7 +52,7 @@ public class VelopackFlowServiceClient(
 
         var client = new HttpClient(handler);
         client.DefaultRequestHeaders.Authorization = Authorization;
-        client.Timeout = TimeSpan.FromMinutes(Options.Timeout);
+        client.Timeout = Options.Timeout;
         return client;
     }
 
diff --git a/src/vpk/Velopack.Flow/VelopackFlowServiceOptions.cs b/src/vpk/Velopack.Flow/VelopackFlowServiceOptions.cs
index 2b6cd2bd..2baaa957 100644
--- a/src/vpk/Velopack.Flow/VelopackFlowServiceOptions.cs
+++ b/src/vpk/Velopack.Flow/VelopackFlowServiceOptions.cs
@@ -6,5 +6,5 @@ public class VelopackFlowServiceOptions
 
     public string? ApiKey { get; set; } = string.Empty;
     
-    public double Timeout { get; set; } = 30d;
+    public TimeSpan Timeout { get; set; } = TimeSpan.FromMinutes(30);
 }
\ No newline at end of file
diff --git a/src/vpk/Velopack.Vpk/OptionMapper.cs b/src/vpk/Velopack.Vpk/OptionMapper.cs
index b71674c0..43a9dda9 100644
--- a/src/vpk/Velopack.Vpk/OptionMapper.cs
+++ b/src/vpk/Velopack.Vpk/OptionMapper.cs
@@ -53,6 +53,7 @@ public static partial class OptionMapper
 
     public static partial DeltaPatchOptions ToOptions(this DeltaPatchCommand cmd);
 
+    [MapperIgnoreTarget(nameof(LocalDownloadOptions.Timeout))]
     public static partial LoginOptions ToOptions(this LoginCommand cmd);
 
     public static partial LogoutOptions ToOptions(this LogoutCommand cmd);