diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cd389c722195cf939bee985e26df2de82caf50f2..d5cf7c20d24be1378034597109c85eb17cbc14b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,14 +28,14 @@ variables:
 
 
 # base image
-image: gekkofs/core:0.9.5
+image: gekkofs/core:0.9.6
 
 ################################################################################
 ## Validating
 ################################################################################
 check format:
   stage: lint
-  image: gekkofs/linter:0.9.5
+  image: gekkofs/linter:0.9.6
   needs: []
   script:
     - ${SCRIPTS_DIR}/check_format.sh
@@ -49,7 +49,7 @@ check format:
 ################################################################################
 gkfs:
   stage: build
-  image: gekkofs/deps:0.9.5
+  image: gekkofs/deps:0.9.6
   interruptible: true
   needs: []
   script:
@@ -88,7 +88,7 @@ gkfs:
 ## == tests for scripts ====================
 scripts:
   stage: test
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   needs: []
   script:
     - mkdir -p ${BUILD_PATH}/tests/scripts
@@ -103,7 +103,7 @@ scripts:
 ## == integration tests for gkfs ===========
 gkfs:allintegration:
   stage: test
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   interruptible: true
   needs: ['gkfs']
 
@@ -151,12 +151,12 @@ gkfs:allintegration:
 ## == integration tests for gkfs ===========
 gkfs:integration:
   stage: test
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   interruptible: true
   needs: ['gkfs']  # we need to remove gkfs dependencies on manual
   parallel:
     matrix:
-      - SUBTEST: [ data, status, syscalls, directories, operations, position, shell, rename ]
+      - SUBTEST: [ data, status, syscalls, directories, operations, position, shell, rename, migration, startup, error_handling, resilience, compatibility ]
   rules:
     - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "detached"'
       when: never
@@ -209,7 +209,7 @@ gkfs:integration:
 ## == integration tests for gkfwd ==========
 gkfwd:integration:
   stage: test
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   interruptible: true
   needs: ['gkfs']
   parallel:
@@ -267,7 +267,7 @@ gkfwd:integration:
 ## == unit tests for gkfs ==================
 gkfs:unit:
   stage: test
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   needs: ['gkfs']
   script:
     ## Add path to mkfs.kreon
@@ -307,7 +307,7 @@ gkfs:unit:
 ## == unit tests for gkfs ==================
 gkfs:app:
   stage: test
-  image: gekkofs/apps:0.9.5
+  image: gekkofs/apps:0.9.6
   needs: ['gkfs']
   script:
     ## Add path to mkfs.kreon
@@ -348,7 +348,7 @@ gkfs:app:
 ## == java tests for gkfs ==================
 gkfs:java:
   stage: test
-  image: gekkofs/java:0.9.5
+  image: gekkofs/java:0.9.6
   needs: ['gkfs']
   script:
     ## Add path to mkfs.kreon
@@ -389,7 +389,7 @@ gkfs:java:
 ## == python tests for gkfs ==================
 gkfs:python:
   stage: test
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   needs: ['gkfs']
   script:
     ## Add path to mkfs.kreon
@@ -432,7 +432,7 @@ gkfs:python:
 ################################################################################
 documentation:
   stage: docs
-  image: gekkofs/docs:0.9.5
+  image: gekkofs/docs:0.9.6
   needs: []
   rules:
     # we only build the documentation automatically if we are on the
@@ -465,7 +465,7 @@ documentation:
 ## == coverage baseline ====================
 coverage:baseline:
   stage: report
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   interruptible: true
   needs: ['gkfs']
 
@@ -496,7 +496,7 @@ coverage:baseline:
 
 coverage:
   stage: report
-  image: gekkofs/testing:0.9.5
+  image: gekkofs/testing:0.9.6
   #needs: [ 'coverage:baseline', 'gkfs:integration', 'gkfs:unit', 'gkfwd:integration']
   needs: [ 'coverage:baseline', 'gkfs:allintegration', 'gkfs:unit', 'gkfs:app', 'gkfs:java', 'gkfs:python' ]
   script:
@@ -528,12 +528,11 @@ coverage:
 
 cppcheck:
   stage: report
-  image: gekkofs/testing:0.9.5
-  needs: [ 'gkfs:allintegration', 'gkfs:unit']
+  image: gekkofs/testing:0.9.6
+  needs: [ 'gkfs']
   script:
     - cd ${CI_PROJECT_DIR}
-    - rm -rf external gkfs
-    - cppcheck -I/usr/local/include --xml --enable=warning,style,performance --force ${CI_PROJECT_DIR} 2> cppcheck_out.xml 
+    - cppcheck --enable=all --std=c++17 --suppress=missingIncludeSystem --xml --xml-version=2 src include tests -i external -i builds -i gkfs 2> cppcheck_out.xml
     - cppcheck-codequality --input-file cppcheck_out.xml --output-file cppcheck.json
   #change paths
   after_script:
