diff --git a/docker/moodle/Dockerfile b/docker/moodle/Dockerfile
index ac30f0e..e6f7663 100644
--- a/docker/moodle/Dockerfile
+++ b/docker/moodle/Dockerfile
@@ -1,8 +1,10 @@
-ARG LANG=$LANG
-ARG LANGUAGE=$LANGUAGE
-
-ARG ARCH=
-FROM ${ARCH}erseco/alpine-php7-webserver
+# ARG LANG=$LANG
+# ARG LANGUAGE=$LANGUAGE
+# 
+# ARG ARCH=
+ARG IMG=$MOODLE_IMG
+FROM ${IMG}
+# FROM ${ARCH}${IMG}
 
 LABEL maintainer="Adapted from: Ernesto Serrano <info@ernesto.es>"
 
diff --git a/docker/moodle/moodle.yml b/docker/moodle/moodle.yml
index 03ddf83..cbc30e5 100644
--- a/docker/moodle/moodle.yml
+++ b/docker/moodle/moodle.yml
@@ -4,6 +4,8 @@ services:
     build:
       context: ${BUILD_ROOT_PATH}/docker/moodle
       dockerfile: Dockerfile
+      args:
+        - IMG=${MOODLE_IMG}
     container_name: isard-apps-moodle
     restart: unless-stopped
     volumes:
diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile
index edfe77a..4b1d42b 100644
--- a/docker/nextcloud/Dockerfile
+++ b/docker/nextcloud/Dockerfile
@@ -1,4 +1,5 @@
-FROM nextcloud:fpm-alpine
+ARG IMG=$NEXTCLOUD_IMG
+FROM ${IMG}
 
 RUN set -ex; \
     \
diff --git a/docker/nextcloud/nextcloud.yml b/docker/nextcloud/nextcloud.yml
index 2c65cc0..2f067a6 100644
--- a/docker/nextcloud/nextcloud.yml
+++ b/docker/nextcloud/nextcloud.yml
@@ -4,6 +4,8 @@ services:
     build:
       context: ${BUILD_ROOT_PATH}/docker/nextcloud
       dockerfile: Dockerfile
+      args:
+        - IMG=${NEXTCLOUD_IMG}
       #target: production
     container_name: isard-apps-nextcloud-app
     restart: unless-stopped
diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml
index 350be10..03e7b3a 100644
--- a/docker/wordpress/wordpress.yml
+++ b/docker/wordpress/wordpress.yml
@@ -13,7 +13,7 @@ x-volumes:
 
 services:
   isard-apps-wordpress:
-    image: wordpress:latest # https://hub.docker.com/_/wordpress/
+    image: ${WORDPRESS_IMG} # https://hub.docker.com/_/wordpress/
     container_name: isard-apps-wordpress
 #    ports:
 #      - ${IP}:80:80 # change ip if required
@@ -33,7 +33,7 @@ services:
       - isard_net
 
   isard-apps-wordpress-cli:
-    image: wordpress:cli
+    image: ${WORDPRESS_CLI_IMG}
     container_name: isard-apps-wordpress-cli
     volumes:
       *wordpress-volumes