diff --git a/api/go.sum b/api/go.sum
index 4c4f8089b..a700e5a31 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -600,8 +600,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/portainer/docker-compose-wrapper v0.0.0-20210909083948-8be0d98451a1 h1:0ZGSu3Atz7RHMDsoITHV676igRfsb51mlgELGo37ELU=
-github.com/portainer/docker-compose-wrapper v0.0.0-20210909083948-8be0d98451a1/go.mod h1:WxDlJWZxCnicdLCPnLNEv7/gRhjeIVuCGmsv+iOPH3c=
 github.com/portainer/docker-compose-wrapper v0.0.0-20211018221743-10a04c9d4f19 h1:tG2gU4mkm5yElj35XpU3lgllOYQxN3kaM1Jab7AqTDs=
 github.com/portainer/docker-compose-wrapper v0.0.0-20211018221743-10a04c9d4f19/go.mod h1:WxDlJWZxCnicdLCPnLNEv7/gRhjeIVuCGmsv+iOPH3c=
 github.com/portainer/libcrypto v0.0.0-20210422035235-c652195c5c3a h1:qY8TbocN75n5PDl16o0uVr5MevtM5IhdwSelXEd4nFM=
diff --git a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.controller.js b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.controller.js
index 9025ab0df..560ff220f 100644
--- a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.controller.js
+++ b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.controller.js
@@ -1,3 +1,5 @@
+import { FORCE_REDEPLOYMENT } from '@/portainer/feature-flags/feature-ids';
+
 class GitFormAutoUpdateFieldsetController {
   /* @ngInject */
   constructor(clipboard) {
@@ -5,6 +7,8 @@ class GitFormAutoUpdateFieldsetController {
     this.onChangeMechanism = this.onChangeField('RepositoryMechanism');
     this.onChangeInterval = this.onChangeField('RepositoryFetchInterval');
     this.clipboard = clipboard;
+
+    this.limitedFeature = FORCE_REDEPLOYMENT;
   }
 
   copyWebhook() {
diff --git a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
index 000b68e0f..b9d8d3a21 100644
--- a/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
+++ b/app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html
@@ -1,12 +1,12 @@
 <ng-form name="autoUpdateForm">
   <div class="form-group">
     <div class="col-sm-12">
-      <por-switch-field name="autoUpdate" ng-model="$ctrl.model.RepositoryAutomaticUpdates" label="Automatic updates" on-change="($ctrl.onChangeAutoUpdate)"></por-switch-field>
+      <por-switch-field name="autoUpdate" ng-model="$ctrl.model.RepositoryAutomaticUpdates" label="Automatic Updates" on-change="($ctrl.onChangeAutoUpdate)"></por-switch-field>
     </div>
   </div>
   <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
     <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-    <span class="text-muted">Any changes to this stack made locally in Portainer will be overriden by the definition in git and may cause service interruption.</span>
+    <span class="text-muted">Any changes to this stack made locally in Portainer will be overriden by an updated git definition, which may cause service interruption.</span>
   </div>
   <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
     <label for="repository_mechanism" class="col-sm-1 control-label text-left">
@@ -57,6 +57,15 @@
       />
     </div>
   </div>
+  <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
+    <div class="col-sm-12">
+      <por-switch-field name="forceUpdate" feature="$ctrl.limitedFeature" ng-model="$ctrl.model.RepositoryAutomaticUpdatesForce" label="Force Redeployment"></por-switch-field>
+    </div>
+  </div>
+  <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
+    <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+    <span class="text-muted">Any changes to this stack made locally in Portainer will be overriden by the current git definition and may cause service interruption.</span>
+  </div>
   <div class="form-group col-md-12" ng-show="autoUpdateForm.repository_fetch_interval.$touched && autoUpdateForm.repository_fetch_interval.$invalid">
     <div class="small text-warning">
       <div ng-messages="autoUpdateForm.repository_fetch_interval.$error">
diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
index 9fd397d72..d6caf7cc7 100644
--- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
+++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js
@@ -34,6 +34,7 @@ class KubernetesRedeployAppGitFormController {
 
     this.onChange = this.onChange.bind(this);
     this.onChangeRef = this.onChangeRef.bind(this);
+    this.onChangeAutoUpdate = this.onChangeAutoUpdate.bind(this);
   }
 
   onChangeRef(value) {
@@ -48,6 +49,15 @@ class KubernetesRedeployAppGitFormController {
     this.state.hasUnsavedChanges = angular.toJson(this.savedFormValues) !== angular.toJson(this.formValues);
   }
 
+  onChangeAutoUpdate(values) {
+    this.onChange({
+      AutoUpdate: {
+        ...this.formValues.AutoUpdate,
+        ...values,
+      },
+    });
+  }
+
   buildAnalyticsProperties() {
     const metadata = {
       'automatic-updates': automaticUpdatesLabel(this.formValues.AutoUpdate.RepositoryAutomaticUpdates, this.formValues.AutoUpdate.RepositoryMechanism),
diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
index f2fca4db1..17861006c 100644
--- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
+++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
@@ -9,7 +9,7 @@
       </p>
     </div>
   </div>
-  <git-form-auto-update-fieldset model="$ctrl.formValues.AutoUpdate" on-change="($ctrl.onChange)"></git-form-auto-update-fieldset>
+  <git-form-auto-update-fieldset model="$ctrl.formValues.AutoUpdate" on-change="($ctrl.onChangeAutoUpdate)"></git-form-auto-update-fieldset>
   <div class="form-group">
     <div class="col-sm-12">
       <p>
@@ -36,7 +36,6 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.pullAndRedeployApplication()"
-    ng-if="!$ctrl.formValues.AutoUpdate.RepositoryAutomaticUpdates"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges|| !$ctrl.redeployGitForm.$valid"
     style="margin-top: 7px; margin-left: 0;"
     button-spinner="$ctrl.state.redeployInProgress"
diff --git a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
index 42302491d..88260ad0a 100644
--- a/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
+++ b/app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
@@ -38,8 +38,7 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.submit()"
-    ng-if="!$ctrl.formValues.AutoUpdate.RepositoryAutomaticUpdates"
-    ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid || ($ctrl.formValues.RepositoryAuthentication && !$ctrl.formValues.RepositoryPassword)"
+    ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid"
     style="margin-top: 7px; margin-left: 0;"
     button-spinner="$ctrl.state.redeployInProgress"
     analytics-on
diff --git a/app/portainer/feature-flags/feature-flags.service.js b/app/portainer/feature-flags/feature-flags.service.js
index 6512f7a74..274248a64 100644
--- a/app/portainer/feature-flags/feature-flags.service.js
+++ b/app/portainer/feature-flags/feature-flags.service.js
@@ -29,6 +29,7 @@ export function featureService() {
       [FEATURE_IDS.REGISTRY_MANAGEMENT]: EDITIONS.BE,
       [FEATURE_IDS.S3_BACKUP_SETTING]: EDITIONS.BE,
       [FEATURE_IDS.TEAM_MEMBERSHIP]: EDITIONS.BE,
+      [FEATURE_IDS.FORCE_REDEPLOYMENT]: EDITIONS.BE,
     };
 
     state.currentEdition = currentEdition;
diff --git a/app/portainer/feature-flags/feature-ids.js b/app/portainer/feature-flags/feature-ids.js
index f116606f3..13cc4b95a 100644
--- a/app/portainer/feature-flags/feature-ids.js
+++ b/app/portainer/feature-flags/feature-ids.js
@@ -9,3 +9,4 @@ export const TEAM_MEMBERSHIP = 'team-membership';
 export const HIDE_INTERNAL_AUTH = 'hide-internal-auth';
 export const EXTERNAL_AUTH_LDAP = 'external-auth-ldap';
 export const ACTIVITY_AUDIT = 'activity-audit';
+export const FORCE_REDEPLOYMENT = 'force-redeployment';