diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 84cd034..a379a87 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -53,7 +53,7 @@ pipelines:
             - pipe: atlassian/kubectl-run:3.1.2
               variables:
                 KUBE_CONFIG: $KUBE_CONFIG_PRD
-                KUBECTL_COMMAND: '-n argocd apply -k k8s/argocd/overlays/production'
+                KUBECTL_COMMAND: '-n argocd apply -k k8s/argocd/overlays/production --server-side --force-conflicts'
       - step:
           name: Push images
           image: google/cloud-sdk:alpine
@@ -137,7 +137,7 @@ pipelines:
             - pipe: atlassian/kubectl-run:3.1.2
               variables:
                 KUBE_CONFIG: $KUBE_CONFIG_STG
-                KUBECTL_COMMAND: '-n argocd apply -k k8s/argocd/overlays/staging'
+                KUBECTL_COMMAND: '-n argocd apply -k k8s/argocd/overlays/staging --server-side --force-conflicts'
       - step:
           name: Push images
           image: google/cloud-sdk:alpine
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index a453fed..98b8f2a 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -47,7 +47,7 @@ if [ "$ENVIRONMENT" == "staging" ]; then
 
   # Apply Kustomize
   echo "Applying Kustomize for staging..."
-  kubectl -n argocd apply -k k8s/argocd/overlays/staging
+  kubectl -n argocd apply -k k8s/argocd/overlays/staging --server-side --force-conflicts
 
   # Rollout restarts
   echo "Restarting coturn deployments..."
@@ -69,7 +69,7 @@ elif [ "$ENVIRONMENT" == "production" ]; then
 
   # Apply Kustomize
   echo "Applying Kustomize for production..."
-  kubectl -n argocd apply -k k8s/argocd/overlays/production
+  kubectl -n argocd apply -k k8s/argocd/overlays/production --server-side --force-conflicts
 
   # Rollout restarts
   echo "Restarting coturn deployments..."