diff --git a/docker-compose-arm/Dockerfile b/docker-compose-arm/Dockerfile
index bc60b3f..bf416d6 100644
--- a/docker-compose-arm/Dockerfile
+++ b/docker-compose-arm/Dockerfile
@@ -5,7 +5,7 @@
 FROM arm32v7/debian:buster
 MAINTAINER EasyPi Software Foundation
 
-ENV DOCKER_COMPOSE_VERSION 1.25.2
+ENV DOCKER_COMPOSE_VERSION 1.25.4
 ENV PYINSTALLER_VERSION 3.6
 
 RUN set -xe \
@@ -22,8 +22,8 @@ RUN set -xe \
                    pyinstaller==$PYINSTALLER_VERSION \
     && cd /usr/local/lib/python3.7/dist-packages \
     && mkdir -p bin \
-    && curl -sSL https://github.com/docker/compose/raw/v$DOCKER_COMPOSE_VERSION/docker-compose.spec > docker-compose.spec \
-    && curl -sSL https://github.com/docker/compose/raw/v$DOCKER_COMPOSE_VERSION/bin/docker-compose > bin/docker-compose \
+    && curl -sSL https://github.com/docker/compose/raw/$DOCKER_COMPOSE_VERSION/docker-compose.spec > docker-compose.spec \
+    && curl -sSL https://github.com/docker/compose/raw/$DOCKER_COMPOSE_VERSION/bin/docker-compose > bin/docker-compose \
     && touch compose/GITSHA \
     && pyinstaller docker-compose.spec \
     && cp docker-compose/dist/docker-compose /usr/local/bin/ \
diff --git a/openmeetings/docker-compose.yml b/openmeetings/docker-compose.yml
index b12f841..1150a49 100644
--- a/openmeetings/docker-compose.yml
+++ b/openmeetings/docker-compose.yml
@@ -1,9 +1,9 @@
-version: '3.1'
+version: '3.7'
 
 services:
 
   openmeetings:
-    image: vimagick/openmeetings
+    image: apache/openmeetings:min-5.0.0-M3
     ports:
       - "5443:5443"
     volumes:
@@ -16,13 +16,13 @@ services:
       - OM_DB_NAME=openmeetings
       - OM_USER=admin
       - OM_PASS=admin
-    restart: always
+    restart: unless-stopped
 
   kurento:
     image: kurento/kurento-media-server
     ports:
       - "8888:8888"
-    restart: always
+    restart: unless-stopped
   
   mysql:
     image: mysql
@@ -31,4 +31,4 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=openmeetings
-    restart: always
+    restart: unless-stopped