diff --git a/docker/etherpad/Dockerfile b/docker/etherpad/Dockerfile
index 28c2f50..c567c24 100755
--- a/docker/etherpad/Dockerfile
+++ b/docker/etherpad/Dockerfile
@@ -1,17 +1,20 @@
+ARG IMG
+FROM ${IMG}
+
 FROM node:lts
 MAINTAINER James Swineson <jamesswineson@gmail.com>
 
-ENV ETHERPAD_VERSION 1.8.13
-
 ENV NODE_ENV production
 
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install -y curl unzip mysql-client supervisor gzip git python libssl-dev pkg-config build-essential && \
+    apt-get install -y curl unzip mariadb-client supervisor gzip git python libssl-dev pkg-config build-essential && \
     rm -r /var/lib/apt/lists/*
 
 WORKDIR /opt/
 
+ARG ETHERPAD_VERSION
+
 RUN curl -SL \
     https://github.com/ether/etherpad-lite/archive/${ETHERPAD_VERSION}.zip \
     > etherpad.zip && unzip etherpad && rm etherpad.zip && \
diff --git a/docker/etherpad/etherpad.yml b/docker/etherpad/etherpad.yml
index 0409b1f..17fa5e7 100644
--- a/docker/etherpad/etherpad.yml
+++ b/docker/etherpad/etherpad.yml
@@ -5,6 +5,9 @@ services:
     build:
       context: ${BUILD_ROOT_PATH}/docker/etherpad
       dockerfile: Dockerfile
+      args:
+        - IMG=${ETHERPAD_IMG}
+        - ETHERPAD_VERSION=${ETHERPAD_VERSION}
     container_name: isard-apps-etherpad
     restart: unless-stopped
     volumes:
diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile
index 4b1d42b..f8a1c30 100644
--- a/docker/nextcloud/Dockerfile
+++ b/docker/nextcloud/Dockerfile
@@ -1,4 +1,4 @@
-ARG IMG=$NEXTCLOUD_IMG
+ARG IMG
 FROM ${IMG}
 
 RUN set -ex; \
diff --git a/docker/onlyoffice/src b/docker/onlyoffice/src
index 41af906..16c54c0 160000
--- a/docker/onlyoffice/src
+++ b/docker/onlyoffice/src
@@ -1 +1 @@
-Subproject commit 41af906e60bbd7c0923229d5e47194c3a8fce69e
+Subproject commit 16c54c0fcea8318db7cc28fd044fcc20294fa729