diff --git a/.github/workflows/commit_validation.yml b/.github/workflows/commit_validation.yml
deleted file mode 100644
index 057acf1..0000000
--- a/.github/workflows/commit_validation.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-name: Commit validation
-run-name: ${{ github.event.head_commit.message }} pushed by ${{ github.actor }}, to test and lint - $${{ github.sha }}
-on: [push]
-jobs:
-  run-bb:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - name: Set ownership
-        run: |
-          # this is to fix GIT not liking owner of the checkout dir, See https://github.com/actions/runner/issues/2033
-          chown -R $(id -u):$(id -g) $PWD
-      - name: Base image
-        uses: docker://hephaistox/gha-automaton-optimization:2.0.7
diff --git a/.github/workflows/validation_delaguardo.yml b/.github/workflows/validation_delaguardo.yml
new file mode 100644
index 0000000..4f97ab2
--- /dev/null
+++ b/.github/workflows/validation_delaguardo.yml
@@ -0,0 +1,34 @@
+name: Commit validation - Delaguardo flavor
+on: [push]
+jobs:
+  clojure:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest] # , windows-latest There is a path issue
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Prepare java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '22'
+
+      - name: Install clojure tools
+        uses: DeLaGuardo/setup-clojure@12.5
+        with:
+          cli: 1.11.4.1474             # Clojure CLI based on tools.deps
+          bb: 1.3.191                  # Babashka
+          clj-kondo: 2024.08.01        # Clj-kondo
+          cljfmt: 0.10.2               # cljfmt
+          zprint: 1.2.9                # zprint
+      - name: Cache clojure dependencies
+        uses: actions/cache@v4
+        with:
+          path: /home/runner/.m2/repository
+          key: cljdeps-${{ hashFiles('deps.edn', 'bb.edn') }}
+          restore-keys: cljdeps-
+      - name: Test
+        run: bb heph-task gha
+        
diff --git a/.github/workflows/validation_docker.yml b/.github/workflows/validation_docker.yml
new file mode 100644
index 0000000..644566d
--- /dev/null
+++ b/.github/workflows/validation_docker.yml
@@ -0,0 +1,11 @@
+name: Commit validation - docker flavor
+run-name: Test ${{ github.event.head_commit.message }}
+on: [push]
+jobs:
+  run-bb:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Base image
+        uses: docker://hephaistox/gha-image:1.0.1
diff --git a/bb.edn b/bb.edn
index 2e2d310..8be5a3e 100644
--- a/bb.edn
+++ b/bb.edn
@@ -1,5 +1,5 @@
 ;; The file is updated automatically
-{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "2.0.2"}}
+{:deps {org.clojars.hephaistox/automaton-build #:mvn{:version "3.0.0"}}
  :paths []
  :tasks
  {:requires
diff --git a/deps.edn b/deps.edn
index 508f129..4e6b889 100644
--- a/deps.edn
+++ b/deps.edn
@@ -2,9 +2,9 @@
  {:antq {:deps {com.github.liquidz/antq {:mvn/version "2.9.1217"}}
          :main-opts ["-m" "antq.core"]}
   :bb-deps {:extra-deps {org.clojars.hephaistox/automaton-build
-                         #:mvn{:version "2.0.2"}}}
+                         #:mvn{:version "3.0.0"}}}
   :build {:extra-deps {org.clojars.hephaistox/automaton-build
-                       #:mvn{:version "2.0.2"}}}
+                       #:mvn{:version "3.0.0"}}}
   :cljs-deps {:extra-deps {binaryage/devtools #:mvn{:version "1.0.7"}
                            criterium/criterium {:mvn/version "0.4.6"}
                            kixi/stats {:mvn/version "0.5.5"}
@@ -23,7 +23,7 @@
    :jvm-opts ["-Dheph-conf=env/test/config.edn,env/test/config.edn"]}
   :env-development-repl
   {:extra-deps {org.clojars.hephaistox/automaton-core #:mvn{:version
-                                                            "1.2.9"}}
+                                                            "1.3.0"}}
    :extra-paths ["env/development/resources"
                  "env/development/src/clj"
                  "env/development/src/cljc"]
@@ -44,7 +44,7 @@
                "test/cljc"]}}
  :deps {criterium/criterium {:mvn/version "0.4.6"}
         kixi/stats {:mvn/version "0.5.5"}
-        org.clojars.hephaistox/automaton-core #:mvn{:version "1.2.9"}
+        org.clojars.hephaistox/automaton-core #:mvn{:version "1.3.0"}
         org.clojure/clojure #:mvn{:version "1.11.4"}
         thedavidmeister/xoroshiro128 #:mvn{:version "1.1.3"}}
  :paths ["src/clj" "src/cljc" "resources" "src/cljs"]}
diff --git a/pom.xml b/pom.xml
index 082dc8e..84be9ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <packaging>jar</packaging>
   <groupId>org.clojars.hephaistox</groupId>
   <artifactId>automaton-optimization</artifactId>
-  <version>2.0.7</version>
+  <version>2.1.0</version>
   <name>automaton-optimization</name>
   <dependencies>
     <dependency>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>org.clojars.hephaistox</groupId>
       <artifactId>automaton-core</artifactId>
-      <version>1.2.9</version>
+      <version>1.3.0</version>
     </dependency>
     <dependency>
       <groupId>kixi</groupId>
diff --git a/version.edn b/version.edn
index 6c69e0f..3f90735 100644
--- a/version.edn
+++ b/version.edn
@@ -1,2 +1,2 @@
 ;; Last generated version, note a failed push consume a number
-{:version "2.0.7"}
\ No newline at end of file
+{:version "2.1.0"}
\ No newline at end of file