diff --git a/docker/etherpad/etherpad.yml b/docker/etherpad/etherpad.yml
index 8d35b84..7d8c46a 100644
--- a/docker/etherpad/etherpad.yml
+++ b/docker/etherpad/etherpad.yml
@@ -6,7 +6,7 @@ services:
       context: ${BUILD_ROOT_PATH}/docker/etherpad
       dockerfile: Dockerfile
     container_name: isard-apps-etherpad
-    restart: on-failure:10
+    restart: unless-stopped
     volumes:
       - /etc/localtime:/etc/localtime:ro
 #    ports:
diff --git a/docker/jitsi/jitsi.yml b/docker/jitsi/jitsi.yml
index ef0d717..64db5dc 100644
--- a/docker/jitsi/jitsi.yml
+++ b/docker/jitsi/jitsi.yml
@@ -5,7 +5,7 @@ services:
     jitsi:
         container_name: jitsi
         image: jitsi/web:latest
-        restart: ${RESTART_POLICY}
+        restart: unless-stopped
 #        ports:
 #            - '${HTTP_PORT}:80'
 #            - '${HTTPS_PORT}:443'
diff --git a/docker/mariadb/mariadb.yml b/docker/mariadb/mariadb.yml
index f8ef1df..b0a0901 100644
--- a/docker/mariadb/mariadb.yml
+++ b/docker/mariadb/mariadb.yml
@@ -20,5 +20,6 @@ services:
       MYSQL_DATABASE: wordpress
       MYSQL_USER: wordpress
       MYSQL_PASSWORD: ${WORDPRESS_MARIADB_PASSWORD}
+    restart: unless-stopped
     networks:
       - isard_net
\ No newline at end of file
diff --git a/docker/moodle/02-configure-moodle.sh b/docker/moodle/02-configure-moodle.sh
index 1223ad8..6676e71 100755
--- a/docker/moodle/02-configure-moodle.sh
+++ b/docker/moodle/02-configure-moodle.sh
@@ -18,7 +18,7 @@ sleep 3;
 # Check if the config.php file exists
 if [ ! -f /var/www/html/config.php ]; then
 
-    curl --location $MOODLE_URL | tar xz --strip-components=1 -C /var/www/html/
+    curl --location https://github.com/moodle/moodle/archive/$MOODLE_VERSION.tar.gz | tar xz --strip-components=1 -C /var/www/html/
     cp /isinstalled.php /var/www/html/admin/cli/
     chown nobody:root /var/www/html -R
 
@@ -34,8 +34,8 @@ if [ ! -f /var/www/html/config.php ]; then
         --dbpass=$DB_PASS \
         --dbport=$DB_PORT \
         --prefix=$DB_PREFIX \
-        --fullname=Dockerized_Moodle \
-        --shortname=moodle \
+        --fullname="$MOODLE_SITENAME" \
+        --shortname="$MOODLE_SHORTSITENAME" \
         --adminuser=$MOODLE_USERNAME \
         --adminpass=$MOODLE_PASSWORD \
         --adminemail=$MOODLE_EMAIL \
@@ -80,11 +80,11 @@ if php -d max_input_vars=1000 /var/www/html/admin/cli/isinstalled.php ; then
     php -d max_input_vars=1000 /var/www/html/admin/cli/cfg.php --name=noreplyaddress --set=$MOODLE_MAIL_NOREPLY_ADDRESS
     php -d max_input_vars=1000 /var/www/html/admin/cli/cfg.php --name=emailsubjectprefix --set=$MOODLE_MAIL_PREFIX
 
-else
-    echo "Upgrading moodle..."
-    php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --enable
-    php -d max_input_vars=1000 /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable
-    php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --disable
+# else
+    # echo "Upgrading moodle..."
+    # php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --enable
+    # php -d max_input_vars=1000 /var/www/html/admin/cli/upgrade.php --non-interactive --allow-unstable
+    # php -d max_input_vars=1000 /var/www/html/admin/cli/maintenance.php --disable
 fi
 
 chown -R nobody:root /var/www/html
