diff --git a/.github/workflows/openssf-scorecard.yml b/.github/workflows/openssf-scorecard.yml
index c131f34..0cead4a 100644
--- a/.github/workflows/openssf-scorecard.yml
+++ b/.github/workflows/openssf-scorecard.yml
@@ -21,6 +21,6 @@ jobs:
       contents: read
       security-events: write
       id-token: write
-    uses: diggsweden/reusable-ci/.github/workflows/security-openssf-scorecard.yml@1a7dcd9c5257495ebf141e4e4b4bac438a8aae56 # v2.0.0
+    uses: diggsweden/reusable-ci/.github/workflows/security-openssf-scorecard.yml@feat/branch-2.1
     with:
       publish-results: true
diff --git a/.github/workflows/pullrequest-workflow.yml b/.github/workflows/pullrequest-workflow.yml
index ec15e56..5288f97 100644
--- a/.github/workflows/pullrequest-workflow.yml
+++ b/.github/workflows/pullrequest-workflow.yml
@@ -13,7 +13,7 @@ permissions:
 
 jobs:
   pr-checks:
-    uses: diggsweden/reusable-ci/.github/workflows/pullrequest-orchestrator.yml@1a7dcd9c5257495ebf141e4e4b4bac438a8aae56 # v2.0.0
+    uses: diggsweden/reusable-ci/.github/workflows/pullrequest-orchestrator.yml@feat/branch-2.1
     secrets: inherit # Pass org-level secrets (for private dependencies if any)
     permissions:
       contents: read # Clone repository and read source code
@@ -21,8 +21,11 @@ jobs:
       security-events: write # Upload SpotBugs/dependency check results to Security tab
     with:
       project-type: maven
+      workflows-ref: feat/branch-2.1 # Use feature branch with enhanced linting
       linters.megalint: false # Disable heavy MegaLinter
       linters.justmiselint: true # Enable lightweight just+mise linting
+      linters.commitlint: false # Handled by justfile (lint-commit)
+      linters.licenselint: false # Handled by justfile (lint-license)
 
   test:
     needs: [pr-checks]
diff --git a/.github/workflows/release-workflow.yml b/.github/workflows/release-workflow.yml
index 3e15a17..14ad318 100644
--- a/.github/workflows/release-workflow.yml
+++ b/.github/workflows/release-workflow.yml
@@ -22,7 +22,7 @@ permissions:
 
 jobs:
   release:
-    uses: diggsweden/reusable-ci/.github/workflows/release-orchestrator.yml@1a7dcd9c5257495ebf141e4e4b4bac438a8aae56 # v2.0.0
+    uses: diggsweden/reusable-ci/.github/workflows/release-orchestrator.yml@feat/branch-2.1
     permissions:
       contents: write # Create GitHub releases and tags
       packages: write # Publish to GitHub Packages (backup)
diff --git a/README.md b/README.md
index 2e1686b..be30da4 100644
--- a/README.md
+++ b/README.md
@@ -7,5 +7,6 @@
 
 [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/diggsweden/hash2curve-lib-java/badge?style=for-the-badge)](https://scorecard.dev/viewer/?uri=github.com/diggsweden/hash2curve-lib-java)
 
-This library implements Hash2Curve and Hash2Scalar according to RFC 9380 for a number of common curves, including
-common NIST curves.
+This library implements Hash2Curve and Hash2Scalar according to RFC 9380 for a number of common curves, including common NIST curves.
+
+Test
diff --git a/justfile b/justfile
index 46c6557..68f9520 100644
--- a/justfile
+++ b/justfile
@@ -99,7 +99,7 @@ lint-shell:
     printf '{{yellow}}************ SHELL LINTING ***********{{nc}}\n'
     if [ -n "$(find . -name '*.sh' -type f | head -1)" ]; then
         find . -name '*.sh' -type f | xargs shellcheck || exit 1
-        find . -name '*.sh' -type f | xargs shfmt -d || exit 1
+        find . -name '*.sh' -type f | xargs shfmt -d -i 2 || exit 1
     else
         printf 'No shell scripts found, skipping\n'
     fi
@@ -171,7 +171,7 @@ lint-shell-fix:
     set -euo pipefail
     printf '{{yellow}}************ FIXING SHELL ***********{{nc}}\n'
     if [ -n "$(find . -name '*.sh' -type f | head -1)" ]; then
-        find . -name '*.sh' -type f | xargs shfmt -w
+        find . -name '*.sh' -type f | xargs shfmt -w -i 2
     fi
     printf '{{green}}{{checkmark}} Shell scripts formatted{{nc}}\n\n'
 
diff --git a/src/main/java/se/digg/crypto/hashtocurve/data/MapToCurvePoints.java b/src/main/java/se/digg/crypto/hashtocurve/data/MapToCurvePoints.java
index fbb681f..1341ef6 100644
--- a/src/main/java/se/digg/crypto/hashtocurve/data/MapToCurvePoints.java
+++ b/src/main/java/se/digg/crypto/hashtocurve/data/MapToCurvePoints.java
@@ -10,7 +10,7 @@
  * The Hash to field points produced by hash_to_field(msg, 2).
  */
 public record MapToCurvePoints(
-        ECPoint q0,
-        ECPoint q1) {
+    ECPoint q0,
+    ECPoint q1) {
 
 }
diff --git a/src/main/java/se/digg/crypto/hashtocurve/data/SqrtRatio.java b/src/main/java/se/digg/crypto/hashtocurve/data/SqrtRatio.java
index ca6a2d1..117dd25 100644
--- a/src/main/java/se/digg/crypto/hashtocurve/data/SqrtRatio.java
+++ b/src/main/java/se/digg/crypto/hashtocurve/data/SqrtRatio.java
@@ -10,6 +10,6 @@
  * The result of a sqrt_ration calculation.
  */
 public record SqrtRatio(
-        boolean isQR,
-        BigInteger ratio) {
+    boolean isQR,
+    BigInteger ratio) {
 }