diff --git a/Dockerfile b/Dockerfile
index 1b898e09..c9f73fde 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:7.1-apache
+FROM php:7.4-apache
 
 RUN a2enmod rewrite
 
@@ -9,19 +9,20 @@ RUN apt-get -qq update && apt-get -qq -y --no-install-recommends install \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
     libmcrypt-dev \
-    libpng12-dev \
+    libpng-dev \
     libjpeg-dev \
     libmemcached-dev \
     zlib1g-dev \
     imagemagick
 
 # install the PHP extensions we need
-RUN docker-php-ext-install -j$(nproc) iconv mcrypt \
-    pdo pdo_mysql mysqli gd
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
+RUN pecl install mcrypt-1.0.4 
+RUN docker-php-ext-enable mcrypt
+RUN docker-php-ext-install -j$(nproc) iconv pdo pdo_mysql mysqli gd
+RUN docker-php-ext-configure gd --with-jpeg=/usr/include/ --with-freetype=/usr/include/
 
 RUN curl -J -L -s -k \
-    'https://github.com/omeka/omeka-s/releases/download/v1.0.0-beta3/omeka-s.zip' \
+    'https://github.com/omeka/omeka-s/releases/download/v3.1.1/omeka-s-3.1.1.zip' \
     -o /var/www/omeka-s.zip \
 &&  unzip -q /var/www/omeka-s.zip -d /var/www/ \
 &&  rm /var/www/omeka-s.zip \
diff --git a/README.md b/README.md
index 1b97210b..fd4f5283 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Omeka-S in docker
+# Omeka-S in docker
 
 There is also example of docker-compose.yml file which can be used for development.
 It creates 3 containers:
diff --git a/docker-compose.yml b/docker-compose.yml
index 40011a84..4deebf2c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,12 @@
-version: '2'
+version: '2.4'
 
 services:
   db:
-    image: mysql:5.7
-    restart: always
-    environment:
+    image: mariadb:10.6
+    volumes:
+      - omekadb:/var/lib/mysql
+    restart: unless-stopped
+    environment: # the mysql user is 'root'
       MYSQL_ROOT_PASSWORD: omeka
       MYSQL_DATABASE: omeka
       MYSQL_USER: omeka
@@ -12,21 +14,21 @@ services:
 
   db_admin:
     image: phpmyadmin/phpmyadmin
-    restart: always
-    links:
-     - db:db
+    restart: unless-stopped
     ports:
       - "8080:80"
 
-  omeka-s:
+  omeka:
     depends_on:
       - db
-    build: ./
-    image: klokantech/omeka-s
+    build: .
+    image: fsg/omeka-s
     ports:
-      - "80:80"
+      - "8000:80"
     volumes:
       - ./modules/:/var/www/html/modules/
       - ./themes/custom/:/var/www/html/themes/custom/
-    restart: always
+    restart: unless-stopped
 
+volumes:
+  omekadb: