diff --git a/build.cake b/build.cake
index 8dcdbe58f..d7e95baa9 100644
--- a/build.cake
+++ b/build.cake
@@ -174,11 +174,11 @@ Task("Package")
 Task("Publish")
     .IsDependentOn("PrePublish")
     .IsDependentOn("Publish-Windows")
-    .IsDependentOn("Publish-Windows-32bit")
-    .IsDependentOn("Publish-OSX")
-    .IsDependentOn("Publish-Linux")
-    .IsDependentOn("Publish-Linux-ARM")
-    .IsDependentOn("Publish-Linux-ARM-64Bit")
+//    .IsDependentOn("Publish-Windows-32bit")
+//    .IsDependentOn("Publish-OSX")
+//    .IsDependentOn("Publish-Linux")
+//    .IsDependentOn("Publish-Linux-ARM")
+//    .IsDependentOn("Publish-Linux-ARM-64Bit")
     .IsDependentOn("Package");
 
 Task("Publish-Windows")
diff --git a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
index d05b524d0..e6d1b70c3 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/OmbiAutomaticUpdater.cs
@@ -72,7 +72,7 @@ namespace Ombi.Schedule.Jobs.Ombi
             Logger.LogDebug(LoggingEvents.Updater, "Starting Update job");
 
             var settings = await Settings.GetSettingsAsync();
-            if (!settings.AutoUpdateEnabled)
+            if (!settings.AutoUpdateEnabled && !settings.TestMode)
             {
                 Logger.LogDebug(LoggingEvents.Updater, "Auto update is not enabled");
                 return;
diff --git a/src/Ombi/ClientApp/app/settings/update/update.component.html b/src/Ombi/ClientApp/app/settings/update/update.component.html
index 81dddacfd..5eacf5fde 100644
--- a/src/Ombi/ClientApp/app/settings/update/update.component.html
+++ b/src/Ombi/ClientApp/app/settings/update/update.component.html
@@ -5,8 +5,8 @@
     <fieldset>
         <legend>Update Settings</legend>
         <div class="form-group"  style="float: right">
-            <div *ngIf="updateAvailable">
-                <button (click)="update()" [disabled]="!enableUpdateButton || !form.value.testMode" class="btn btn-success-outline">Update</button>
+            <div *ngIf="updateAvailable || form.controls['testMode'].value">
+                <button (click)="update()" [disabled]="!enableUpdateButton || !form.controls['testMode'].value" class="btn btn-success-outline">Update</button>
             </div>
             <div *ngIf="!updateAvailable">
                 <button (click)="checkForUpdate()" class="btn btn-primary-outline">Check For Update</button>
diff --git a/src/Ombi/ClientApp/app/settings/update/update.component.ts b/src/Ombi/ClientApp/app/settings/update/update.component.ts
index df0e8b32e..b76c9ca22 100644
--- a/src/Ombi/ClientApp/app/settings/update/update.component.ts
+++ b/src/Ombi/ClientApp/app/settings/update/update.component.ts
@@ -63,7 +63,7 @@ export class UpdateComponent implements OnInit {
             this.notificationService.error("Please check your entered values");
             return;
         }
-        this.enableUpdateButton = form.value.autoUpdateEnabled;
+        this.enableUpdateButton = form.value.autoUpdateEnabled || form.value.testMode;
         this.settingsService.saveUpdateSettings(form.value)
             .subscribe(x => {
                 if (x) {