diff --git a/Dockerfile b/Dockerfile
index aa4fdb95a..bd7e03a14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
-ARG PHP_VERSION=8.0
-ARG COMPOSER_VERSION=2.0
+ARG PHP_VERSION=8.1
+ARG COMPOSER_VERSION=2.5.4
 
-FROM composer:${COMPOSER_VERSION}
 FROM php:${PHP_VERSION}-cli
 
 RUN apt-get update && \
@@ -10,6 +9,16 @@ RUN apt-get update && \
     pecl install xdebug && docker-php-ext-enable xdebug && \
     docker-php-ext-install -j$(nproc) pdo_mysql zip
 
-COPY --from=composer /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/local/bin/composer
 
 WORKDIR /code
+
+COPY composer.* ./
+
+RUN composer install
+
+COPY ./ ./
+
+RUN composer install
+
+CMD ["./vendor/bin/phpunit"]
diff --git a/docker-compose.yml b/docker-compose.yml
index ec612f1fe..dab907abe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,7 @@ version: '3'
 services:
     tests:
         container_name: tests
+        tty: true
         build:
             context: .
             dockerfile: Dockerfile
@@ -15,20 +16,16 @@ services:
 
     mysql:
         container_name: mysql
-        image: mysql:5.7
+        image: mysql:8.0
         ports:
-            - 3306:3306
+            - "3306:3306"
         environment:
             MYSQL_ROOT_PASSWORD:
             MYSQL_DATABASE: unittest
             MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
-        logging:
-            driver: none
 
     mongodb:
         container_name: mongodb
-        image: mongo
+        image: mongo:latest
         ports:
-            - 27017:27017
-        logging:
-            driver: none
+            - "27017:27017"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 9aebe0c0a..120898c08 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -38,7 +38,7 @@
         </testsuite>
     </testsuites>
     <php>
-        <env name="MONGODB_URI" value="mongodb://127.0.0.1/" />
+        <env name="MONGODB_URI" value="mongodb://mongodb/" />
         <env name="MONGODB_DATABASE" value="unittest"/>
         <env name="MYSQL_HOST" value="mysql"/>
         <env name="MYSQL_PORT" value="3306"/>