diff --git a/ci/build-java-only.sh b/ci/build-java-only.sh
index 4646b4c2a..ac4cf7891 100755
--- a/ci/build-java-only.sh
+++ b/ci/build-java-only.sh
@@ -8,5 +8,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the
 
 npm install # We can't do npm ci because lerna has optional dependencies :(
 
+# First we have to build the definition-dsl, because it needs to be installed
+# for java to build when there are breaking changes
+npx lerna run build --scope @contract-case/case-definition-dsl
 cd packages/dsl-java
 npm run compile
diff --git a/nx.json b/nx.json
index c05eb9ca6..519fdf537 100644
--- a/nx.json
+++ b/nx.json
@@ -1,64 +1,33 @@
 {
   "targetDefaults": {
     "prebuild": {
-      "dependsOn": [
-        "^prebuild"
-      ]
+      "dependsOn": ["^prebuild"]
     },
     "test": {
-      "dependsOn": [
-        "downloadContracts",
-        "build"
-      ],
+      "dependsOn": ["downloadContracts", "build"],
       "cache": true
     },
     "build": {
-      "dependsOn": [
-        "^build"
-      ],
-      "outputs": [
-        "{projectRoot}/dist"
-      ],
+      "dependsOn": ["^build"],
+      "outputs": ["{projectRoot}/dist"],
       "cache": true
     },
     "build:docs": {
-      "dependsOn": [
-        "^build",
-        "^build:docs",
-        "build"
-      ],
-      "outputs": [
-        "{projectRoot}/dist"
-      ]
+      "dependsOn": ["^build", "^build:docs", "build"],
+      "outputs": ["{projectRoot}/dist"]
     },
     "build:docs:local": {
-      "dependsOn": [
-        "^build",
-        "^build:docs:local",
-        "build"
-      ],
-      "outputs": [
-        "{projectRoot}/docs"
-      ]
+      "dependsOn": ["^build", "^build:docs:local", "build"],
+      "outputs": ["{projectRoot}/docs"]
     },
     "package": {
-      "dependsOn": [
-        "build",
-        "^package"
-      ],
-      "outputs": [
-        "{projectRoot}/dist"
-      ],
+      "dependsOn": ["build", "^package"],
+      "outputs": ["{projectRoot}/dist"],
       "cache": true
     },
     "publish:maven": {
-      "dependsOn": [
-        "package",
-        "^publish:maven"
-      ],
-      "outputs": [
-        "{projectRoot}/dist"
-      ]
+      "dependsOn": ["package", "^build", "^publish:maven"],
+      "outputs": ["{projectRoot}/dist"]
     },
     "lint": {
       "cache": true
@@ -69,13 +38,8 @@
   },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "namedInputs": {
-    "default": [
-      "{projectRoot}/**/*",
-      "sharedGlobals"
-    ],
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "sharedGlobals": [],
-    "production": [
-      "default"
-    ]
+    "production": ["default"]
   }
 }
diff --git a/packages/case-definition-dsl/package.json b/packages/case-definition-dsl/package.json
index 8afbfcba2..27622407d 100644
--- a/packages/case-definition-dsl/package.json
+++ b/packages/case-definition-dsl/package.json
@@ -23,7 +23,7 @@
     "watch": "jsii -w",
     "prepackage": "rimraf dist",
     "prepack": "bash -c './script/link-bundled-deps.sh'",
-    "package": "jsii-pacmak --verbose=3",
+    "package": "jsii-pacmak --parallel=false --verbose=3",
     "postpackage": "bash -c './script/local-maven-install.sh'",
     "publish:maven": "publib-maven",
     "test": "jest",
@@ -75,7 +75,7 @@
     "@types/jest": "^29.5.12",
     "jsii": "^5.7.4",
     "jsii-docgen": "^10.6.1",
-    "jsii-pacmak": "^1.108.0",
+    "@contract-case/jsii-pacmak": "^0.0.1",
     "mkdirp": "^3.0.1",
     "prettier": "3.4.2",
     "publib": "^0.2.955",
diff --git a/packages/case-definition-dsl/script/link-bundled-deps.sh b/packages/case-definition-dsl/script/link-bundled-deps.sh
index c5ca399ac..9cb2c56fb 100755
--- a/packages/case-definition-dsl/script/link-bundled-deps.sh
+++ b/packages/case-definition-dsl/script/link-bundled-deps.sh
@@ -5,4 +5,6 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the
 
 BASE=$(realpath "$SCRIPT_DIR"/../../../node_modules/@contract-case)
 
-find "$BASE"/* -exec bash -c 'echo $0; mkdir -p '"$SCRIPT_DIR"/..'/node_modules/@contract-case/$(basename $0); cp -R "$0/"* '"$SCRIPT_DIR"'/../node_modules/@contract-case/$(basename "$0") 2>/dev/null; echo done' '{}' \;
+# echo "Finding in $BASE"
+
+find "$BASE"/* -exec bash -c 'mkdir -p '"$SCRIPT_DIR"/..'/node_modules/@contract-case/$(basename $0); cp -R "$0/"* '"$SCRIPT_DIR"'/../node_modules/@contract-case/$(basename "$0") 2>/dev/null;' '{}' \;
diff --git a/packages/dsl-java/package.json b/packages/dsl-java/package.json
index 920412625..63e8cc361 100644
--- a/packages/dsl-java/package.json
+++ b/packages/dsl-java/package.json
@@ -17,7 +17,8 @@
   "scripts": {
     "build": "rimraf build && bash install-connector.sh && bash -c './gradlew build testClasses -x test'",
     "compile": "bash -c './gradlew build testClasses -x test'",
-    "test": "bash -c './gradlew test'"
+    "test": "bash -c './gradlew test'",
+    "test:local": "bash -c './gradlew test'"
   },
   "funding": {
     "type": "individual",