diff --git a/api/http/handler/stacks/stack_update.go b/api/http/handler/stacks/stack_update.go
index 517ea2f76..2a757dc53 100644
--- a/api/http/handler/stacks/stack_update.go
+++ b/api/http/handler/stacks/stack_update.go
@@ -49,7 +49,7 @@ func (payload *updateSwarmStackPayload) Validate(r *http.Request) error {
 
 // @id StackUpdate
 // @summary Update a stack
-// @description Update a stack.
+// @description Update a stack, only for file based stacks.
 // @description **Access policy**: authenticated
 // @tags stacks
 // @security ApiKeyAuth
@@ -123,6 +123,15 @@ func (handler *Handler) stackUpdate(w http.ResponseWriter, r *http.Request) *htt
 		}
 	}
 
+	// Must not be git based stack. stop the auto update job if there is any
+	if stack.AutoUpdate != nil {
+		stopAutoupdate(stack.ID, stack.AutoUpdate.JobID, *handler.Scheduler)
+		stack.AutoUpdate = nil
+	}
+	if stack.GitConfig != nil {
+		stack.FromAppTemplate = true
+	}
+
 	updateError := handler.updateAndDeployStack(r, stack, endpoint)
 	if updateError != nil {
 		return updateError
diff --git a/app/portainer/services/modal.service/confirm.ts b/app/portainer/services/modal.service/confirm.ts
index eb4655b05..e56fa2dd7 100644
--- a/app/portainer/services/modal.service/confirm.ts
+++ b/app/portainer/services/modal.service/confirm.ts
@@ -115,6 +115,21 @@ export function confirmDeletion(message: string, callback: ConfirmCallback) {
   });
 }
 
+export function confirmDetachment(message: string, callback: ConfirmCallback) {
+  const messageSanitized = sanitize(message);
+  confirm({
+    title: 'Are you sure ?',
+    message: messageSanitized,
+    buttons: {
+      confirm: {
+        label: 'Detach',
+        className: 'btn-danger',
+      },
+    },
+    callback,
+  });
+}
+
 export function confirmDeassociate(callback: ConfirmCallback) {
   const message =
     '<p>De-associating this Edge environment will mark it as non associated and will clear the registered Edge ID.</p>' +
diff --git a/app/portainer/services/modal.service/index.ts b/app/portainer/services/modal.service/index.ts
index b27596d65..95ff58ff1 100644
--- a/app/portainer/services/modal.service/index.ts
+++ b/app/portainer/services/modal.service/index.ts
@@ -7,6 +7,7 @@ import {
   confirmAsync,
   confirmDeassociate,
   confirmDeletion,
+  confirmDetachment,
   confirmDeletionAsync,
   confirmEndpointSnapshot,
   confirmImageExport,
@@ -45,6 +46,7 @@ export function ModalServiceAngular() {
     confirmImageForceRemoval,
     cancelRegistryRepositoryAction,
     confirmDeletion,
+    confirmDetachment,
     confirmDeassociate,
     confirmUpdate,
     confirmRedeploy,
diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html
index 985b1f083..3467c03bd 100644
--- a/app/portainer/views/stacks/edit/stack.html
+++ b/app/portainer/views/stacks/edit/stack.html
@@ -71,6 +71,18 @@
                     <i class="fa fa-plus space-right" aria-hidden="true"></i>
                     Create template from stack
                   </button>
+                  <button
+                    authorization="PortainerStackUpdate"
+                    ng-if="regular && stackFileContent && !stack.FromAppTemplate && stack.GitConfig"
+                    ng-disabled="state.actionInProgress"
+                    ng-click="detachStackFromGit()"
+                    button-spinner="state.actionInProgress"
+                    class="btn btn-primary btn-xs"
+                  >
+                    <i class="fa fa-arrow-right space-right" aria-hidden="true"></i>
+                    <span ng-hide="state.actionInProgress">Detach from Git</span>
+                    <span ng-show="state.actionInProgress">Detachment in progress...</span>
+                  </button>
                 </div>
               </div>
               <!-- !stack-details -->
@@ -101,8 +113,12 @@
                 </form>
               </div>
               <!-- !associate -->
-
-              <stack-redeploy-git-form ng-if="stack.GitConfig && !stack.FromAppTemplate" model="stack.GitConfig" stack="stack" authorization="PortainerStackUpdate">
+              <stack-redeploy-git-form
+                ng-if="stack.GitConfig && !stack.FromAppTemplate && !state.actionInProgress"
+                model="stack.GitConfig"
+                stack="stack"
+                authorization="PortainerStackUpdate"
+              >
               </stack-redeploy-git-form>
               <stack-duplication-form
                 ng-if="regular && endpoints.length > 0"
diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js
index d7e2d3c96..d1c728d3c 100644
--- a/app/portainer/views/stacks/edit/stackController.js
+++ b/app/portainer/views/stacks/edit/stackController.js
@@ -137,6 +137,15 @@ angular.module('portainer.app').controller('StackController', [
       });
     };
 
+    $scope.detachStackFromGit = function () {
+      ModalService.confirmDetachment('Do you want to detach the stack from Git?', function onConfirm(confirmed) {
+        if (!confirmed) {
+          return;
+        }
+        $scope.deployStack();
+      });
+    };
+
     function migrateStack(name, targetEndpointId) {
       const stack = $scope.stack;
 
diff --git a/helm b/helm
new file mode 100755
index 000000000..523b9eee4
Binary files /dev/null and b/helm differ