diff --git a/.cspell.json b/.cspell.json
index e0aede6e2..63f146b3b 100644
--- a/.cspell.json
+++ b/.cspell.json
@@ -19,12 +19,14 @@
     "creatordate",
     "crunchydata",
     "customresourcedefinition",
+    "Datree",
     "datreeio",
     "editorcheck",
     "elif",
     "filesys",
     "genall",
     "gofmt",
+    "gomod",
     "jsonschema",
     "kopium",
     "krusty",
@@ -34,7 +36,9 @@
     "kustomizer",
     "mrtazz",
     "mstruebing",
+    "nvim",
     "openpgp",
+    "prometheusrule",
     "rollouts",
     "schemafile",
     "shellcheck",
diff --git a/Makefile b/Makefile
index 400ba329a..3d8c9bf09 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 .PHONY: all clean test build
 
-COMPOSE_RUN = docker compose run --rm --quiet-pull
 export DOCKER_CLI_HINTS=false
 
 DOWNLOADER := $(shell \
@@ -11,4 +10,6 @@ DOWNLOADER := $(shell \
     fi \
 )
 
-include make.d/*.mk
\ No newline at end of file
+include make.d/*.mk
+
+all: clean help build check comparison tags test schema-check update
\ No newline at end of file
diff --git a/configuration.yaml b/configuration.yaml
index 8a920648b..8178d3558 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -50,6 +50,11 @@
   kind: helm
   name: antrea
   repository: https://charts.antrea.io
+- entries:
+    - spark-kubernetes-operator
+  kind: helm
+  name: apache-spark-kubernetes-operator
+  repository: https://apache.github.io/spark-kubernetes-operator
 - kind: git
   kustomizationPaths:
     - config/crd
@@ -1242,6 +1247,11 @@
     - ./components/pvcviewer-controller/api
     - ./components/tensorboard-controller/api
   versionPattern: "^v([0-9]+\\.[0-9]+\\.[0-9]+)$"
+- entries:
+    - spark-operator
+  kind: helm
+  name: kubeflow-spark-operator
+  repository: https://kubeflow.github.io/spark-operator
 - kind: git
   kustomizationPaths:
     - manifests/base/crds
@@ -2038,11 +2048,6 @@
   kustomizationPaths:
     - config/crd
   repository: https://github.com/isindir/sops-secrets-operator
-- entries:
-    - spark-operator
-  kind: helm
-  name: spark-operator
-  repository: https://kubeflow.github.io/spark-operator
 - kind: git
   name: spicedb-operator
   kustomizationPaths:
diff --git a/docker-compose.yml b/docker-compose.yml
index f8bec2729..b3ec3c5f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,14 +9,3 @@ services:
       - ./build/ephemeral/repository/http:/usr/share/nginx/html:ro
     ports:
       - 8088:8080
-  # --- test tools ---
-  editorconfig:
-    image: mstruebing/editorconfig-checker
-    volumes:
-      - .:/workspace:ro
-    working_dir: /workspace
-  checkmake:
-    image: mrtazz/checkmake
-    volumes:
-      - ./Makefile:/Makefile:ro
-      - ./make.d:/make.d:ro
diff --git a/make.d/build.mk b/make.d/build.mk
index 7a7070d0d..348866941 100644
--- a/make.d/build.mk
+++ b/make.d/build.mk
@@ -2,7 +2,7 @@
 GO_TAGS = containers_image_openpgp
 
 build:
-	@mkdir -p build/bin
+	mkdir -p build/bin
 	go build -o build/bin/catalog -buildvcs=false -tags $(GO_TAGS)
 
 build/bin/catalog: build
diff --git a/make.d/schema-check.mk b/make.d/schema-check.mk
index e309593d0..1bb3b8888 100644
--- a/make.d/schema-check.mk
+++ b/make.d/schema-check.mk
@@ -2,5 +2,5 @@ schema-check: build/bin/catalog build/schemastore/jsonschema.json
 	find schema -type f -iname "*.json" -print0 | xargs -0 -n1 sh -ec 'build/bin/catalog verify --schema build/schemastore/jsonschema.json --file "$0"'
 
 build/schemastore/jsonschema.json:
-	@mkdir -p build/schemastore
+	mkdir -p build/schemastore
 	$(DOWNLOADER) $@ https://www.schemastore.org/metaschema-draft-07-unofficial-strict.json
diff --git a/make.d/tests.mk b/make.d/tests.mk
index f24d26c0e..22c955c2a 100644
--- a/make.d/tests.mk
+++ b/make.d/tests.mk
@@ -9,7 +9,7 @@ test-go:
 	go mod tidy -diff
 
 	@echo 'Checking for incorrectly formatted files ...'
-	@test -z "$$(gofmt -l .)"
+	test -z "$$(gofmt -l .)"
 
 ifneq ($(TOOL_VERSION),$(MOD_VERSION))
 	@echo 'Mismatched go versions'
@@ -70,7 +70,8 @@ endif
 
 test-editorcheck:
 	@echo 'Checking general formatting of all files ...'
-	$(COMPOSE_RUN) editorconfig ec -exclude '^schema/|^\.git/|.DS_Store|^build/|^definitions/'
+	docker run --rm -v $(CURDIR):/workspace:ro -w /workspace mstruebing/editorconfig-checker \
+		ec -exclude '^schema/|^\.git/|.DS_Store|^build/|^definitions/|^schema/'
 	@printf $(GREEN) "OK"
 
 test-docker:
@@ -80,13 +81,13 @@ test-docker:
 
 test-makefile:
 	@echo 'Checking formatting of Makefile and *.mk files ...'
-	$(COMPOSE_RUN) checkmake
+	test -z "$$(make -n all 1>/dev/null)"
 	@printf $(GREEN) "OK"
 
 build/schemastore/dependabot-2.0.json:
-	@mkdir -p build/schemastore
+	mkdir -p build/schemastore
 	$(DOWNLOADER) $@ https://json.schemastore.org/dependabot-2.0.json
 
 build/schemastore/github-workflow.json:
-	@mkdir -p build/schemastore
+	mkdir -p build/schemastore
 	$(DOWNLOADER) $@ https://json.schemastore.org/github-workflow.json