diff --git a/drupal/docker-compose.yml b/drupal/docker-compose.yml
index 4b3dc60..5be0f70 100644
--- a/drupal/docker-compose.yml
+++ b/drupal/docker-compose.yml
@@ -3,5 +3,5 @@ drupal:
   ports:
     - "8888:80"
   volumes:
-    - /var/www/html/sites
+    - /var/www/html/sites/default
   restart: always
diff --git a/mariadb/docker-compose.yml b/mariadb/docker-compose.yml
index a287116..72ce74a 100644
--- a/mariadb/docker-compose.yml
+++ b/mariadb/docker-compose.yml
@@ -5,3 +5,4 @@ mariadb:
   environment:
     - MYSQL_ROOT_PASSWORD=root
     - MYSQL_DATABASE=wordpress
+  restart: always
diff --git a/opencart/Dockerfile b/opencart/Dockerfile
index 79c6d2b..3cf6d13 100644
--- a/opencart/Dockerfile
+++ b/opencart/Dockerfile
@@ -7,20 +7,23 @@ MAINTAINER kev<noreply@datageek.info>
 
 RUN a2enmod rewrite
 
-RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libmcrypt-dev \
+RUN set -xe \
+    && apt-get update \
+    && apt-get install -y libpng12-dev libjpeg-dev libmcrypt-dev \
     && rm -rf /var/lib/apt/lists/* \
     && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
     && docker-php-ext-install gd mcrypt mbstring mysqli zip
 
 WORKDIR /var/www/html
 
-ENV OPENCART_VER 2.1.0.2
-ENV OPENCART_MD5 7a4d93410284bd3dc1fc148718efedb0
+ENV OPENCART_VER 2.2.0.0
+ENV OPENCART_MD5 a9219f14b3483f867ea48218a0bf215d
 ENV OPENCART_URL https://github.com/opencart/opencart/archive/${OPENCART_VER}.tar.gz
 ENV OPENCART_FILE opencart.tar.gz
 
-RUN curl -sSL ${OPENCART_URL} -o ${OPENCART_FILE} \
-    && echo "${OPENCART_MD5} ${OPENCART_FILE}" | md5sum -c \
+RUN set -xe \
+    && curl -sSL ${OPENCART_URL} -o ${OPENCART_FILE} \
+    && echo "${OPENCART_MD5}  ${OPENCART_FILE}" | md5sum -c \
     && tar xzf ${OPENCART_FILE} --strip 2 --wildcards '*/upload/' \
     && mv config-dist.php config.php \
     && mv admin/config-dist.php admin/config.php \