diff --git a/.github/workflows/on_pull-request_docs.yaml b/.github/workflows/on_pull-request_docs.yaml
index 8fd52d0d..687997f0 100644
--- a/.github/workflows/on_pull-request_docs.yaml
+++ b/.github/workflows/on_pull-request_docs.yaml
@@ -24,4 +24,4 @@ jobs:
         run: ./earthly.sh +rebuild-docs
 
       - name: verify that the checked in file has not changed
-        run: ./hacks/exit-on-changed-files.sh "Please run './earthly +rebuild-docs' and commit the results to this PR"
+        run: ./hacks/exit-on-changed-files.sh "Please run './earthly.sh +rebuild-docs' and commit the results to this PR"
diff --git a/cmd/root.go b/cmd/root.go
index 759f8710..a44fab37 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -119,6 +119,10 @@ func init() {
 		newStringOpts().
 			withDefault("kubechecks again"))
 
+	boolFlag(flags, "server-side-diff", "Enable server-side diff.",
+		newBoolOpts().
+			withDefault(false))
+
 	panicIfError(viper.BindPFlags(flags))
 	setupLogOutput()
 }
diff --git a/docs/usage.md b/docs/usage.md
index ed61c6ca..23aa7ea3 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -67,6 +67,7 @@ The full list of supported environment variables is described below:
 |`KUBECHECKS_REPLAN_COMMENT_MSG`|comment message which re-triggers kubechecks on PR.|`kubechecks again`|
 |`KUBECHECKS_REPO_REFRESH_INTERVAL`|Interval between static repo refreshes (for schemas and policies).|`5m`|
 |`KUBECHECKS_SCHEMAS_LOCATION`|Sets schema locations to be used for every check request. Can be common paths inside the repos being checked or git urls in either git or http(s) format.|`[]`|
+|`KUBECHECKS_SERVER_SIDE_DIFF`|Enable server-side diff.|`false`|
 |`KUBECHECKS_SHOW_DEBUG_INFO`|Set to true to print debug info to the footer of MR comments.|`false`|
 |`KUBECHECKS_TIDY_OUTDATED_COMMENTS_MODE`|Sets the mode to use when tidying outdated comments. One of hide, delete.|`hide`|
 |`KUBECHECKS_VCS_BASE_URL`|VCS base url, useful if self hosting gitlab, enterprise github, etc.||
diff --git a/localdev/kubechecks/values.yaml b/localdev/kubechecks/values.yaml
index 9e5473e3..93ea9cf1 100644
--- a/localdev/kubechecks/values.yaml
+++ b/localdev/kubechecks/values.yaml
@@ -10,6 +10,7 @@ configMap:
     KUBECHECKS_NAMESPACE: 'kubechecks'
     KUBECHECKS_FALLBACK_K8S_VERSION: "1.25.0"
     KUBECHECKS_SHOW_DEBUG_INFO: "true"
+    KUBECHECKS_VCS_TYPE: "gitlab"
     # OTEL
     KUBECHECKS_OTEL_COLLECTOR_PORT: "4317"
     KUBECHECKS_OTEL_ENABLED: "false"
@@ -21,6 +22,8 @@ configMap:
     # KUBECHECKS_SCHEMAS_LOCATION: https://github.com/zapier/kubecheck-schemas.git
     KUBECHECKS_TIDY_OUTDATED_COMMENTS_MODE: "delete"
     KUBECHECKS_ENABLE_CONFTEST: "false"
+    KUBECHECKS_SERVER_SIDE_DIFF: "true"
+    GRPC_ENFORCE_ALPN_ENABLED: false
 
 
 deployment:
@@ -28,7 +31,7 @@ deployment:
     reloader.stakater.com/auto: "true" 
   
   image:
-    pullPolicy: Never
+    pullPolicy: IfNotPresent
     name: "kubechecks"
     tag: ""
 
diff --git a/pkg/argo_client/manifests.go b/pkg/argo_client/manifests.go
index 0587e223..40962864 100644
--- a/pkg/argo_client/manifests.go
+++ b/pkg/argo_client/manifests.go
@@ -11,7 +11,9 @@ import (
 	repoapiclient "github.com/argoproj/argo-cd/v2/reposerver/apiclient"
 	"github.com/argoproj/argo-cd/v2/reposerver/repository"
 	"github.com/argoproj/argo-cd/v2/util/git"
+	"github.com/argoproj/argo-cd/v2/util/manifeststream"
 	"github.com/ghodss/yaml"
+	grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -102,6 +104,48 @@ func (argo *ArgoClient) generateManifests(
 	)
 }
 
