diff --git a/dev-requirements.in b/dev-requirements.in
index cef6ce1929..6344460ae5 100644
--- a/dev-requirements.in
+++ b/dev-requirements.in
@@ -1,4 +1,4 @@
--e file:.
+-e file:.[marshmallow-jsonschema]
 
 coverage[toml]
 hypothesis
diff --git a/flytekit/core/type_engine.py b/flytekit/core/type_engine.py
index 9993c98479..c6a0076129 100644
--- a/flytekit/core/type_engine.py
+++ b/flytekit/core/type_engine.py
@@ -495,33 +495,35 @@ class DataclassTransformer(TypeTransformer[object]):
             (1) Convert MessagePack Bytes to a dataclass using mashumaro.
             (2) Handle dataclass attributes to ensure they are of the correct types.
 
-        For Json Schema, we use https://github.com/fuhrysteve/marshmallow-jsonschema library.
+        For JSON Schema, mashumaro is the primary generator. If it fails (e.g. for
+        DataClassJsonMixin classes), marshmallow-jsonschema is used as a fallback when
+        the ``marshmallow-jsonschema`` optional extra is installed.
 
         Example
 
         ```python
+        from dataclasses import dataclass
+        from mashumaro.jsonschema import build_json_schema
+
         @dataclass
-        class Test(DataClassJsonMixin):
+        class Test:
             a: int
             b: str
 
-        from marshmallow_jsonschema import JSONSchema
-        t = Test(a=10,b="e")
-        JSONSchema().dump(t.schema())
+        build_json_schema(Test).to_dict()
         ```
 
         Output will look like
 
         ```python
-        {'$schema': 'http://json-schema.org/draft-07/schema#',
-            'definitions': {'TestSchema': {'properties': {'a': {'title': 'a',
-                'type': 'number',
-                'format': 'integer'},
-            'b': {'title': 'b', 'type': 'string'}},
-            'type': 'object',
-            'additionalProperties': False}},
-            '$ref': '#/definitions/TestSchema'}
-    ```
+        {'type': 'object',
+            'title': 'Test',
+            'properties': {
+                'a': {'type': 'integer'},
+                'b': {'type': 'string'}},
+            'additionalProperties': False,
+            'required': ['a', 'b']}
+        ```
 
         > [!NOTE]
         > The schema support is experimental and is useful for auto-completing in the UI/CLI
diff --git a/pyproject.toml b/pyproject.toml
index 82b8c6c054..8b6a33c0e5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools<70", "setuptools_scm"]
+requires = ["setuptools>=70", "setuptools_scm"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -36,9 +36,6 @@ dependencies = [
     "keyring>=18.0.1",
     "markdown-it-py",
     "marshmallow>=3,<4",
-    "marshmallow-enum",
-    "marshmallow-jsonschema>=0.12.0",
-    "setuptools<70",
     "mashumaro>=3.15",
     "msgpack>=1.1.0",
     "protobuf!=4.25.0",
@@ -163,3 +160,11 @@ connector = [
     "httpx",
     "prometheus-client",
 ]
+
+# marshmallow-jsonschema is used as a fallback for JSON Schema generation when
+# mashumaro fails. It requires setuptools<82 for pkg_resources at runtime.
+marshmallow-jsonschema = [
+    "marshmallow-enum",
+    "marshmallow-jsonschema>=0.12.0",
+    "setuptools>=70,<82",
+]