diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index a379a87..91c3b84 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -79,7 +79,7 @@ pipelines:
           image: node:22
           script:
             - apt-get update && apt-get install -y curl jq git
-            - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+            - curl -LO "https://dl.k8s.io/release/v1.28.3/bin/linux/amd64/kubectl"
             - install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
             - echo $KUBE_CONFIG_PRD | base64 -d > kubeconfig
             - export KUBECONFIG=$(pwd)/kubeconfig
@@ -163,7 +163,7 @@ pipelines:
           image: node:22
           script:
             - apt-get update && apt-get install -y curl jq git
-            - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+            - curl -LO "https://dl.k8s.io/release/v1.28.3/bin/linux/amd64/kubectl"
             - install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
             - echo $KUBE_CONFIG_STG | base64 -d > kubeconfig
             - export KUBECONFIG=$(pwd)/kubeconfig
@@ -219,7 +219,7 @@ pipelines:
           image: node:22
           script:
             - apt-get update && apt-get install -y curl jq git
-            - curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+            - curl -LO "https://dl.k8s.io/release/v1.28.3/bin/linux/amd64/kubectl"
             - install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
             - echo $KUBE_CONFIG_STG | base64 -d > kubeconfig
             - export KUBECONFIG=$(pwd)/kubeconfig
diff --git a/k8s/applications/templates/argocd.yaml b/k8s/applications/templates/argocd.yaml
index 301c62a..5c396a2 100644
--- a/k8s/applications/templates/argocd.yaml
+++ b/k8s/applications/templates/argocd.yaml
@@ -12,13 +12,15 @@ spec:
     repoURL: 'git@bitbucket.org:jamkazam/video-iac.git'
     targetRevision: {{ .Values.gitBranch }}
   project: default
-  # syncPolicy:
-  #   automated: 
-  #     prune: true 
-  #     allowEmpty: false
-  #   retry:
-  #     limit: 5 
-  #     backoff:
-  #       duration: 5s 
-  #       factor: 2 
-  #       maxDuration: 3m 
\ No newline at end of file
+  syncPolicy:
+    syncOptions:
+      - ServerSideApply=true
+    # automated: 
+    #   prune: true 
+    #   allowEmpty: false
+    retry:
+      limit: 5 
+      backoff:
+        duration: 5s 
+        factor: 2 
+        maxDuration: 3m 
\ No newline at end of file
diff --git a/k8s/applications/templates/metrics-server.yaml b/k8s/applications/templates/metrics-server.yaml
index 85af1f2..9b667c4 100644
--- a/k8s/applications/templates/metrics-server.yaml
+++ b/k8s/applications/templates/metrics-server.yaml
@@ -30,6 +30,7 @@ spec:
   syncPolicy:
     syncOptions:
       - CreateNamespace=true 
+      - ServerSideApply=true
     automated: 
       prune: true 
       selfHeal: true