+// adapted fromm https://github.com/argoproj/argo-cd/blob/d3ff9757c460ae1a6a11e1231251b5d27aadcdd1/cmd/argocd/commands/app.go#L894
+func (argo *ArgoClient) GetManifestsServerSide(ctx context.Context, name, tempRepoDir, changedAppFilePath string, app argoappv1.Application) ([]string, error) {
+	var err error
+
+	ctx, span := tracer.Start(ctx, "GetManifestsServerSide")
+	defer span.End()
+
+	log.Debug().Str("name", name).Msg("GetManifestsServerSide")
+
+	start := time.Now()
+	defer func() {
+		duration := time.Since(start)
+		getManifestsDuration.WithLabelValues(name).Observe(duration.Seconds())
+	}()
+
+	appCloser, appClient := argo.GetApplicationClient()
+	defer appCloser.Close()
+
+	client, err := appClient.GetManifestsWithFiles(ctx, grpc_retry.Disable())
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to get manifest client")
+	}
+	localIncludes := []string{"*"}
+	log.Debug().Str("name", name).Str("repo_path", tempRepoDir).Msg("sending application manifest query with files")
+
+	err = manifeststream.SendApplicationManifestQueryWithFiles(ctx, client, name, app.Namespace, tempRepoDir, localIncludes)
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to send manifest query")
+	}
+
+	res, err := client.CloseAndRecv()
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to receive manifest response")
+	}
+
+	if res.Manifests == nil {
+		return nil, nil
+	}
+	getManifestsSuccess.WithLabelValues(name).Inc()
+	return res.Manifests, nil
+}
+
 func ConvertJsonToYamlManifests(jsonManifests []string) []string {
 	var manifests []string
 	for _, manifest := range jsonManifests {
diff --git a/pkg/checks/diff/diff_test.go b/pkg/checks/diff/diff_test.go
new file mode 100644
index 00000000..8c9adc81
--- /dev/null
+++ b/pkg/checks/diff/diff_test.go
@@ -0,0 +1,79 @@
+package diff
+
+import (
+	"encoding/json"
+	"testing"
+
+	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/argoproj/gitops-engine/pkg/utils/kube"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestIsApp(t *testing.T) {
+	tests := []struct {
+		name      string
+		item      objKeyLiveTarget
+		manifests []byte
+		expected  bool
+	}{
+		{
+			name: "Valid Application",
+			item: objKeyLiveTarget{
+				key: kube.ResourceKey{
+					Group: "argoproj.io",
+					Kind:  "Application",
+				},
+			},
+			manifests: func() []byte {
+				app := argoappv1.Application{
+					Spec: argoappv1.ApplicationSpec{
+						Project: "default",
+					},
+				}
+				data, _ := json.Marshal(app)
+				return data
+			}(),
+			expected: true,
+		},
+		{
+			name: "Invalid Group",
+			item: objKeyLiveTarget{
+				key: kube.ResourceKey{
+					Group: "invalid.group",
+					Kind:  "Application",
+				},
+			},
+			manifests: []byte{},
+			expected:  false,
+		},
+		{
+			name: "Invalid Kind",
+			item: objKeyLiveTarget{
+				key: kube.ResourceKey{
+					Group: "argoproj.io",
+					Kind:  "InvalidKind",
+				},
+			},
+			manifests: []byte{},
+			expected:  false,
+		},
+		{
+			name: "Invalid JSON",
+			item: objKeyLiveTarget{
+				key: kube.ResourceKey{
+					Group: "argoproj.io",
+					Kind:  "Application",
+				},
+			},
+			manifests: []byte("invalid json"),
+			expected:  false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			_, result := isApp(tt.item, tt.manifests)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
diff --git a/pkg/config/config.go b/pkg/config/config.go
index cc09f634..cfc74dc7 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -79,6 +79,7 @@ type ServerConfig struct {
 	MaxQueueSize             int64         `mapstructure:"max-queue-size"`
 	MaxConcurrenctChecks     int           `mapstructure:"max-concurrenct-checks"`
 	ReplanCommentMessage     string        `mapstructure:"replan-comment-msg"`
+	ServerSideDiff           bool          `mapstructure:"server-side-diff"`
 }
 
 func New() (ServerConfig, error) {
@@ -115,6 +116,7 @@ func NewWithViper(v *viper.Viper) (ServerConfig, error) {
 	log.Info().Msgf("Webhook URL Prefix: %s", cfg.UrlPrefix)
 	log.Info().Msgf("VCS Type: %s", cfg.VcsType)
 	log.Info().Msgf("ArgoCD Namespace: %s", cfg.ArgoCDNamespace)
+	log.Info().Msgf("Server-Side Diff: %v", cfg.ServerSideDiff)
 
 	return cfg, nil
 }
diff --git a/pkg/events/worker.go b/pkg/events/worker.go
index 58f0e47b..c6d98c05 100644
--- a/pkg/events/worker.go
+++ b/pkg/events/worker.go
@@ -105,9 +105,15 @@ func (w *worker) processApp(ctx context.Context, app v1alpha1.Application) {
 		return
 	}
 	repoPath := repo.Directory
+	var jsonManifests []string
 
-	logger.Debug().Str("repo_path", repoPath).Msg("Getting manifests")
-	jsonManifests, err := w.ctr.ArgoClient.GetManifestsLocal(ctx, appName, repoPath, appPath, app)
+	if !w.ctr.Config.ServerSideDiff {
+		logger.Debug().Str("repo_path", repoPath).Msg("Getting manifests")
+		jsonManifests, err = w.ctr.ArgoClient.GetManifestsLocal(ctx, appName, repoPath, appPath, app)
+	} else {
+		logger.Debug().Str("repo_path", repoPath).Msg("Getting server-side manifests")
+		jsonManifests, err = w.ctr.ArgoClient.GetManifestsServerSide(ctx, appName, repoPath, appPath, app)
+	}
 	if err != nil {
 		logger.Error().Err(err).Msg("Unable to get manifests")
 		w.vcsNote.AddToAppMessage(ctx, appName, msg.Result{