diff --git a/.github/scripts/generate_pre_commit.py b/.github/scripts/generate_pre_commit.py
new file mode 100755
index 00000000000000..740d3c20d263b0
--- /dev/null
+++ b/.github/scripts/generate_pre_commit.py
@@ -0,0 +1,265 @@
+"""Generate pre-commit hooks for Java and Python projects.
+
+This script scans a repository for Java and Python projects and generates appropriate
+pre-commit hooks for linting and formatting. It also merges in additional hooks from
+an override file.
+"""
+
+import os
+from dataclasses import dataclass
+from enum import Enum, auto
+from pathlib import Path
+
+import yaml
+
+
+class ProjectType(Enum):
+    """Types of projects supported for hook generation."""
+
+    JAVA = auto()
+    PYTHON = auto()
+
+
+@dataclass
+class Project:
+    """Represents a project found in the repository."""
+
+    path: str
+    type: ProjectType
+
+    @property
+    def gradle_path(self) -> str:
+        """Convert path to Gradle task format."""
+        return ":" + self.path.replace("/", ":")
+
+    @property
+    def project_id(self) -> str:
+        """Generate a unique identifier for the project."""
+        return self.path.replace("/", "-").replace(".", "-")
+
+
+class ProjectFinder:
+    """Find Java and Python projects in a repository."""
+
+    JAVA_PATTERNS = [
+        "plugins.hasPlugin('java')",
+        "apply plugin: 'java'",
+        "id 'java'",
+        "id 'java-library'",
+        "plugins.hasPlugin('java-library')",
+        "apply plugin: 'java-library'",
+        "plugins.hasPlugin('pegasus')",
+        "org.springframework.boot",
+    ]
+
+    EXCLUDED_DIRS = {".git", "build", "node_modules", ".tox", "venv"}
+    SOURCE_EXTENSIONS = {".java", ".kt", ".groovy"}
+
+    def __init__(self, root_dir: str):
+        self.root_path = Path(root_dir)
+
+    def find_all_projects(self) -> list[Project]:
+        """Find all Java and Python projects in the repository."""
+        java_projects = self._find_java_projects()
+        python_projects = self._find_python_projects()
+
+        all_projects = []
+        all_projects.extend(
+            Project(path=p, type=ProjectType.JAVA) for p in java_projects
+        )
+        all_projects.extend(
+            Project(path=p, type=ProjectType.PYTHON) for p in python_projects
+        )
+
+        return sorted(all_projects, key=lambda p: p.path)
+
+    def _find_java_projects(self) -> set[str]:
+        """Find all Java projects by checking build.gradle files."""
+        java_projects = set()
+
+        # Search both build.gradle and build.gradle.kts
+        for pattern in ["build.gradle", "build.gradle.kts"]:
+            for gradle_file in self.root_path.rglob(pattern):
+                if self._should_skip_directory(gradle_file.parent):
+                    continue
+
+                if self._is_java_project(gradle_file):
+                    java_projects.add(self._get_relative_path(gradle_file.parent))
+
+        return {
+            p
+            for p in java_projects
+            if "buildSrc" not in p and "spark-smoke-test" not in p and p != "."
+        }
+
+    def _find_python_projects(self) -> set[str]:
+        """Find all Python projects by checking for setup.py or pyproject.toml."""
+        python_projects = set()
+
+        for file_name in ["setup.py", "pyproject.toml"]:
+            for path in self.root_path.rglob(file_name):
+                if self._should_skip_directory(path.parent):
+                    continue
+
+                rel_path = self._get_relative_path(path.parent)
+                if "examples" not in rel_path:
+                    python_projects.add(rel_path)
+
+        return python_projects
+
+    def _should_skip_directory(self, path: Path) -> bool:
+        """Check if directory should be skipped."""
+        return any(
+            part in self.EXCLUDED_DIRS or part.startswith(".") for part in path.parts
+        )
+
+    def _is_java_project(self, gradle_file: Path) -> bool:
+        """Check if a Gradle file represents a Java project."""
+        try:
+            content = gradle_file.read_text()
+            has_java_plugin = any(pattern in content for pattern in self.JAVA_PATTERNS)
+
+            if has_java_plugin:
+                # Verify presence of source files
+                return any(
+                    list(gradle_file.parent.rglob(f"*{ext}"))
+                    for ext in self.SOURCE_EXTENSIONS
+                )
+            return False
+
+        except Exception as e:
+            print(f"Warning: Error reading {gradle_file}: {e}")
+            return False
+
+    def _get_relative_path(self, path: Path) -> str:
+        """Get relative path from root, normalized with forward slashes."""
+        return str(path.relative_to(self.root_path)).replace("\\", "/")
+
+
+class HookGenerator:
+    """Generate pre-commit hooks for projects."""
+
+    def __init__(self, projects: list[Project], override_file: str = None):
+        self.projects = projects
+        self.override_file = override_file
+
+    def generate_config(self) -> dict:
+        """Generate the complete pre-commit config."""
+        hooks = []
+
+        for project in self.projects:
+            if project.type == ProjectType.PYTHON:
+                hooks.append(self._generate_lint_fix_hook(project))
+            else:  # ProjectType.JAVA
+                hooks.append(self._generate_spotless_hook(project))
+
+        config = {"repos": [{"repo": "local", "hooks": hooks}]}
+        
+        # Merge override hooks if they exist
+        if self.override_file and os.path.exists(self.override_file):
+            try:
+                with open(self.override_file, 'r') as f:
+                    override_config = yaml.safe_load(f)
+                
+                if override_config and 'repos' in override_config:
+                    for override_repo in override_config['repos']:
+                        matching_repo = next(
+                            (repo for repo in config['repos'] 
+                             if repo['repo'] == override_repo['repo']),
+                            None
+                        )
+                        
+                        if matching_repo:
+                            matching_repo['hooks'].extend(override_repo.get('hooks', []))
+                        else:
+                            config['repos'].append(override_repo)
+                
+                print(f"Merged additional hooks from {self.override_file}")
+            except Exception as e:
+                print(f"Warning: Error reading override file {self.override_file}: {e}")
+
+        return config
+
+    def _generate_lint_fix_hook(self, project: Project) -> dict:
+        """Generate a lint-fix hook for Python projects."""
+        return {
+            "id": f"{project.project_id}-lint-fix",
+            "name": f"{project.path} Lint Fix",
+            "entry": f"./gradlew {project.gradle_path}:lintFix",
+            "language": "system",
+            "files": f"^{project.path}/.*\\.py$",
+        }
+
+    def _generate_spotless_hook(self, project: Project) -> dict:
+        """Generate a spotless hook for Java projects."""
+        return {
+            "id": f"{project.project_id}-spotless",
+            "name": f"{project.path} Spotless Apply",
+            "entry": f"./gradlew {project.gradle_path}:spotlessApply",
+            "language": "system",
+            "files": f"^{project.path}/.*\\.java$",
+        }
+
+
+class PrecommitDumper(yaml.Dumper):
+    """Custom YAML dumper that maintains proper indentation."""
+
+    def increase_indent(self, flow=False, *args, **kwargs):
+        return super().increase_indent(flow=flow, indentless=False)
+
+
+def write_yaml_with_spaces(file_path: str, data: dict):
+    """Write YAML file with extra spacing between hooks."""
+    with open(file_path, "w") as f:
+        yaml_str = yaml.dump(
+            data, Dumper=PrecommitDumper, sort_keys=False, default_flow_style=False
+        )
+
+        # Add extra newline between hooks
+        lines = yaml_str.split("\n")
+        result = []
+        in_hook = False
+
+        for line in lines:
+            if line.strip().startswith("- id:"):
+                if in_hook:  # If we were already in a hook, add extra newline
+                    result.append("")
+                in_hook = True
+            elif not line.strip() and in_hook:
+                in_hook = False
+
+            result.append(line)
+
+        f.write("\n".join(result))
+
+
+def main():
+    root_dir = os.path.abspath(os.curdir)
+    override_file = ".github/scripts/pre-commit-override.yaml"
+
+    # Find projects
+    finder = ProjectFinder(root_dir)
+    projects = finder.find_all_projects()
+
+    # Print summary
+    print("Found projects:")
+    print("\nJava projects:")
+    for project in projects:
+        if project.type == ProjectType.JAVA:
+            print(f"  - {project.path}")
+
+    print("\nPython projects:")
+    for project in projects:
+        if project.type == ProjectType.PYTHON:
+            print(f"  - {project.path}")
+
+    # Generate and write config
+    generator = HookGenerator(projects, override_file)
+    config = generator.generate_config()
+    write_yaml_with_spaces(".pre-commit-config.yaml", config)
+
+    print("\nGenerated .pre-commit-config.yaml")
+
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file
diff --git a/.github/scripts/pre-commit-override.yaml b/.github/scripts/pre-commit-override.yaml
new file mode 100644
index 00000000000000..a085d9ea3ee93b
--- /dev/null
+++ b/.github/scripts/pre-commit-override.yaml
@@ -0,0 +1,8 @@
+repos:
+  - repo: local
+    hooks:
+      - id: smoke-test-cypress-lint-fix
+        name: smoke-test cypress Lint Fix
+        entry: ./gradlew :smoke-test:cypressLintFix
+        language: system
+        files: ^smoke-test/tests/cypress/.*$
\ No newline at end of file
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 898e3d262b3941..c4edc2cc176355 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,26 +1,380 @@
-exclude: ^$
-files: ^(docs/|docs-website/|metadata-ingestion/)
 repos:
