diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 8aa644c..289f723 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: mysql:latest
+    image: mariadb:latest
     env_file:
       - env/mysql.env
     volumes:
diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml
index 0fc8571..284d8e9 100644
--- a/docker-compose-pro.yml
+++ b/docker-compose-pro.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: mysql:latest
+    image: mariadb:latest
     env_file:
       - env/mysql.env
     volumes:
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.3-pro-debian
+    image: passbolt/passbolt:2.0.4-pro-debian
     tty: true
     depends_on:
       - db
diff --git a/docker-compose.yml b/docker-compose.yml
index cfca8e3..6d6964e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   db:
-    image: mysql:latest
+    image: mariadb:latest
     env_file:
       - env/mysql.env
     volumes:
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.3-debian
+    image: passbolt/passbolt:2.0.4-debian
     tty: true
     depends_on:
       - db
diff --git a/spec/docker_runtime/runtime_spec.rb b/spec/docker_runtime/runtime_spec.rb
index 0ce9062..f9e7b2f 100644
--- a/spec/docker_runtime/runtime_spec.rb
+++ b/spec/docker_runtime/runtime_spec.rb
@@ -16,7 +16,7 @@ describe 'passbolt_api service' do
           "mysqladmin ping --silent"
         ]
       },
-      'Image' => 'mysql')
+      'Image' => 'mariadb')
     @mysql.start
 
     while @mysql.json['State']['Health']['Status'] != 'healthy'