diff --git a/.github/workflows/catalogd-crd-diff.yaml b/.github/workflows/catalogd-crd-diff.yaml
deleted file mode 100644
index d3c6ca099..000000000
--- a/.github/workflows/catalogd-crd-diff.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: catalogd-crd-diff
-on:
-  pull_request:
-jobs:
-  crd-diff:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-
-      - name: Run make verify-crd-compatibility
-        working-directory: catalogd
-        run: make verify-crd-compatibility CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml"
-
diff --git a/.github/workflows/crd-diff.yaml b/.github/workflows/crd-diff.yaml
index 49a1b32da..8f34947a9 100644
--- a/.github/workflows/crd-diff.yaml
+++ b/.github/workflows/crd-diff.yaml
@@ -14,5 +14,8 @@ jobs:
           go-version-file: go.mod
 
       - name: Run make verify-crd-compatibility
-        run: make verify-crd-compatibility CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml"
-
+        run: |
+          make verify-crd-compatibility \
+            CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} \
+            CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" \
+            CATALOGD_CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml"
\ No newline at end of file
diff --git a/Makefile b/Makefile
index c188e901e..8b7e90f84 100644
--- a/Makefile
+++ b/Makefile
@@ -142,9 +142,13 @@ bingo-upgrade: $(BINGO) #EXHELP Upgrade tools
 .PHONY: verify-crd-compatibility
 CRD_DIFF_ORIGINAL_REF := main
 CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml
+CATALOGD_CRD_DIFF_UPDATED_SOURCE := file://catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
 CRD_DIFF_CONFIG := crd-diff-config.yaml
+
 verify-crd-compatibility: $(CRD_DIFF) manifests
 	$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE}
+	$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=catalogd/config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CATALOGD_CRD_DIFF_UPDATED_SOURCE}
+
 
 .PHONY: test
 test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests.
diff --git a/catalogd/Makefile b/catalogd/Makefile
index 6dd1d2ad1..d58367f42 100644
--- a/catalogd/Makefile
+++ b/catalogd/Makefile
@@ -88,19 +88,6 @@ e2e: run image-registry test-e2e kind-cluster-cleanup ## Run e2e test suite on l
 image-registry: ## Setup in-cluster image registry
 	./test/tools/imageregistry/registry.sh $(ISSUER_KIND) $(ISSUER_NAME)
 
-.PHONY: verify-crd-compatibility
-CRD_DIFF_ORIGINAL_REF := main
-CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
-CRD_DIFF_CONFIG := crd-diff-config.yaml
-verify-crd-compatibility: $(CRD_DIFF)
-	@if git show ${CRD_DIFF_ORIGINAL_REF}:config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml > /dev/null 2>&1; then \
-		echo "Running CRD diff..."; \
-		$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CRD_DIFF_UPDATED_SOURCE}; \
-	else \
-		echo "Skipping CRD diff: CRD does not exist in ${CRD_DIFF_ORIGINAL_REF}"; \
-	fi
-
-
 ## image-registry target has to come after run-latest-release,
 ## because the image-registry depends on the olm-ca issuer.
 .PHONY: test-upgrade-e2e
diff --git a/catalogd/crd-diff-config.yaml b/catalogd/crd-diff-config.yaml
deleted file mode 100644
index 8cce39378..000000000
--- a/catalogd/crd-diff-config.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-checks:
-  crd:
-    scope:
-      enabled: true
-    existingFieldRemoval:
-      enabled: true
-    storedVersionRemoval:
-      enabled: true
-  version:
-    sameVersion:
-      enabled: true
-      unhandledFailureMode: "Closed"
-      enum:
-        enabled: true
-        removalEnforcement: "Strict"
-        additionEnforcement: "Strict"
-      default:
-        enabled: true
-        changeEnforcement: "Strict"
-        removalEnforcement: "Strict"
-        additionEnforcement: "Strict"
-      required:
-        enabled: true
-        newEnforcement: "Strict"
-      type:
-        enabled: true
-        changeEnforcement: "Strict"
-      maximum:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      maxItems:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      maxProperties:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      maxLength:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      minimum:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-      minItems:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-      minProperties:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-      minLength:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-    servedVersion:
-      enabled: true
-      unhandledFailureMode: "Closed"
-      enum:
-        enabled: true
-        removalEnforcement: "Strict"
-        additionEnforcement: "Strict"
-      default:
-        enabled: true
-        changeEnforcement: "Strict"
-        removalEnforcement: "Strict"
-        additionEnforcement: "Strict"
-      required:
-        enabled: true
-        newEnforcement: "Strict"
-      type:
-        enabled: true
-        changeEnforcement: "Strict"
-      maximum:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      maxItems:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      maxProperties:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      maxLength:
-        enabled: true
-        additionEnforcement: "Strict"
-        decreaseEnforcement: "Strict"
-      minimum:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-      minItems:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-      minProperties:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"
-      minLength:
-        enabled: true
-        additionEnforcement: "Strict"
-        increaseEnforcement: "Strict"