diff --git a/docker/moodle/03-plugins.sh b/docker/moodle/03-plugins.sh
index 79cde8c..bb6a5fc 100755
--- a/docker/moodle/03-plugins.sh
+++ b/docker/moodle/03-plugins.sh
@@ -1,9 +1,9 @@
 if [ ! -f /var/www/html/config.php ]; then
-    curl --location https://moodle.org/plugins/download.php/23360/mod_jitsi_moodle310_2021020300.zip > jitsi.zip
+    curl --location https://moodle.org/plugins/download.php/23360/mod_jitsi_moodle310_2021052500.zip > jitsi.zip
     unzip jitsi.zip -d /var/www/html/mod/
     rm jitsi.zip
 
-    curl --location https://moodle.org/plugins/download.php/23294/mod_bigbluebuttonbn_moodle310_2019101004.zip > bbb.zip
+    curl --location https://moodle.org/plugins/download.php/23294/mod_bigbluebuttonbn_moodle310_2019101009.zip > bbb.zip
     unzip bbb.zip -d /var/www/html/mod/
     rm bbb.zip
 
diff --git a/docker/moodle/Dockerfile b/docker/moodle/Dockerfile
index 589675d..e6f7663 100644
--- a/docker/moodle/Dockerfile
+++ b/docker/moodle/Dockerfile
@@ -1,8 +1,14 @@
-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>"
 
+
 USER root
 COPY src/rootfs/ /
 COPY 02-configure-moodle.sh /docker-entrypoint-init.d/
@@ -16,35 +22,3 @@ RUN echo "group=nobody" >> /etc/php7/php-fpm.d/www.conf
 RUN apk add --no-cache dcron libcap && \
     chown nobody:nobody /usr/sbin/crond && \
     setcap cap_setgid=ep /usr/sbin/crond
-
-# Change MOODLE_38_STABLE for new versions
-ENV MOODLE_URL=https://github.com/moodle/moodle/archive/MOODLE_310_STABLE.tar.gz \
-    LANG=en_US.UTF-8 \
-    LANGUAGE=en_US:en \
-    SITE_URL=http://localhost \
-    DB_TYPE=pgsql \
-    DB_HOST=postgres \
-    DB_PORT=5432 \
-    DB_NAME=moodle \
-    DB_USER=moodle \
-    DB_PASS=moodle \
-    DB_PREFIX=mdl_ \
-    SSLPROXY=false \
-    MOODLE_EMAIL=user@example.com \
-    MOODLE_LANGUAGE=en \
-    MOODLE_SITENAME=New-Site \
-    MOODLE_USERNAME=moodleuser \
-    MOODLE_PASSWORD=PLEASE_CHANGEME \
-    SMTP_HOST=smtp.gmail.com \
-    SMTP_PORT=587 \
-    SMTP_USER=your_email@gmail.com \
-    SMTP_PASSWORD=your_password \
-    SMTP_PROTOCOL=tls \
-    MOODLE_MAIL_NOREPLY_ADDRESS=noreply@localhost \
-    MOODLE_MAIL_PREFIX=[moodle] \
-    client_max_body_size=50M \
-    post_max_size=50M \
-    upload_max_filesize=50M \
-    max_input_vars=1000
-
-#RUN curl --location $MOODLE_URL | tar xz --strip-components=1 -C /var/www/html/
diff --git a/docker/moodle/moodle.yml b/docker/moodle/moodle.yml
index c3febea..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:
@@ -14,8 +16,7 @@ services:
     depends_on:
       - isard-apps-postgresql
     environment:
-      - LANG=${LANG}
-      - LANGUAGE:${LANGUAGE}
+      - MOODLE_VERSION=${MOODLE_VERSION}
       - SITE_URL=https://moodle.${DOMAIN}
       - DB_TYPE=pgsql
       - DB_HOST=isard-apps-postgresql
@@ -25,9 +26,10 @@ services:
       - DB_PASS=${MOODLE_POSTGRES_PASSWORD}
       - DB_PREFIX=mdl_
       - SSLPROXY=true