-  - repo: https://github.com/pre-commit/mirrors-isort
-    rev: v5.10.1
+  - repo: local
     hooks:
-      - id: isort
-  - repo: https://github.com/ambv/black
-    rev: 23.1.0
-    hooks:
-      - id: black
-  - repo: https://github.com/myint/autoflake
-    rev: v1.4
-    hooks:
-      - id: autoflake
-        args:
-          - --in-place
-          - --remove-unused-variables
-          - --remove-all-unused-imports
-          - --expand-star-imports
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.6" # Use the sha or tag you want to point at
-    hooks:
-      - id: prettier
-        args:
-          - --write
\ No newline at end of file
+      - id: datahub-graphql-core-spotless
+        name: datahub-graphql-core Spotless Apply
+        entry: ./gradlew :datahub-graphql-core:spotlessApply
+        language: system
+        files: ^datahub-graphql-core/.*\.java$
+
+      - id: datahub-upgrade-spotless
+        name: datahub-upgrade Spotless Apply
+        entry: ./gradlew :datahub-upgrade:spotlessApply
+        language: system
+        files: ^datahub-upgrade/.*\.java$
+
+      - id: entity-registry-spotless
+        name: entity-registry Spotless Apply
+        entry: ./gradlew :entity-registry:spotlessApply
+        language: system
+        files: ^entity-registry/.*\.java$
+
+      - id: ingestion-scheduler-spotless
+        name: ingestion-scheduler Spotless Apply
+        entry: ./gradlew :ingestion-scheduler:spotlessApply
+        language: system
+        files: ^ingestion-scheduler/.*\.java$
+
+      - id: li-utils-spotless
+        name: li-utils Spotless Apply
+        entry: ./gradlew :li-utils:spotlessApply
+        language: system
+        files: ^li-utils/.*\.java$
+
+      - id: metadata-auth-auth-api-spotless
+        name: metadata-auth/auth-api Spotless Apply
+        entry: ./gradlew :metadata-auth:auth-api:spotlessApply
+        language: system
+        files: ^metadata-auth/auth-api/.*\.java$
+
+      - id: metadata-dao-impl-kafka-producer-spotless
+        name: metadata-dao-impl/kafka-producer Spotless Apply
+        entry: ./gradlew :metadata-dao-impl:kafka-producer:spotlessApply
+        language: system
+        files: ^metadata-dao-impl/kafka-producer/.*\.java$
+
+      - id: metadata-events-mxe-avro-spotless
+        name: metadata-events/mxe-avro Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-avro:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-avro/.*\.java$
+
+      - id: metadata-events-mxe-registration-spotless
+        name: metadata-events/mxe-registration Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-registration:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-registration/.*\.java$
+
+      - id: metadata-events-mxe-schemas-spotless
+        name: metadata-events/mxe-schemas Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-schemas:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-schemas/.*\.java$
+
+      - id: metadata-events-mxe-utils-avro-spotless
+        name: metadata-events/mxe-utils-avro Spotless Apply
+        entry: ./gradlew :metadata-events:mxe-utils-avro:spotlessApply
+        language: system
+        files: ^metadata-events/mxe-utils-avro/.*\.java$
+
+      - id: metadata-ingestion-lint-fix
+        name: metadata-ingestion Lint Fix
+        entry: ./gradlew :metadata-ingestion:lintFix
+        language: system
+        files: ^metadata-ingestion/.*\.py$
+
+      - id: metadata-ingestion-modules-airflow-plugin-lint-fix
+        name: metadata-ingestion-modules/airflow-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:airflow-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/airflow-plugin/.*\.py$
+
+      - id: metadata-ingestion-modules-dagster-plugin-lint-fix
+        name: metadata-ingestion-modules/dagster-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:dagster-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/dagster-plugin/.*\.py$
+
+      - id: metadata-ingestion-modules-gx-plugin-lint-fix
+        name: metadata-ingestion-modules/gx-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:gx-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/gx-plugin/.*\.py$
+
+      - id: metadata-ingestion-modules-prefect-plugin-lint-fix
+        name: metadata-ingestion-modules/prefect-plugin Lint Fix
+        entry: ./gradlew :metadata-ingestion-modules:prefect-plugin:lintFix
+        language: system
+        files: ^metadata-ingestion-modules/prefect-plugin/.*\.py$
+
+      - id: metadata-integration-java-acryl-spark-lineage-spotless
+        name: metadata-integration/java/acryl-spark-lineage Spotless Apply
+        entry: ./gradlew :metadata-integration:java:acryl-spark-lineage:spotlessApply
+        language: system
+        files: ^metadata-integration/java/acryl-spark-lineage/.*\.java$
+
+      - id: metadata-integration-java-datahub-client-spotless
+        name: metadata-integration/java/datahub-client Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-client:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-client/.*\.java$
+
+      - id: metadata-integration-java-datahub-event-spotless
+        name: metadata-integration/java/datahub-event Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-event:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-event/.*\.java$
+
+      - id: metadata-integration-java-datahub-protobuf-spotless
+        name: metadata-integration/java/datahub-protobuf Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-protobuf:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-protobuf/.*\.java$
+
+      - id: metadata-integration-java-datahub-schematron-cli-spotless
+        name: metadata-integration/java/datahub-schematron/cli Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-schematron:cli:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-schematron/cli/.*\.java$
+
+      - id: metadata-integration-java-datahub-schematron-lib-spotless
+        name: metadata-integration/java/datahub-schematron/lib Spotless Apply
+        entry: ./gradlew :metadata-integration:java:datahub-schematron:lib:spotlessApply
+        language: system
+        files: ^metadata-integration/java/datahub-schematron/lib/.*\.java$
+
+      - id: metadata-integration-java-examples-spotless
+        name: metadata-integration/java/examples Spotless Apply
+        entry: ./gradlew :metadata-integration:java:examples:spotlessApply
+        language: system
+        files: ^metadata-integration/java/examples/.*\.java$
+
+      - id: metadata-integration-java-openlineage-converter-spotless
+        name: metadata-integration/java/openlineage-converter Spotless Apply
+        entry: ./gradlew :metadata-integration:java:openlineage-converter:spotlessApply
+        language: system
+        files: ^metadata-integration/java/openlineage-converter/.*\.java$
+
+      - id: metadata-integration-java-spark-lineage-legacy-spotless
+        name: metadata-integration/java/spark-lineage-legacy Spotless Apply
+        entry: ./gradlew :metadata-integration:java:spark-lineage-legacy:spotlessApply
+        language: system
+        files: ^metadata-integration/java/spark-lineage-legacy/.*\.java$
+
+      - id: metadata-io-spotless
+        name: metadata-io Spotless Apply
+        entry: ./gradlew :metadata-io:spotlessApply
+        language: system
+        files: ^metadata-io/.*\.java$
+
+      - id: metadata-io-metadata-io-api-spotless
+        name: metadata-io/metadata-io-api Spotless Apply
+        entry: ./gradlew :metadata-io:metadata-io-api:spotlessApply
+        language: system
+        files: ^metadata-io/metadata-io-api/.*\.java$
+
+      - id: metadata-jobs-common-spotless
+        name: metadata-jobs/common Spotless Apply
+        entry: ./gradlew :metadata-jobs:common:spotlessApply
+        language: system
+        files: ^metadata-jobs/common/.*\.java$
+
+      - id: metadata-jobs-mae-consumer-spotless
+        name: metadata-jobs/mae-consumer Spotless Apply
+        entry: ./gradlew :metadata-jobs:mae-consumer:spotlessApply
+        language: system
+        files: ^metadata-jobs/mae-consumer/.*\.java$
+
+      - id: metadata-jobs-mae-consumer-job-spotless
+        name: metadata-jobs/mae-consumer-job Spotless Apply
+        entry: ./gradlew :metadata-jobs:mae-consumer-job:spotlessApply
+        language: system
+        files: ^metadata-jobs/mae-consumer-job/.*\.java$
+
+      - id: metadata-jobs-mce-consumer-spotless
+        name: metadata-jobs/mce-consumer Spotless Apply
+        entry: ./gradlew :metadata-jobs:mce-consumer:spotlessApply
+        language: system
+        files: ^metadata-jobs/mce-consumer/.*\.java$
+
+      - id: metadata-jobs-mce-consumer-job-spotless
+        name: metadata-jobs/mce-consumer-job Spotless Apply
+        entry: ./gradlew :metadata-jobs:mce-consumer-job:spotlessApply
+        language: system
+        files: ^metadata-jobs/mce-consumer-job/.*\.java$
+
+      - id: metadata-jobs-pe-consumer-spotless
+        name: metadata-jobs/pe-consumer Spotless Apply
+        entry: ./gradlew :metadata-jobs:pe-consumer:spotlessApply
+        language: system
+        files: ^metadata-jobs/pe-consumer/.*\.java$
+
+      - id: metadata-models-spotless
+        name: metadata-models Spotless Apply
+        entry: ./gradlew :metadata-models:spotlessApply
+        language: system
+        files: ^metadata-models/.*\.java$
+
+      - id: metadata-models-custom-spotless
+        name: metadata-models-custom Spotless Apply
+        entry: ./gradlew :metadata-models-custom:spotlessApply
+        language: system
+        files: ^metadata-models-custom/.*\.java$
+
+      - id: metadata-models-validator-spotless
+        name: metadata-models-validator Spotless Apply
+        entry: ./gradlew :metadata-models-validator:spotlessApply
+        language: system
+        files: ^metadata-models-validator/.*\.java$
+
+      - id: metadata-operation-context-spotless
+        name: metadata-operation-context Spotless Apply
+        entry: ./gradlew :metadata-operation-context:spotlessApply
+        language: system
+        files: ^metadata-operation-context/.*\.java$
+
+      - id: metadata-service-auth-config-spotless
+        name: metadata-service/auth-config Spotless Apply
+        entry: ./gradlew :metadata-service:auth-config:spotlessApply
+        language: system
+        files: ^metadata-service/auth-config/.*\.java$
+
+      - id: metadata-service-auth-filter-spotless
+        name: metadata-service/auth-filter Spotless Apply
+        entry: ./gradlew :metadata-service:auth-filter:spotlessApply
+        language: system
+        files: ^metadata-service/auth-filter/.*\.java$
+
+      - id: metadata-service-auth-impl-spotless
+        name: metadata-service/auth-impl Spotless Apply
+        entry: ./gradlew :metadata-service:auth-impl:spotlessApply
+        language: system
+        files: ^metadata-service/auth-impl/.*\.java$
+
+      - id: metadata-service-auth-servlet-impl-spotless
+        name: metadata-service/auth-servlet-impl Spotless Apply
+        entry: ./gradlew :metadata-service:auth-servlet-impl:spotlessApply
+        language: system
+        files: ^metadata-service/auth-servlet-impl/.*\.java$
+
+      - id: metadata-service-configuration-spotless
+        name: metadata-service/configuration Spotless Apply
+        entry: ./gradlew :metadata-service:configuration:spotlessApply
+        language: system
+        files: ^metadata-service/configuration/.*\.java$
+
+      - id: metadata-service-factories-spotless
+        name: metadata-service/factories Spotless Apply
+        entry: ./gradlew :metadata-service:factories:spotlessApply
+        language: system
+        files: ^metadata-service/factories/.*\.java$
+
+      - id: metadata-service-graphql-servlet-impl-spotless
+        name: metadata-service/graphql-servlet-impl Spotless Apply
+        entry: ./gradlew :metadata-service:graphql-servlet-impl:spotlessApply
+        language: system
+        files: ^metadata-service/graphql-servlet-impl/.*\.java$
+
+      - id: metadata-service-openapi-analytics-servlet-spotless
+        name: metadata-service/openapi-analytics-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-analytics-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-analytics-servlet/.*\.java$
+
+      - id: metadata-service-openapi-entity-servlet-spotless
+        name: metadata-service/openapi-entity-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-entity-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-entity-servlet/.*\.java$
+
+      - id: metadata-service-openapi-entity-servlet-generators-spotless
+        name: metadata-service/openapi-entity-servlet/generators Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-entity-servlet:generators:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-entity-servlet/generators/.*\.java$
+
+      - id: metadata-service-openapi-servlet-spotless
+        name: metadata-service/openapi-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-servlet/.*\.java$
+
+      - id: metadata-service-openapi-servlet-models-spotless
+        name: metadata-service/openapi-servlet/models Spotless Apply
+        entry: ./gradlew :metadata-service:openapi-servlet:models:spotlessApply
+        language: system
+        files: ^metadata-service/openapi-servlet/models/.*\.java$
+
+      - id: metadata-service-plugin-spotless
+        name: metadata-service/plugin Spotless Apply
+        entry: ./gradlew :metadata-service:plugin:spotlessApply
+        language: system
+        files: ^metadata-service/plugin/.*\.java$
+
+      - id: metadata-service-plugin-src-test-sample-test-plugins-spotless
+        name: metadata-service/plugin/src/test/sample-test-plugins Spotless Apply
+        entry: ./gradlew :metadata-service:plugin:src:test:sample-test-plugins:spotlessApply
+        language: system
+        files: ^metadata-service/plugin/src/test/sample-test-plugins/.*\.java$
+
+      - id: metadata-service-restli-client-spotless
+        name: metadata-service/restli-client Spotless Apply
+        entry: ./gradlew :metadata-service:restli-client:spotlessApply
+        language: system
+        files: ^metadata-service/restli-client/.*\.java$
+
+      - id: metadata-service-restli-client-api-spotless
+        name: metadata-service/restli-client-api Spotless Apply
+        entry: ./gradlew :metadata-service:restli-client-api:spotlessApply
+        language: system
+        files: ^metadata-service/restli-client-api/.*\.java$
+
+      - id: metadata-service-restli-servlet-impl-spotless
+        name: metadata-service/restli-servlet-impl Spotless Apply
+        entry: ./gradlew :metadata-service:restli-servlet-impl:spotlessApply
+        language: system
+        files: ^metadata-service/restli-servlet-impl/.*\.java$
+
+      - id: metadata-service-schema-registry-api-spotless
+        name: metadata-service/schema-registry-api Spotless Apply
+        entry: ./gradlew :metadata-service:schema-registry-api:spotlessApply
+        language: system
+        files: ^metadata-service/schema-registry-api/.*\.java$
+
+      - id: metadata-service-schema-registry-servlet-spotless
+        name: metadata-service/schema-registry-servlet Spotless Apply
+        entry: ./gradlew :metadata-service:schema-registry-servlet:spotlessApply
+        language: system
+        files: ^metadata-service/schema-registry-servlet/.*\.java$
+
+      - id: metadata-service-services-spotless
+        name: metadata-service/services Spotless Apply
+        entry: ./gradlew :metadata-service:services:spotlessApply
+        language: system
+        files: ^metadata-service/services/.*\.java$
+
+      - id: metadata-service-servlet-spotless
+        name: metadata-service/servlet Spotless Apply
+        entry: ./gradlew :metadata-service:servlet:spotlessApply
+        language: system
+        files: ^metadata-service/servlet/.*\.java$
+
+      - id: metadata-utils-spotless
+        name: metadata-utils Spotless Apply
+        entry: ./gradlew :metadata-utils:spotlessApply
+        language: system
+        files: ^metadata-utils/.*\.java$
+
+      - id: mock-entity-registry-spotless
+        name: mock-entity-registry Spotless Apply
+        entry: ./gradlew :mock-entity-registry:spotlessApply
+        language: system
+        files: ^mock-entity-registry/.*\.java$
+
+      - id: smoke-test-lint-fix
+        name: smoke-test Lint Fix
+        entry: ./gradlew :smoke-test:lintFix
+        language: system
+        files: ^smoke-test/.*\.py$
+
+      - id: test-models-spotless
+        name: test-models Spotless Apply
+        entry: ./gradlew :test-models:spotlessApply
+        language: system
+        files: ^test-models/.*\.java$
+
+      - id: smoke-test-cypress-lint-fix
+        name: smoke-test cypress Lint Fix
+        entry: ./gradlew :smoke-test:cypressLintFix
+        language: system
+        files: ^smoke-test/tests/cypress/.*$
diff --git a/build.gradle b/build.gradle
index 8929b4e644972c..3c36feadc5f4bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -474,10 +474,6 @@ subprojects {
       if (compileJavaTask != null) {
         spotlessJavaTask.dependsOn compileJavaTask
       }
-      // TODO - Do not run this in CI. How?
-      // tasks.withType(JavaCompile) {
-      //   finalizedBy(tasks.findByName('spotlessApply'))
-      // }
     }
   }
 
diff --git a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
index b8c27666d7f538..fb028605c35b77 100644
--- a/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
+++ b/metadata-ingestion/src/datahub/utilities/file_backed_collections.py
@@ -243,7 +243,7 @@ def __post_init__(self) -> None:
             # This was added in 3.24.0 from 2018-06-04.
             # See https://www.sqlite.org/lang_conflict.html
             if OVERRIDE_SQLITE_VERSION_REQUIREMENT:
-                self.use_sqlite_on_conflict = False
+                self._use_sqlite_on_conflict = False
             else:
                 raise RuntimeError("SQLite version 3.24.0 or later is required")
 
diff --git a/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py b/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
index 6230c2e37edc6a..7e1627151c6ebf 100644
--- a/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
+++ b/metadata-ingestion/tests/unit/utilities/test_file_backed_collections.py
@@ -5,6 +5,7 @@
 import sqlite3
 from dataclasses import dataclass
 from typing import Counter, Dict
+from unittest.mock import patch
 
 import pytest
 
@@ -15,6 +16,36 @@
 )
 
 
+def test_set_use_sqlite_on_conflict():
+    with patch("sqlite3.sqlite_version_info", (3, 24, 0)):
+        cache = FileBackedDict[int](
+            tablename="cache",
+            cache_max_size=10,
+            cache_eviction_batch_size=10,
+        )
+        assert cache._use_sqlite_on_conflict is True
+
+    with pytest.raises(RuntimeError):
+        with patch("sqlite3.sqlite_version_info", (3, 23, 1)):
+            cache = FileBackedDict[int](
+                tablename="cache",
+                cache_max_size=10,
+                cache_eviction_batch_size=10,
+            )
+            assert cache._use_sqlite_on_conflict is False
+
+    with patch("sqlite3.sqlite_version_info", (3, 23, 1)), patch(
+        "datahub.utilities.file_backed_collections.OVERRIDE_SQLITE_VERSION_REQUIREMENT",
+        True,
+    ):
+        cache = FileBackedDict[int](
+            tablename="cache",
+            cache_max_size=10,
+            cache_eviction_batch_size=10,
+        )
+        assert cache._use_sqlite_on_conflict is False
+
+
 @pytest.mark.parametrize("use_sqlite_on_conflict", [True, False])
 def test_file_dict(use_sqlite_on_conflict: bool) -> None:
     cache = FileBackedDict[int](
diff --git a/settings.gradle b/settings.gradle
index b0c2c707d566c0..77d0706549a439 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -78,3 +78,52 @@ include ':metadata-operation-context'
 include ':metadata-service:openapi-servlet:models'
 include ':metadata-integration:java:datahub-schematron:lib'
 include ':metadata-integration:java:datahub-schematron:cli'
+
+def installPreCommitHooks() {
+    def preCommitInstalled = false
+    try {
+        def process = ["which", "pre-commit"].execute()
+        def stdout = new StringBuilder()
+        def stderr = new StringBuilder()
+        process.waitForProcessOutput(stdout, stderr)
+        preCommitInstalled = (process.exitValue() == 0)
+        println "Pre-commit check: ${stdout}"
+    } catch (Exception e) {
+        println "Error checking pre-commit: ${e.message}"
+        return
+    }
+
+    if (!preCommitInstalled) {
+        try {
+            def installProcess = ["python", "-m", "pip", "install", "pre-commit"].execute()
+            def stdout = new StringBuilder()
+            def stderr = new StringBuilder()
+            installProcess.waitForProcessOutput(stdout, stderr)
+            if (installProcess.exitValue() != 0) {
+                println "Failed to install pre-commit: ${stderr}"
+                return
+            }
+            println "Install output: ${stdout}"
+        } catch (Exception e) {
+            println "Error installing pre-commit: ${e.message}"
+            return 
+        }
+    }
+
+    try {
+        def installHooksProcess = ["python", "-m", "pre_commit", "install"].execute()
+        def stdout = new StringBuilder()
+        def stderr = new StringBuilder()
+        installHooksProcess.waitForProcessOutput(stdout, stderr)
+        if (installHooksProcess.exitValue() != 0) {
+            println "Failed to install hooks: ${stderr}"
+            return
+        }
+        println "Hooks output: ${stdout}"
+    } catch (Exception e) {
+        println "Error installing hooks: ${e.message}"
+        return
+    }
+}
+
+installPreCommitHooks()
\ No newline at end of file