diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 01dbe7a3fa..1ca0ce6c69 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -47,12 +47,12 @@ repos:
       - id: ruff-format
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.24.0
+    rev: v8.30.1
     hooks:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.20.2
     hooks:
       - id: mypy
         exclude: ^(tests/|examples/|docs/)
diff --git a/class_generator/manifests/class_generator_template.j2 b/class_generator/manifests/class_generator_template.j2
index e208c5e77d..3070ef9dae 100644
--- a/class_generator/manifests/class_generator_template.j2
+++ b/class_generator/manifests/class_generator_template.j2
@@ -8,7 +8,11 @@
 {% endfor %}
 
 from typing import Any
-from ocp_resources.resource import {{ base_class }}, MissingRequiredArgumentError
+
+{% if all_required_args %}
+from ocp_resources.exceptions import MissingRequiredArgumentError
+{% endif %}
+from ocp_resources.resource import {{ base_class }}
 
 
 class {{ kind }}({{ base_class }}):
diff --git a/class_generator/tests/manifests/APIServer/api_server.py b/class_generator/tests/manifests/APIServer/api_server.py
index d6c013da98..8a263877ad 100644
--- a/class_generator/tests/manifests/APIServer/api_server.py
+++ b/class_generator/tests/manifests/APIServer/api_server.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/ClusterOperator/cluster_operator.py b/class_generator/tests/manifests/ClusterOperator/cluster_operator.py
index e0d6524734..1ff4746568 100644
--- a/class_generator/tests/manifests/ClusterOperator/cluster_operator.py
+++ b/class_generator/tests/manifests/ClusterOperator/cluster_operator.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/ConfigMap/config_map.py b/class_generator/tests/manifests/ConfigMap/config_map.py
index f719e9076e..522fa1cc8d 100644
--- a/class_generator/tests/manifests/ConfigMap/config_map.py
+++ b/class_generator/tests/manifests/ConfigMap/config_map.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import NamespacedResource
 
 
diff --git a/class_generator/tests/manifests/DNS/dns_config_openshift_io.py b/class_generator/tests/manifests/DNS/dns_config_openshift_io.py
index 6b559662b8..de3890a0dc 100644
--- a/class_generator/tests/manifests/DNS/dns_config_openshift_io.py
+++ b/class_generator/tests/manifests/DNS/dns_config_openshift_io.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/DNS/dns_operator_openshift_io.py b/class_generator/tests/manifests/DNS/dns_operator_openshift_io.py
index 14ada9d251..3cdb5ca94e 100644
--- a/class_generator/tests/manifests/DNS/dns_operator_openshift_io.py
+++ b/class_generator/tests/manifests/DNS/dns_operator_openshift_io.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/Deployment/deployment.py b/class_generator/tests/manifests/Deployment/deployment.py
index 4f2738b3c3..d6804d27e0 100644
--- a/class_generator/tests/manifests/Deployment/deployment.py
+++ b/class_generator/tests/manifests/Deployment/deployment.py
@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 from typing import Any
-from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
+
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class Deployment(NamespacedResource):
diff --git a/class_generator/tests/manifests/Image/image_config_openshift_io.py b/class_generator/tests/manifests/Image/image_config_openshift_io.py
index 7fe9806b68..9138051045 100644
--- a/class_generator/tests/manifests/Image/image_config_openshift_io.py
+++ b/class_generator/tests/manifests/Image/image_config_openshift_io.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/Image/image_image_openshift_io.py b/class_generator/tests/manifests/Image/image_image_openshift_io.py
index cdefd7130f..bdfdd0b558 100644
--- a/class_generator/tests/manifests/Image/image_image_openshift_io.py
+++ b/class_generator/tests/manifests/Image/image_image_openshift_io.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/ImageContentSourcePolicy/image_content_source_policy.py b/class_generator/tests/manifests/ImageContentSourcePolicy/image_content_source_policy.py
index 1691c20956..5ca3be4219 100644
--- a/class_generator/tests/manifests/ImageContentSourcePolicy/image_content_source_policy.py
+++ b/class_generator/tests/manifests/ImageContentSourcePolicy/image_content_source_policy.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/Machine/machine.py b/class_generator/tests/manifests/Machine/machine.py
index 70853bd84f..176178419c 100644
--- a/class_generator/tests/manifests/Machine/machine.py
+++ b/class_generator/tests/manifests/Machine/machine.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import NamespacedResource
 
 
diff --git a/class_generator/tests/manifests/NMState/nm_state.py b/class_generator/tests/manifests/NMState/nm_state.py
index 19bfc7557d..bedb4ca61e 100644
--- a/class_generator/tests/manifests/NMState/nm_state.py
+++ b/class_generator/tests/manifests/NMState/nm_state.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/OAuth/oauth.py b/class_generator/tests/manifests/OAuth/oauth.py
index 7d363f8090..fe8718a514 100644
--- a/class_generator/tests/manifests/OAuth/oauth.py
+++ b/class_generator/tests/manifests/OAuth/oauth.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import Resource
 
 
diff --git a/class_generator/tests/manifests/Pipeline/pipeline.py b/class_generator/tests/manifests/Pipeline/pipeline.py
index a7a26a6d51..924ef89cf9 100644
--- a/class_generator/tests/manifests/Pipeline/pipeline.py
+++ b/class_generator/tests/manifests/Pipeline/pipeline.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import NamespacedResource
 
 
diff --git a/class_generator/tests/manifests/Pod/pod.py b/class_generator/tests/manifests/Pod/pod.py
index e9c069b2a1..d16725e524 100644
--- a/class_generator/tests/manifests/Pod/pod.py
+++ b/class_generator/tests/manifests/Pod/pod.py
@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 from typing import Any
-from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
+
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class Pod(NamespacedResource):
diff --git a/class_generator/tests/manifests/Secret/secret.py b/class_generator/tests/manifests/Secret/secret.py
index d01e214591..38b682c116 100644
--- a/class_generator/tests/manifests/Secret/secret.py
+++ b/class_generator/tests/manifests/Secret/secret.py
@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from typing import Any
+
 from ocp_resources.resource import NamespacedResource
 
 
diff --git a/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.py b/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.py
index f0e59d0ae3..00c51f4a85 100644
--- a/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.py
+++ b/class_generator/tests/manifests/ServiceMeshMember/service_mesh_member.py
@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 from typing import Any
-from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
+
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class ServiceMeshMember(NamespacedResource):
diff --git a/class_generator/tests/manifests/ServingRuntime/serving_runtime.py b/class_generator/tests/manifests/ServingRuntime/serving_runtime.py
index fb61db4777..8e2f9d2ed0 100644
--- a/class_generator/tests/manifests/ServingRuntime/serving_runtime.py
+++ b/class_generator/tests/manifests/ServingRuntime/serving_runtime.py
@@ -3,7 +3,9 @@
 from __future__ import annotations
 
 from typing import Any
-from ocp_resources.resource import NamespacedResource, MissingRequiredArgumentError
+
+from ocp_resources.exceptions import MissingRequiredArgumentError
+from ocp_resources.resource import NamespacedResource
 
 
 class ServingRuntime(NamespacedResource):