-      - MOODLE_EMAIL=${MOODLE_EMAIL}
-      - MOODLE_LANGUAGE=es
-      - MOODLE_SITENAME=isard-office
+      - MOODLE_EMAIL=${MOODLE_EMAIL} #
+      - MOODLE_LANGUAGE=${LANGUAGE_CODE} #
+      - MOODLE_SITENAME=${TITLE} #
+      - MOODLE_SHORTSITENAME=${TITLE_SHORT} #
       - MOODLE_USERNAME=${MOODLE_ADMIN_USER}
       - MOODLE_PASSWORD=${MOODLE_ADMIN_PASSWORD}
       - SMTP_HOST=${SMTP_HOST}
@@ -37,6 +39,10 @@ services:
       - SMTP_PROTOCOL=${SMTP_PROTOCOL}
       - MOODLE_MAIL_NOREPLY_ADDRESS=${MOODLE_MAIL_NOREPLY_ADDRESS}
       - MOODLE_MAIL_PREFIX=${MOODLE_MAIL_PREFIX}
+      - client_max_body_size=${MOODLE_MAX_FILESIZE_UPLOAD}
+      - post_max_size=${MOODLE_MAX_FILESIZE_UPLOAD}
+      - upload_max_filesize=${MOODLE_MAX_FILESIZE_UPLOAD}
+      - max_input_vars=1000
     networks:
       - isard_net
 
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/nextcloud/themes/digitaldemocratic/core/js/navbar.js b/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js
index 09e7f10..599e33f 100644
--- a/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js
+++ b/docker/nextcloud/themes/digitaldemocratic/core/js/navbar.js
@@ -12,4 +12,13 @@ jQuery(document).ready(() => {
             $('#dropdownMenuApps').toggle()
         })
     })
+    $(window).click( (event) => {
+        if (
+            !$(event.target).parents(
+                '#dropdownMenuAppsButton, #dropdownMenuApps'
+            ).length
+        ) {
+            $('#dropdownMenuApps').hide()
+        }
+    })
 })
diff --git a/docker/onlyoffice/onlyoffice.yml b/docker/onlyoffice/onlyoffice.yml
index 0457f14..88b5a62 100644
--- a/docker/onlyoffice/onlyoffice.yml
+++ b/docker/onlyoffice/onlyoffice.yml
@@ -6,6 +6,7 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${BUILD_ROOT_PATH}/docker/onlyoffice/local.json:/etc/onlyoffice/documentserver/local.json:ro
+    restart: unless-stopped
     networks:
       - isard_net
 
diff --git a/docker/redis/redis.yml b/docker/redis/redis.yml
index a3beb00..03d945f 100644
--- a/docker/redis/redis.yml
+++ b/docker/redis/redis.yml
@@ -6,5 +6,6 @@ services:
     volumes:
       - /etc/localtime:/etc/localtime:ro
       - ${DB_FOLDER}/redis:/data
+    restart: unless-stopped
     networks:
       - isard_net
\ No newline at end of file
diff --git a/docker/wordpress/.htaccess b/docker/wordpress/.htaccess
index c42cd08..f26786a 100644
--- a/docker/wordpress/.htaccess
+++ b/docker/wordpress/.htaccess
@@ -12,6 +12,4 @@ RewriteRule ^ - [L]
 
 RewriteRule ^([_0-9a-zA-Z-]+/)?(wp-(content|admin|includes).*) $2 [L]
 RewriteRule ^([_0-9a-zA-Z-]+/)?(.*\.php)$ $2 [L]
-#RewriteRule ^(wp-(content|admin|includes).*) $1 [L]
-#RewriteRule ^(.*\.php)$ $1 [L]
 RewriteRule . index.php [L]
diff --git a/docker/wordpress/wordpress.yml b/docker/wordpress/wordpress.yml
index 350be10..ff7ede8 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
@@ -29,11 +29,12 @@ services:
       - isard-apps-mariadb
     links:
       - isard-apps-mariadb
+    restart: unless-stopped
     networks:
       - isard_net
 
   isard-apps-wordpress-cli:
-    image: wordpress:cli
+    image: ${WORDPRESS_CLI_IMG}
     container_name: isard-apps-wordpress-cli
     volumes:
       *wordpress-volumes