diff --git a/.github/workflows/macos-java.yml b/.github/workflows/macos-java.yml
index af8df19ca..d0e45daa1 100644
--- a/.github/workflows/macos-java.yml
+++ b/.github/workflows/macos-java.yml
@@ -3,8 +3,6 @@ name: MacOS with Java interoperability
 on:
   pull_request:
     branches: [ java-interop ]
-  # push:
-  #   branches: [ java-interop ]
   # manual run in actions tab - for all branches
   workflow_dispatch:
 
@@ -31,11 +29,9 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install pkg-config automake libtool help2man texinfo bison berkeley-db@4 json-c
+          brew install pkg-config automake libtool help2man texinfo bison
           BREW_PREFIX="$(brew --prefix)"
           echo "BREW_PREFIX=$BREW_PREFIX" >> $GITHUB_ENV
-          echo "LDFLAGS=-L$BREW_PREFIX/opt/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV
-          echo "CPPFLAGS=-I$BREW_PREFIX/opt/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV
 
       - name: Set git user
         run: |
@@ -49,9 +45,7 @@ jobs:
       - name: bootstrap
         run: |
           sed -i '' 's/-undefined suppress//g' configure.ac
-          ./autogen.sh
-          autoconf
-          autoreconf --install --force
+          ./build_aux/bootstrap install
 
       - name: Build environment setup
         run: |
@@ -65,7 +59,16 @@ jobs:
         run: |
           cd _build
           export CFLAGS="-Wno-deprecated-non-prototype -Wno-parentheses-equality $CFLAGS"
-          ../configure --with-java --enable-cobc-internal-checks --enable-hardening --prefix /opt/cobol/gnucobol --exec-prefix /opt/cobol/gnucobol YACC="$BREW_PREFIX/opt/bison/bin/bison" PKG_CONFIG="$BREW_PREFIX/opt/pkg-config/bin/pkg-config"
+          ../configure --enable-cobc-internal-checks \
+                       --enable-hardening \
+                       --prefix /opt/cobol/gnucobol \
+                       --exec-prefix /opt/cobol/gnucobol \
+                       --without-indexed \
+                       --without-json \
+                       --without-xml2 \
+                       --with-java \
+                       YACC="$BREW_PREFIX/opt/bison/bin/bison" \
+                       PKG_CONFIG="$BREW_PREFIX/opt/pkg-config/bin/pkg-config"
 
       - name: Upload config.log
         uses: actions/upload-artifact@v4
@@ -109,7 +112,8 @@ jobs:
               -e '\%AT_SETUP(\[LINE SEQUENTIAL COMMIT / ROLLBACK\])%a\
                     AT_SKIP_IF(\[true\])' \
               tests/testsuite.src/run_file.at
-          make -C _build check TESTSUITEFLAGS="--jobs=$((${NPROC}+1))"
+          make -C _build check TESTSUITEFLAGS="--jobs=$((${NPROC}+1))" || \
+          make -C _build check TESTSUITEFLAGS="--recheck --verbose"
 
       - name: Upload testsuite.log
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/ubuntu-java.yml b/.github/workflows/ubuntu-java.yml
index bfdd629d8..9fadb0f53 100644
--- a/.github/workflows/ubuntu-java.yml
+++ b/.github/workflows/ubuntu-java.yml
@@ -3,8 +3,6 @@ name: Ubuntu with Java interoperability
 on:
   pull_request:
     branches: [ java-interop ]
-  # push:
-  #   branches: [ java-interop ]
   # manual run in actions tab - for all branches
   workflow_dispatch:
 
@@ -28,7 +26,7 @@ jobs:
       - name: Install packages
         run: |
           sudo apt-get update
-          sudo apt-get install automake libtool libdb5.3-dev libxml2-dev libcjson-dev bison flex help2man gettext texlive
+          sudo apt-get install automake libtool bison flex help2man gettext texlive
 
       - name: Set git user
         run: |
@@ -67,7 +65,13 @@ jobs:
       - name: configure
         run: |
           cd _build
-          ../configure --with-java --enable-cobc-internal-checks --enable-hardening --prefix ${INSTALL_PATH}
+          ../configure --enable-cobc-internal-checks \
+                       --enable-hardening \
+                       --prefix ${INSTALL_PATH} \
+                       --without-indexed \
+                       --without-json \
+                       --without-xml2 \
+                       --with-java
           echo "VERSION=PACKAGE_VERSION" | cpp -P -imacros config.h | tr -d \" >> $GITHUB_ENV
 
       - name: Upload config.log
@@ -79,19 +83,18 @@ jobs:
 
       - name: make
         run: |
-          cd _build
-          make --jobs=$(($(nproc)+1))
+          make -C _build --jobs=$(($(nproc)+1))
 
-      # - name: check
-      #   run: |
-      #     cd _build
-      #     make check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))"
-
-      # note: distcheck also creates the dist tarball
-      - name: distcheck
+      - name: check
         run: |
-          cd _build
-          make --jobs=$(($(nproc)+1)) distcheck TESTSUITEFLAGS="--jobs=$(($(nproc)+1))"
+          make -C _build distcheck                                    \
+                         TESTSUITEFLAGS="--jobs=$(($(nproc)+1))"      \
+                         DISTCHECK_CONFIGURE_FLAGS="--without-indexed \
+                                                    --without-json    \
+                                                    --without-xml2    \
+                                                    --with-java" ||   \
+          make -C _build check                                        \
+                         TESTSUITEFLAGS="--recheck --verbose"
 
       - name: Upload testsuite.log
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/windows-java.yml b/.github/workflows/windows-java.yml
index 3a095f7ad..d9fce23b3 100644
--- a/.github/workflows/windows-java.yml
+++ b/.github/workflows/windows-java.yml
@@ -3,8 +3,6 @@ name: Windows MSYS2 with Java interoperability
 on:
   pull_request:
     branches: [ java-interop ]
-  push:
-    branches: [ java-interop-ci4windows-x ]
   # manual run in actions tab - for all branches
   workflow_dispatch: