diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 7b621200..cd835565 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -16,6 +16,11 @@ jobs:
             build_image: "ghcr.io/wtsi-npg/ub-18.04-irods-clients-dev-4.2.11:latest"
             server_image: "ghcr.io/wtsi-npg/ub-18.04-irods-4.2.11:latest"
             experimental: false
+          # iRODS 4.2.12 clients on bionic
+          - irods: "4.2.12"
+            build_image: "ghcr.io/wtsi-npg/ub-18.04-irods-clients-dev-4.2.12:latest"
+            server_image: "ghcr.io/wtsi-npg/ub-18.04-irods-4.2.12:latest"
+            experimental: false
           # iRODS 4.3.0 clients on bionic
           - irods: "4.3.0"
             build_image: "ghcr.io/wtsi-npg/ub-18.04-irods-clients-dev-4.3.0:latest"
diff --git a/Dockerfile b/Dockerfile
index 4e3f15be..529619d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,6 +6,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     apt-utils \
     ca-certificates \
     curl \
+    dirmngr \
     gpg \
     gpg-agent \
     lsb-release \
@@ -17,7 +18,7 @@ ENV LANG=en_GB.UTF-8 \
     LANGUAGE=en_GB \
     LC_ALL=en_GB.UTF-8
 
-ENV IRODS_VERSION=4.2.11
+ENV IRODS_VERSION=4.2.12
 
 RUN curl -sSL https://packages.irods.org/irods-signing-key.asc | apt-key add - && \
     echo "deb [arch=amd64] https://packages.irods.org/apt/ $(lsb_release -sc) main" |\
@@ -28,20 +29,28 @@ RUN curl -sSL https://packages.irods.org/irods-signing-key.asc | apt-key add - &
     irods-runtime="${IRODS_VERSION}-1~$(lsb_release -sc)" \
     irods-icommands="${IRODS_VERSION}-1~$(lsb_release -sc)"
 
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys "E1DD270288B4E6030699E45FA1715D88E1DF1F24" && \
+    echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu $(lsb_release -sc) main" |\
+    tee /etc/apt/sources.list.d/git-core.list && \
+    apt-get update && \
+    apt-get install -q -y --no-install-recommends \
+    git
+
 RUN apt-get update && \
     apt-get install -q -y --no-install-recommends \
     autoconf \
     automake \
     build-essential \
     check \
+    cmake \
     gdb \
-    git \
     jq \
     lcov \
     less \
     libjansson-dev \
     libtool \
     pkg-config \
+    python3-sphinx \
     ssh \
     valgrind \
     unattended-upgrades && \
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d1621db..5be30868 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   irods-server:
     container_name: irods-server
-    image: "ghcr.io/wtsi-npg/ub-18.04-irods-${IRODS_VERSION:-4.2.11}:${DOCKER_TAG:-latest}"
+    image: "ghcr.io/wtsi-npg/ub-18.04-irods-${IRODS_VERSION:-4.2.12}:${DOCKER_TAG:-latest}"
     restart: always
     ports:
       - "1247:1247"
diff --git a/src/baton.c b/src/baton.c
index 5bb2519a..8d009128 100644
--- a/src/baton.c
+++ b/src/baton.c
@@ -756,7 +756,7 @@ int modify_metadata(rcComm_t *conn, rodsPath_t *rods_path,
     named_args.attr_value = attr_value;
     named_args.attr_units = attr_units;
 
-    modAVUMetadataInp_t anon_args;
+    modAVUMetadataInp_t anon_args = {0};
     map_mod_args(&anon_args, &named_args);
 
     int status = rcModAVUMetadata(conn, &anon_args);
diff --git a/tests/check_baton.c b/tests/check_baton.c
index ed35f209..28693657 100644
--- a/tests/check_baton.c
+++ b/tests/check_baton.c
@@ -1377,7 +1377,6 @@ START_TEST(test_add_metadata_obj) {
 }
 END_TEST
 
-
 // Do we fail to add metadata to a non-existent path?
 START_TEST(test_add_metadata_missing_path) {
     option_flags flags = 0;