diff --git a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2 b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
index 1aa8aa13a6..8068186db9 100644
--- a/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
+++ b/docker/mariadb/mariadb-clustercheck/Dockerfile.j2
@@ -6,8 +6,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% block mariadb_clustercheck_header %}{% endblock %}
 
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
+COPY socat_wrapper.sh /usr/local/bin/socat_wrapper
 
-RUN chmod 644 /usr/local/bin/kolla_extend_start
+RUN chmod 644 /usr/local/bin/kolla_extend_start && \
+    chmod 755 /usr/local/bin/socat_wrapper
 
 {% block mariadb_clustercheck_footer %}{% endblock %}
 {% block footer %}{% endblock %}
diff --git a/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh b/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh
new file mode 100644
index 0000000000..bf562e3d5d
--- /dev/null
+++ b/docker/mariadb/mariadb-clustercheck/socat_wrapper.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+catch_term() {
+    kill -TERM "$child" 2>/dev/null
+    exit 0
+}
+
+catch_quit() {
+    kill -QUIT "$child" 2>/dev/null
+    exit 0
+}
+
+trap catch_term SIGTERM
+trap catch_quit SIGQUIT
+
+socat "$@" &
+
+child=$!
+wait "$child"