diff --git a/docker/0.9.6/apps/Dockerfile b/docker/0.9.6/apps/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..fa51af2a2282b3944a60b0eb35530b77fa7fbb42
--- /dev/null
+++ b/docker/0.9.6/apps/Dockerfile
@@ -0,0 +1,70 @@
+FROM gekkofs/testing:0.9.6 AS builder
+
+LABEL Description="Build environment for S3D-IO and WaComM++"
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN <<EOF
+    apt-get update
+    apt-get install -y --no-install-recommends \
+    openmpi-bin openmpi-common gfortran libopenmpi-dev pnetcdf-bin libpnetcdf-dev libssl-dev wget nco nghttp2
+    rm -rf /var/lib/apt/lists/* 
+    apt-get clean
+    apt-get autoclean
+EOF
+
+# --- Build S3D-IO ---
+WORKDIR /build/S3D-IO
+RUN git clone https://github.com/wkliao/S3D-IO.git . && \
+    # Note: The PNETCDF_DIR and include path might need adjustment if libpnetcdf-dev installs to a different standard location
+    # or if the base image structure changes.
+    sed -i -e 's/PNETCDF_DIR = ${HOME}\/PNetCDF/PNETCDF_DIR = \/usr/' \
+    -e 's/\(INC[[:space:]]*=[[:space:]]*-I\$(PNETCDF_DIR)\/include\)/\1 -I\/usr\/lib\/x86_64-linux-gnu\/fortran\/gfortran-mod-15/' Makefile && \
+    make && \
+    mv s3d_io.x /usr/local/bin/s3d_io.x
+
+# --- Build wacommplusplus ---
+WORKDIR /build/wacommplusplus
+RUN git clone https://github.com/CCMMMA/wacommplusplus.git . && \
+    sed -i 's|\${LIBCURL}|/usr/lib/x86_64-linux-gnu/libcurl.so|g' CMakeLists.txt && \
+    mkdir build && cd build && \
+    cmake .. && \
+    make -j$(nproc) && \
+    mv wacommplusplus /usr/local/bin/wacommplusplus && \
+    mv external /usr/local/lib/
+
+# ---- Final Stage ----
+FROM gekkofs/testing:0.9.6
+
+LABEL Description="Debian-based environment to test GekkoFS with apps"
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install runtime dependencies
+# libpnetcdf13 (or similar, check exact name with 'apt-cache search libpnetcdf')
+# libssl might be libssl1.1 or libssl3 depending on Debian version in base image
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    openmpi-bin openmpi-common libopenmpi-dev pnetcdf-bin libssl3 libcurl4 \
+    wget nco nghttp2 \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean && \
+    mkdir -p /root/wacommplusplus/build/example /root/S3D-IO
+
+# Copy built applications from the builder stage
+COPY --from=builder /usr/local/bin/s3d_io.x /root/S3D-IO
+COPY --from=builder /usr/local/bin/wacommplusplus /root/wacommplusplus/build
+COPY --from=builder /usr/local/lib/external /root/wacommplusplus/build/external/
+
+
+WORKDIR /root/wacommplusplus/build/example
+COPY rms.tar.gz /root/wacommplusplus/build/example/input/
+RUN mkdir -p input processed output restarts && \
+    cd input && \
+    tar xzf rms.tar.gz && \
+    rm rms.tar.gz
+
+# Copy configuration files
+# These files (sources.json, wacomm.json) should be in the same directory as your Dockerfile
+COPY sources.json /root/wacommplusplus/build/example
+COPY wacomm.json /root/wacommplusplus/build/example
+
+ENV LD_LIBRARY_PATH=/root/wacommplusplus/build/external/lib/
diff --git a/docker/0.9.6/apps/Makefile b/docker/0.9.6/apps/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..39f930a5746759fdd3d8086545d227ac93a039fe
--- /dev/null
+++ b/docker/0.9.6/apps/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all
+
+amd64:
+	docker build --platform amd64 -t gekkofs/apps:0.9.6 .
+
+aarch64:
+	docker build --platform aarch64 -t gekkofs/apps:0.9.6 .
+
+all:
+	docker build -t gekkofs/apps:0.9.6 .
diff --git a/docker/0.9.6/apps/rms.tar.gz b/docker/0.9.6/apps/rms.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..15be6ec423b1a40b9b369a69dc6b0f578451345e
Binary files /dev/null and b/docker/0.9.6/apps/rms.tar.gz differ
diff --git a/docker/0.9.6/apps/sources.json b/docker/0.9.6/apps/sources.json
new file mode 100644
index 0000000000000000000000000000000000000000..ead4beb58b2d7538b9906b77ba9c29de2b6aacb7
--- /dev/null
+++ b/docker/0.9.6/apps/sources.json
@@ -0,0 +1,27 @@
+{
+    "type": "FeatureCollection",
+    "crs": {
+        "type": "name",
+        "properties": {
+            "name": "urn:ogc:def:crs:OGC:1.3:CRS84"
+        }
+    },
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {
+                "start": -1.0,
+                "end": -1.0,
+                "mode": 1,
+                "particlesPerHour": 100,
+                "depth": 0.0,
+                "id": "1"
+            },
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    14.972061,
+                    40.343286
+                ]
+            }
+        } ] }
\ No newline at end of file
diff --git a/docker/0.9.6/apps/wacomm.json b/docker/0.9.6/apps/wacomm.json
new file mode 100644
index 0000000000000000000000000000000000000000..14522409491e6bb02c09e7732fb67deb03af9933
--- /dev/null
+++ b/docker/0.9.6/apps/wacomm.json
@@ -0,0 +1,46 @@
+{
+    "io": {
+    "base_path": "/root/wacommplusplus/build/example/input",
+    "history_root": "/root/wacommplusplus/build/example/restarts/",
+    "mask_output": true,
+    "nc_input_root": "/root/wacommplusplus/build/example/input/rms3_d03",
+    "nc_inputs": [
+                    "rms3_d03_20250101Z0000.nc"
+            ],
+    "nc_output_root": "/root/wacommplusplus/build/example/output/wacomm_his_",
+    "ocean_model": "ROMS",
+    "save_history": "json",
+    "save_input": false,
+    "timestep": 3600
+},
+"physics": {
+    "horizontal_closure": "kill",
+    "lower_closure": "kill",
+    "random": true,
+    "random_sources": true,
+    "shore_limit": 0.5,
+    "sigma": 3.46,
+    "survprob": 0.0001,
+    "sv": 0,
+    "tau0": 86400.0,
+    "upper_closure": "reflection"
+},
+"restart": {
+    "active": false,
+    "interval": 3600,
+    "restart_file": ""
+},
+"simulation": {
+    "dry": false,
+    "end": "20250101Z00",
+    "hours": 24,
+    "institution": "meteo@uniparthenope - Department of Science and Technologies, University of Naples Parthenope",
+    "name": "WaComM++",
+    "start": "20250101Z01",
+    "url": "https://meteo.uniparthenope.it"
+},
+"sources": {
+    "active": true,
+    "sources_file": "sources.json" 
+}
+}
\ No newline at end of file
diff --git a/docker/0.9.6/core/Dockerfile b/docker/0.9.6/core/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..4895c9cf9fa4df9ce98ad767244f3b4ed3a7264a
--- /dev/null
+++ b/docker/0.9.6/core/Dockerfile
@@ -0,0 +1,35 @@
+FROM debian:trixie-slim
+
+LABEL Description="Debian-based environment suitable to build GekkoFS and its dependencies"
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+		git \
+		curl \
+		ca-certificates \
+		libtool \
+		pkg-config \
+		make \
+		automake \
+		gcc \
+		g++ \
+		ninja-build \
+		procps \
+		# AGIOS dependencies
+		libconfig-dev \
+		# Mercury dependencies
+		libltdl-dev \
+		lbzip2 \
+        # Margo dependencies \
+        libjson-c-dev \
+		# RocksDB dependencies
+		liblz4-dev \
+		# syscall_intercept dependencies
+		# libcapstone-dev \
+		# GekkoFS dependencies
+		libboost-program-options-dev \
+		uuid-dev ccache cmake && \
+    # Clean apt cache to reduce image layer size
+    rm -rf /var/lib/apt/lists/* && \
+    # Clean apt caches of packages
+    apt-get clean && apt-get autoclean 
diff --git a/docker/0.9.6/core/Makefile b/docker/0.9.6/core/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..a18b1df2a76b7419ed0cb223412e0c013092a715
--- /dev/null
+++ b/docker/0.9.6/core/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all
+
+amd64:
+	docker buildx build --platform amd64 -t gekkofs/core:0.9.6 .
+
+aarch64:
+	docker buildx build --platform aarch64 -t gekkofs/core:0.9.6 .
+
+all:
+	docker buildx build -t gekkofs/core:0.9.6 .
diff --git a/docker/0.9.6/deps/Dockerfile b/docker/0.9.6/deps/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..f6ceceb4f5bdb4d9030891fadfb6751cbd2ebe10
--- /dev/null
+++ b/docker/0.9.6/deps/Dockerfile
@@ -0,0 +1,37 @@
+FROM gekkofs/core:0.9.6
+
+LABEL Description="Debian-based environment to build GekkoFS"
+
+ENV GKFS_PATH=/opt/gkfs
+ENV GKFS_VERSION=0.9.6-dev
+
+ENV SCRIPTS_PATH=${GKFS_PATH}/scripts
+ENV DEPS_SRC_PATH=${GKFS_PATH}/deps_src
+ENV INSTALL_PATH=/usr/local
+
+COPY scripts/dl_dep.sh		${SCRIPTS_PATH}/
+COPY scripts/compile_dep.sh ${SCRIPTS_PATH}/
+COPY scripts/patches        ${SCRIPTS_PATH}/patches
+COPY scripts/profiles       ${SCRIPTS_PATH}/profiles
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  python3 \
+  python3-pip \
+  python3-dev \
+  python3-venv \
+  python3-setuptools \
+  libnuma-dev libyaml-dev libcurl4-openssl-dev \
+  procps && \
+  rm -rf /var/lib/apt/lists/* && \
+  apt-get clean && apt-get autoclean
+
+# Download and build dependencies
+RUN cd ${SCRIPTS_PATH} && \
+  /bin/bash ./dl_dep.sh -p ci:${GKFS_VERSION} ${DEPS_SRC_PATH} && \
+  /bin/bash ./compile_dep.sh -j 8 -p ci:${GKFS_VERSION} ${DEPS_SRC_PATH} ${INSTALL_PATH} && \
+  cp ${DEPS_SRC_PATH}/parallax/lib/include/parallax/structures.h ${INSTALL_PATH}/include/ &&\
+  rm -rf ${DEPS_SRC_PATH} && \
+  rm -rf ${SCRIPTS_PATH} && \
+  rmdir ${GKFS_PATH} && \
+  ldconfig
diff --git a/docker/0.9.6/deps/Makefile b/docker/0.9.6/deps/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..2b4932315d5b0cdad553c7d2ed0d439fea6232ab
--- /dev/null
+++ b/docker/0.9.6/deps/Makefile
@@ -0,0 +1,23 @@
+CWD:=$(shell pwd)
+GIT_ROOT:=$(shell git rev-parse --show-toplevel)
+
+.PHONY: all build copy-scripts remove-scripts
+
+all: build copy-scripts remove-scripts
+amd64: build-amd64 copy-scripts remove-scripts
+aarch64: build-aarch64 copy-scripts remove-scripts
+
+copy-scripts:
+	cp -R $(GIT_ROOT)/scripts $(CWD)/scripts
+
+build: copy-scripts
+	docker build -t gekkofs/deps:0.9.6 .
+
+build-amd64: copy-scripts
+	docker build --platform amd64 -t gekkofs/deps:0.9.6 .
+
+build-aarch64: copy-scripts
+	docker build --platform aarch64 -t gekkofs/deps:0.9.6 .
+
+remove-scripts:
+	- rm -rf $(CWD)/scripts
diff --git a/docker/0.9.6/docs/Dockerfile b/docker/0.9.6/docs/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..ab6311846b304b231ba8400631f37be970e41dc4
--- /dev/null
+++ b/docker/0.9.6/docs/Dockerfile
@@ -0,0 +1,25 @@
+FROM gekkofs/deps:0.9.6
+
+LABEL Description="Debian-based environment suitable to build GekkoFS' documentation"
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    # install dependencies for Doxygen
+    python3 \
+    flex \
+    bison \
+    graphviz doxygen && \
+    # install sphinx, breathe and exhale
+    pip3 install --break-system-packages \
+    'sphinx' \
+    sphinx_rtd_theme \
+    'breathe' \
+    'exhale' \
+    'sphinx-copybutton' \
+    'sphinx-multiversion' \
+    'myst_parser'  \
+    attrs && \
+    # Clean apt cache to reduce image layer size
+    rm -rf /var/lib/apt/lists/* && \
+    # Clean apt caches of packages
+    apt-get clean && apt-get autoclean
diff --git a/docker/0.9.6/docs/Makefile b/docker/0.9.6/docs/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..fcbd837bd0ae261ede00e175254a2cfac453f5f9
--- /dev/null
+++ b/docker/0.9.6/docs/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all
+
+amd64:
+	docker build --platform amd64 -t gekkofs/docs:0.9.6 .
+
+aarch64:
+	docker build --platform aarch64 -t gekkofs/docs:0.9.6 .
+
+all:
+	docker build -t gekkofs/docs:0.9.6 .
diff --git a/docker/0.9.6/java/Dockerfile b/docker/0.9.6/java/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..2a8bd9339af3b17a38d465508b3671f8fe3836b1
--- /dev/null
+++ b/docker/0.9.6/java/Dockerfile
@@ -0,0 +1,10 @@
+FROM gekkofs/testing:0.9.6
+
+LABEL Description="Debian-based environment to run java"
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    openjdk-25-jdk-headless \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean 
\ No newline at end of file
diff --git a/docker/0.9.6/java/Makefile b/docker/0.9.6/java/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..717a3e459a9cb54da9217ed207971ba255c2d1c3
--- /dev/null
+++ b/docker/0.9.6/java/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all
+
+amd64:
+	docker build --platform amd64 -t gekkofs/java:0.9.6 .
+
+aarch64:
+	docker build --platform aarch64 -t gekkofs/java:0.9.6 .
+
+all:
+	docker build -t gekkofs/java:0.9.6 .
diff --git a/docker/0.9.6/linter/Dockerfile b/docker/0.9.6/linter/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..8968eea0e8252b3c6177b3c4140302f984b4096a
--- /dev/null
+++ b/docker/0.9.6/linter/Dockerfile
@@ -0,0 +1,14 @@
+FROM gekkofs/core:0.9.6
+
+LABEL Description="Debian-based environment to check the formatting of GekkoFS code"
+
+RUN apt-get update && \
+  apt-get install -y --no-install-recommends \
+  # clang 15 deps for clang-format
+  lsb-release \
+  wget \
+  gnupg2 \
+  clang-format && \
+  rm -rf /var/lib/apt/lists/* && \
+  # Clean apt caches of packages
+  apt-get clean && apt-get autoclean
diff --git a/docker/0.9.6/linter/Makefile b/docker/0.9.6/linter/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..909e6760f05acd76568e3464d5dc20b5bee85f09
--- /dev/null
+++ b/docker/0.9.6/linter/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all
+
+amd64:
+	docker buildx build --platform amd64 -t gekkofs/linter:0.9.6 .
+
+aarch64:
+	docker buildx build --platform aarch64 -t gekkofs/linter:0.9.6 .
+
+all:
+	docker buildx build -t gekkofs/linter:0.9.6 .
diff --git a/docker/0.9.6/testing/Dockerfile b/docker/0.9.6/testing/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..f6d9d159fd50c5aea2d5cc4833cb567098b01e2e
--- /dev/null
+++ b/docker/0.9.6/testing/Dockerfile
@@ -0,0 +1,54 @@
+FROM gekkofs/deps:0.9.6
+
+LABEL Description="Debian-based environment to test GekkoFS with LCOV, cppcheck, and reporting tools"
+
+# Set DEBIAN_FRONTEND to noninteractive to prevent apt-get from prompting
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    # LCOV's genhtml dependencies
+    libgd-perl \
+    libcapture-tiny-perl \
+    libdatetime-perl \
+    libtimedate-perl \
+    libjson-xs-perl \
+    # Other system tools
+    binutils \
+    cppcheck \
+    curl \
+    git \
+    make \
+    # Python3 and pip are assumed to be in gekkofs/deps:0.9.6
+    # If not, add python3 python3-pip
+    && \
+    # Cleanup apt cache
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get clean
+
+# Install Python packages
+RUN pip3 install --no-cache-dir --break-system-packages \
+    loguru \
+    lcov_cobertura
+
+# Install LCOV from source
+WORKDIR /tmp
+RUN LCOV_VERSION="2.3.1" && \
+    curl -sSOL "https://github.com/linux-test-project/lcov/releases/download/v${LCOV_VERSION}/lcov-${LCOV_VERSION}.tar.gz" && \
+    tar xfz "lcov-${LCOV_VERSION}.tar.gz" && \
+    cd "lcov-${LCOV_VERSION}" && \
+    make install && \
+    cd .. && \
+    rm -rf "lcov-${LCOV_VERSION}.tar.gz" "lcov-${LCOV_VERSION}"
+
+WORKDIR /opt
+RUN git clone https://gitlab.com/ahogen/cppcheck-codequality.git && \
+    cd cppcheck-codequality && \
+    git checkout 61f6ae3b150d377e9987dce9d1c2859ef08bea6f && \
+    sed -i 's/python = ">=3\.7,<3\.13"/python = ">=3.7,<3.14"/' pyproject.toml && \
+    sed -i 's/python = ">=3\.7,<3\.13"/python = ">=3.7,<3.14"/' poetry.lock && \
+    pip3 install --no-cache-dir --break-system-packages . && \
+    cd .. && \
+    rm -rf cppcheck-codequality
+
+WORKDIR /
\ No newline at end of file
diff --git a/docker/0.9.6/testing/Makefile b/docker/0.9.6/testing/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..88577888cefeebbf13da4678c639fec533ae4056
--- /dev/null
+++ b/docker/0.9.6/testing/Makefile
@@ -0,0 +1,10 @@
+.PHONY: all
+
+amd64:
+	docker build --platform amd64 -t gekkofs/testing:0.9.6 .
+
+aarch64:
+	docker build --platform aarch64 -t gekkofs/testing:0.9.6 .
+
+all:
+	docker build -t gekkofs/testing:0.9.6 .
diff --git a/docker/latest b/docker/latest
index 03834411d1529ea7337b4a2c2a4a34b689d2a54e..9cf038687f117939cd7f52f80c054204743e678e 120000
--- a/docker/latest
+++ b/docker/latest
@@ -1 +1 @@
-0.9.5
\ No newline at end of file
+0.9.6
\ No newline at end of file
diff --git a/scripts/docker/Dockerfile.deps b/scripts/docker/Dockerfile.deps
new file mode 100644
index 0000000000000000000000000000000000000000..761a05752462ff7efd90786f5abbcb4f51657703
--- /dev/null
+++ b/scripts/docker/Dockerfile.deps
@@ -0,0 +1,36 @@
+FROM debian:trixie
+
+LABEL Description="Debian-based environment suitable to build GekkoFS and its dependencies"
+
+ENV GKFS_PATH=/opt/gkfs
+ENV GKFS_VERSION=0.9.6-dev
+ENV SCRIPTS_PATH=${GKFS_PATH}/scripts
+ENV DEPS_SRC_PATH=${GKFS_PATH}/deps_src
+ENV INSTALL_PATH=/usr/local
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    git curl ca-certificates libtool pkg-config make automake gcc g++ \
+    ninja-build procps libconfig-dev libltdl-dev lbzip2 \
+    libjson-c-dev liblz4-dev libboost-program-options-dev \
+    uuid-dev ccache cmake python3 python3-pip python3-dev \
+    python3-venv python3-setuptools libnuma-dev libyaml-dev \
+    libcurl4-openssl-dev && \
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get clean && apt-get autoclean
+
+# Copy scripts and profiles
+COPY scripts/dl_dep.sh ${SCRIPTS_PATH}/
+COPY scripts/compile_dep.sh ${SCRIPTS_PATH}/
+COPY scripts/patches ${SCRIPTS_PATH}/patches
+COPY scripts/profiles ${SCRIPTS_PATH}/profiles
+
+# Build dependencies
+RUN cd ${SCRIPTS_PATH} && \
+    /bin/bash ./dl_dep.sh -p ci:${GKFS_VERSION} ${DEPS_SRC_PATH} && \
+    /bin/bash ./compile_dep.sh -j $(nproc) -p ci:${GKFS_VERSION} ${DEPS_SRC_PATH} ${INSTALL_PATH} && \
+    # Cleanup to reduce size
+    rm -rf ${DEPS_SRC_PATH} && \
+    rm -rf ${SCRIPTS_PATH} && \
+    rmdir ${GKFS_PATH} && \
+    ldconfig
diff --git a/scripts/profiles/0.9.6-dev/agios.specs b/scripts/profiles/0.9.6-dev/agios.specs
index 8e1755f3bb6bfd18178fbcaac89ed4e2ff58a3d9..7379e3943aef72bc1c21f285980a4f06a275cc68 100644
--- a/scripts/profiles/0.9.6-dev/agios.specs
+++ b/scripts/profiles/0.9.6-dev/agios.specs
@@ -48,8 +48,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"
 )
diff --git a/scripts/profiles/0.9.6-dev/arm.specs b/scripts/profiles/0.9.6-dev/arm.specs
index 573ff4268b8497831ccc5d97375effd0bcabca29..ac3a076f12e627a23ec8bb028fc17f3c22379cda 100644
--- a/scripts/profiles/0.9.6-dev/arm.specs
+++ b/scripts/profiles/0.9.6-dev/arm.specs
@@ -49,8 +49,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
-    ["mercury"]="v2.4.0"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="88043bdbbc60801d4fbe0076962ed1a766ba4800"
 )
 
diff --git a/scripts/profiles/0.9.6-dev/ci.specs b/scripts/profiles/0.9.6-dev/ci.specs
index 7c07b5009140897eb0d5f82ea55cb239faa69049..cc0723151cbc309faab8474ec7ec2d636c8a66ed 100644
--- a/scripts/profiles/0.9.6-dev/ci.specs
+++ b/scripts/profiles/0.9.6-dev/ci.specs
@@ -41,13 +41,15 @@ wgetdeps=(
     ["rocksdb"]="10.4.2"
     ["prometheus-cpp"]="v1.0.0"
     ["capstone"]="6.0.0-Alpha1"
+    ["cereal"]="1.3.2"
     )
 
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
+    ["thallium"]="v0.15.1"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"
     ["parallax"]="ffdea6e820f5c4c2d33e60d9a4b15ef9e6bbcfdd"
@@ -60,7 +62,7 @@ clonedeps_args=(
 
 # Ordering that MUST be followed when downloading
 order=(
-    "capstone" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"
+    "capstone" "cereal" "libfabric" "mercury" "argobots" "margo" "thallium" "rocksdb" "syscall_intercept"
     "agios" "parallax" "prometheus-cpp"
 )
 
diff --git a/scripts/profiles/0.9.6-dev/default.specs b/scripts/profiles/0.9.6-dev/default.specs
index c4e54c5d90a4996f7cc3d154421c369d956953d8..21fef3a60a6f80fae8bd3837b890d5d06324372f 100644
--- a/scripts/profiles/0.9.6-dev/default.specs
+++ b/scripts/profiles/0.9.6-dev/default.specs
@@ -43,13 +43,15 @@ wgetdeps=(
     ["argobots"]="1.2"
     ["rocksdb"]="10.4.2"
     ["json-c"]="0.17-20230812"
+    ["cereal"]="1.3.2"
 )
 
 # Dependencies that must be cloned.
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
+    ["thallium"]="v0.15.1"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
@@ -60,7 +62,7 @@ clonedeps_args=(
 
 # Ordering that MUST be followed when downloading
 order=(
-    "lz4" "zstd" "capstone" "json-c" "libfabric" "mercury" "argobots" "margo" "rocksdb" "syscall_intercept"
+    "lz4" "zstd" "capstone" "json-c" "cereal" "libfabric" "mercury" "argobots" "margo" "thallium" "rocksdb" "syscall_intercept"
 )
 
 # Extra arguments passed to the installation script. As such, they can
diff --git a/scripts/profiles/0.9.6-dev/default_zmq.specs b/scripts/profiles/0.9.6-dev/default_zmq.specs
index b9a58a7b34744603f52fb49ecb057146e3a3a52b..c5791bdae148a2bb2f6adccc29100cae137ab6f6 100644
--- a/scripts/profiles/0.9.6-dev/default_zmq.specs
+++ b/scripts/profiles/0.9.6-dev/default_zmq.specs
@@ -50,8 +50,8 @@ wgetdeps=(
 # Dependencies that must be cloned.
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
diff --git a/scripts/profiles/0.9.6-dev/infiniband_verbs.specs b/scripts/profiles/0.9.6-dev/infiniband_verbs.specs
index c3da68052b33437e533b6ab7e63ee5298cb91c59..e6eef0c66632266f4e77e991f9068fb7f796ae3d 100644
--- a/scripts/profiles/0.9.6-dev/infiniband_verbs.specs
+++ b/scripts/profiles/0.9.6-dev/infiniband_verbs.specs
@@ -48,8 +48,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric%verbs"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
diff --git a/scripts/profiles/0.9.6-dev/install/cereal.install b/scripts/profiles/0.9.6-dev/install/cereal.install
new file mode 100644
index 0000000000000000000000000000000000000000..e23b2e306044d7e7a956cfda62bf5bd9e26af3c0
--- /dev/null
+++ b/scripts/profiles/0.9.6-dev/install/cereal.install
@@ -0,0 +1,44 @@
+################################################################################
+# Copyright 2018-2025, Barcelona Supercomputing Center (BSC), Spain            #
+# Copyright 2015-2025, Johannes Gutenberg Universitaet Mainz, Germany          #
+#                                                                              #
+# This software was partially supported by the                                 #
+# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #
+#                                                                              #
+# This software was partially supported by the                                 #
+# ADA-FS project under the SPPEXA project funded by the DFG.                   #
+#                                                                              #
+# This file is part of GekkoFS.                                                #
+#                                                                              #
+# GekkoFS is free software: you can redistribute it and/or modify              #
+# it under the terms of the GNU General Public License as published by         #
+# the Free Software Foundation, either version 3 of the License, or            #
+# (at your option) any later version.                                          #
+#                                                                              #
+# GekkoFS is distributed in the hope that it will be useful,                   #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU General Public License for more details.                                 #
+#                                                                              #
+# You should have received a copy of the GNU General Public License            #
+# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #
+#                                                                              #
+# SPDX-License-Identifier: GPL-3.0-or-later                                    #
+################################################################################
+# vi: ft=bash
+
+pkg_install() {
+    ID="cereal"
+    CURR="${SOURCE_DIR}/${ID}"
+    prepare_build_dir "${CURR}"
+    cd "${CURR}/build"
+    $CMAKE -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+           -DCMAKE_BUILD_TYPE=Release \
+           -DJUST_INSTALL_CEREAL=ON \
+           ..
+    make -j"${CORES}" install
+}
+
+pkg_check() {
+    :
+}
diff --git a/scripts/profiles/0.9.6-dev/install/mercury.install b/scripts/profiles/0.9.6-dev/install/mercury.install
index 1f770a53693da5ed2d453db669471ad39264fc2e..64f517d740c3b65633e7672ba3491a000fb075ef 100644
--- a/scripts/profiles/0.9.6-dev/install/mercury.install
+++ b/scripts/profiles/0.9.6-dev/install/mercury.install
@@ -71,8 +71,9 @@ pkg_install() {
         -DBUILD_SHARED_LIBS:BOOL=ON \
         -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
         ${USE_BMI} ${USE_OFI} \
+        -DNA_USE_SM:BOOL=ON -DNA_USE_OFI:BOOL=ON \
         ..
-        #-DNA_USE_OFI:BOOL=ON -DNA_USE_UCX:BOOL=ON \
+        #-DNA_USE_UCX:BOOL=ON \
     make -j"${CORES}"
     make install
 }
diff --git a/scripts/profiles/0.9.6-dev/install/thallium.install b/scripts/profiles/0.9.6-dev/install/thallium.install
new file mode 100644
index 0000000000000000000000000000000000000000..dcd69bf360eed7e060c1db12d634ebacb09f53c7
--- /dev/null
+++ b/scripts/profiles/0.9.6-dev/install/thallium.install
@@ -0,0 +1,46 @@
+################################################################################
+# Copyright 2018-2025, Barcelona Supercomputing Center (BSC), Spain            #
+# Copyright 2015-2025, Johannes Gutenberg Universitaet Mainz, Germany          #
+#                                                                              #
+# This software was partially supported by the                                 #
+# EC H2020 funded project NEXTGenIO (Project ID: 671951, www.nextgenio.eu).    #
+#                                                                              #
+# This software was partially supported by the                                 #
+# ADA-FS project under the SPPEXA project funded by the DFG.                   #
+#                                                                              #
+# This file is part of GekkoFS.                                                #
+#                                                                              #
+# GekkoFS is free software: you can redistribute it and/or modify              #
+# it under the terms of the GNU General Public License as published by         #
+# the Free Software Foundation, either version 3 of the License, or            #
+# (at your option) any later version.                                          #
+#                                                                              #
+# GekkoFS is distributed in the hope that it will be useful,                   #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of               #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                #
+# GNU General Public License for more details.                                 #
+#                                                                              #
+# You should have received a copy of the GNU General Public License            #
+# along with GekkoFS.  If not, see <https://www.gnu.org/licenses/>.            #
+#                                                                              #
+# SPDX-License-Identifier: GPL-3.0-or-later                                    #
+################################################################################
+# vi: ft=bash
+
+pkg_install() {
+    ID="thallium"
+    CURR="${SOURCE_DIR}/${ID}"
+    prepare_build_dir "${CURR}"
+    cd "${CURR}/build"
+    $CMAKE -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
+           -DCMAKE_BUILD_TYPE=Release \
+           -DBUILD_TESTING=OFF \
+           -DBUILD_BENCHMARK=OFF \
+           -DBUILD_EXAMPLES=OFF \
+           ..
+    make -j"${CORES}" install
+}
+
+pkg_check() {
+    make check
+}
diff --git a/scripts/profiles/0.9.6-dev/marenostrum4.specs b/scripts/profiles/0.9.6-dev/marenostrum4.specs
index 1b72ae749526113628b675262147dd8e50e57ee5..c7f2e8e2d06f0a6902a539f6dde19bdd2aa2ac2a 100644
--- a/scripts/profiles/0.9.6-dev/marenostrum4.specs
+++ b/scripts/profiles/0.9.6-dev/marenostrum4.specs
@@ -49,8 +49,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
-    ["mercury"]="v2.4.0"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
     ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd"
diff --git a/scripts/profiles/0.9.6-dev/mogon2.specs b/scripts/profiles/0.9.6-dev/mogon2.specs
index 3a127ba391b4d5cd0669c785ab140a1f5e649a8f..a945588a6a528f0469f3be0f9b94e3a759d47d96 100644
--- a/scripts/profiles/0.9.6-dev/mogon2.specs
+++ b/scripts/profiles/0.9.6-dev/mogon2.specs
@@ -49,8 +49,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
 )
diff --git a/scripts/profiles/0.9.6-dev/mogon3.specs b/scripts/profiles/0.9.6-dev/mogon3.specs
index 237f40cae9a19587f4fb836d3cacc934d638909f..500f82a93f4689c1ed8dc55a684eeb012ef71118 100644
--- a/scripts/profiles/0.9.6-dev/mogon3.specs
+++ b/scripts/profiles/0.9.6-dev/mogon3.specs
@@ -50,8 +50,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
 #    ["libfabric"]="HEAD@v1.20.1"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
 )
 
diff --git a/scripts/profiles/0.9.6-dev/ngio.specs b/scripts/profiles/0.9.6-dev/ngio.specs
index 5ce5cbbfc89d53c4dcebdf6f0f10b43147a622c2..c9dbca4c966cb4b8032b0f237f7cad90b3fe7821 100644
--- a/scripts/profiles/0.9.6-dev/ngio.specs
+++ b/scripts/profiles/0.9.6-dev/ngio.specs
@@ -49,8 +49,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
     ["parallax"]="c130decd7a71c60c20b98d6a23924f05f754c3cd"
diff --git a/scripts/profiles/0.9.6-dev/omnipath_psm2.specs b/scripts/profiles/0.9.6-dev/omnipath_psm2.specs
index ed11895e13e80778a507c58f801b787a95bffb68..ffe18406587eec91c3f2d33d3e916b371670eb88 100644
--- a/scripts/profiles/0.9.6-dev/omnipath_psm2.specs
+++ b/scripts/profiles/0.9.6-dev/omnipath_psm2.specs
@@ -49,8 +49,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v2.2.0"
-    ["mercury"]="v2.4.1rc1"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
 )
diff --git a/scripts/profiles/0.9.6-dev/p9.specs b/scripts/profiles/0.9.6-dev/p9.specs
index 060296b9a906887a34f5e6f80c089334527d45eb..a8d6c07520065e73632a49e4131c74719941af7e 100644
--- a/scripts/profiles/0.9.6-dev/p9.specs
+++ b/scripts/profiles/0.9.6-dev/p9.specs
@@ -49,8 +49,8 @@ wgetdeps=(
 # Dependencies that must be cloned
 clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
-    ["mercury"]="v2.4.0"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="6eb27a9d2053bb2ac3bb9ce30e13b64ce055c19f"
     ["date"]="e7e1482087f58913b80a20b04d5c58d9d6d90155"
 )
diff --git a/scripts/profiles/0.9.6-dev/riscv.specs b/scripts/profiles/0.9.6-dev/riscv.specs
index 1f601171a7a4571e008d698d52fc68b9e21ad927..ee8ae6eb8b53348f5afaa43ec2f8c5258dd330b9 100644
--- a/scripts/profiles/0.9.6-dev/riscv.specs
+++ b/scripts/profiles/0.9.6-dev/riscv.specs
@@ -48,8 +48,8 @@ wgetdeps=(
 # Dependencies that must be cloned.
 clonedeps=(
     ["libfabric"]="HEAD@v1.20.1"
-    ["mercury"]="v2.4.0"
-    ["margo"]="v0.18.3"
+    ["mercury"]="v2.4.1"
+    ["margo"]="v0.21.0"
     ["syscall_intercept"]="fcc6d7bd4a62c2fa0419ad65ecd8d5ed95b99f63"
 )
 
diff --git a/scripts/profiles/sources.list b/scripts/profiles/sources.list
index d4ff2340bcc15647d661ae3eab96e6fbd00497c2..7987578cc2bd779e0c0de48afd3321494b94792b 100644
--- a/scripts/profiles/sources.list
+++ b/scripts/profiles/sources.list
@@ -56,6 +56,8 @@ sources=(
     ["ucx"]="https://github.com/openucx/ucx/archive/{{VERSION}}.tar.gz"
     ["libzmq"]="https://github.com/zeromq/libzmq/archive/v{{VERSION}}.tar.gz"
     ["cppzmq"]="https://github.com/zeromq/cppzmq/archive/v{{VERSION}}.tar.gz"
+    ["thallium"]="https://github.com/mochi-hpc/mochi-thallium"
+    ["cereal"]="https://github.com/USCiLab/cereal/archive/v{{VERSION}}.tar.gz"
 )
 
 
diff --git a/tests/scripts/dl_dep.sh/0.9.6-dev/default.out b/tests/scripts/dl_dep.sh/0.9.6-dev/default.out
index a5224522a51c33607ceb650c3b4f412f7c4b243e..eca2168db23fe95b212fd616e1d9946b9e096e6c 100644
--- a/tests/scripts/dl_dep.sh/0.9.6-dev/default.out
+++ b/tests/scripts/dl_dep.sh/0.9.6-dev/default.out
@@ -3,9 +3,9 @@ Downloaded 'https://github.com/facebook/zstd/archive/v1.5.7.tar.gz' to 'zstd'
 Downloaded 'https://github.com/aquynh/capstone/archive/6.0.0-Alpha1.tar.gz' to 'capstone'
 Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
 Cloned 'https://github.com/ofiwg/libfabric.git' to 'libfabric' with commit '[HEAD]' and flags '--branch=v2.2.0'
-Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.1rc1]' and flags '--recurse-submodules'
+Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.1]' and flags '--recurse-submodules'
 Downloaded 'https://github.com/pmodels/argobots/archive/v1.2.tar.gz' to 'argobots'
-Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.18.3]' and flags ''
+Cloned 'https://github.com/mochi-hpc/mochi-margo' to 'margo' with commit '[v0.21.0]' and flags ''
 Downloaded 'https://github.com/facebook/rocksdb/archive/v10.4.2.tar.gz' to 'rocksdb'
 Cloned 'https://github.com/GekkoFS/syscall_intercept.git' to 'syscall_intercept' with commit '[d8b2a69961921ed123625c79a609331fc56a8931]' and flags ''
 Done