diff --git a/app/portainer/components/forms/stack-redeploy-git-form/index.js b/app/portainer/components/forms/stack-redeploy-git-form/index.js
index 2372e8b58..a9db1dc96 100644
--- a/app/portainer/components/forms/stack-redeploy-git-form/index.js
+++ b/app/portainer/components/forms/stack-redeploy-git-form/index.js
@@ -7,6 +7,7 @@ export const stackRedeployGitForm = {
   bindings: {
     model: '<',
     stack: '<',
+    endpoint: '<',
   },
 };
 
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 abb70eb6c..273964a58 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
@@ -36,7 +36,7 @@
     explanation="These values will be used as substitutions in the stack file"
     on-change="($ctrl.onChangeEnvVar)"
   ></environment-variables-panel>
-  <option-panel ng-model="$ctrl.formValues.Option" on-change="($ctrl.onChangeOption)"></option-panel>
+  <option-panel ng-if="$ctrl.stack.Type === 1 && $ctrl.endpoint.apiVersion >= 1.27" ng-model="$ctrl.formValues.Option" on-change="($ctrl.onChangeOption)"></option-panel>
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.submit()"
diff --git a/app/portainer/components/option-panel/option-panel.html b/app/portainer/components/option-panel/option-panel.html
index b7564b9af..d52cea98c 100644
--- a/app/portainer/components/option-panel/option-panel.html
+++ b/app/portainer/components/option-panel/option-panel.html
@@ -6,7 +6,7 @@
     <div class="col-sm-12">
       <label class="control-label text-left">
         Prune services
-        <portainer-tooltip position="top" message="Prune services that are no longer referenced."></portainer-tooltip>
+        <portainer-tooltip position="'top'" message="'Prune services that are no longer referenced.'"></portainer-tooltip>
       </label>
       <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.ngModel.Prune" ng-change="$ctrl.switchPruneService()" /><i></i> </label>
     </div>
diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html
index 9f4997303..bd68213cf 100644
--- a/app/portainer/views/stacks/edit/stack.html
+++ b/app/portainer/views/stacks/edit/stack.html
@@ -111,6 +111,7 @@
                 model="stack.GitConfig"
                 stack="stack"
                 authorization="PortainerStackUpdate"
+                endpoint="applicationState.endpoint"
               >
               </stack-redeploy-git-form>
               <stack-duplication-form
@@ -189,7 +190,7 @@
                   <div class="col-sm-12">
                     <label for="prune" class="control-label text-left">
                       Prune services
-                      <portainer-tooltip message="'Prune services that are no longer referenced.'"></portainer-tooltip>
+                      <portainer-tooltip position="'top'" message="'Prune services that are no longer referenced.'"></portainer-tooltip>
                     </label>
                     <label class="switch" style="margin-left: 20px"> <input name="prune" type="checkbox" ng-model="formValues.Prune" /><i></i> </label>
                   </div>