diff --git a/roles/database_server/molecule/default/create.yml b/roles/database_server/molecule/default/create.yml
index f8eb37cd4df02c540216c02791d0c50870986202..ce8657f9bae3be7f42731fd1efe77e87a62afcd9 100644
--- a/roles/database_server/molecule/default/create.yml
+++ b/roles/database_server/molecule/default/create.yml
@@ -2,7 +2,7 @@
 - name: Create
   hosts: localhost
   connection: local
-  gather_facts: False
+  gather_facts: false
   no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
   vars:
     molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
diff --git a/roles/database_server/molecule/default/destroy.yml b/roles/database_server/molecule/default/destroy.yml
index 3972a2df8fafe515b30a74f951499b83aae8449c..8f0a3703672765e77f4f1a3a8046a1f2b561a7a8 100644
--- a/roles/database_server/molecule/default/destroy.yml
+++ b/roles/database_server/molecule/default/destroy.yml
@@ -3,7 +3,7 @@
 - name: Destroy
   hosts: localhost
   connection: local
-  gather_facts: False
+  gather_facts: false
   no_log: "{{ not lookup('env', 'MOLECULE_DEBUG') | bool }}"
   vars:
     molecule_file: "{{ lookup('env', 'MOLECULE_FILE') }}"
diff --git a/roles/database_server/molecule/default/group_vars/parameters-mandatory.yml b/roles/database_server/molecule/default/group_vars/parameters-mandatory.yml
new file mode 100644
index 0000000000000000000000000000000000000000..a768013ebd0328cfd724db9a0d2d990c58f8076f
--- /dev/null
+++ b/roles/database_server/molecule/default/group_vars/parameters-mandatory.yml
@@ -0,0 +1,3 @@
+---
+
+db_root_password: "root_password"
diff --git a/roles/database_server/molecule/default/molecule.yml b/roles/database_server/molecule/default/molecule.yml
index e44e64743bbf19e7d42d4df80e0bcee59ca2be15..e5c62d0ac461885dd1c5391d022dcee39cb2a168 100644
--- a/roles/database_server/molecule/default/molecule.yml
+++ b/roles/database_server/molecule/default/molecule.yml
@@ -9,6 +9,8 @@ driver:
 
 lint:
   name: yamllint
+  options:
+    config-file: ../../.yamllint.yml
 
 platforms:
 
diff --git a/roles/database_server/molecule/default/playbook.yml b/roles/database_server/molecule/default/playbook.yml
index e2bee44b97a348cb69230f3dd3ddcd9d58e65399..0edd6fa0a1291668f9561a6c58199687a89bd06f 100644
--- a/roles/database_server/molecule/default/playbook.yml
+++ b/roles/database_server/molecule/default/playbook.yml
@@ -1,7 +1,6 @@
 ---
 
 - hosts: parameters-mandatory
-  become: yes
+  become: true
   roles:
-    - role: database_server
-      db_root_password: "root_password"
+    - database_server
diff --git a/roles/database_server/molecule/default/prepare.yml b/roles/database_server/molecule/default/prepare.yml
index 2ca5369027ee16118496dcf8548f8d803a0c9699..ecfa6db10c57f61e118e827fb3a95abf2159de8c 100644
--- a/roles/database_server/molecule/default/prepare.yml
+++ b/roles/database_server/molecule/default/prepare.yml
@@ -2,18 +2,18 @@
 
 - name: Prepare
   hosts: all
-  gather_facts: False
+  gather_facts: false
   tasks:
     - name: Install python for Ansible
       raw: test -e /usr/bin/python || (apt -y update && apt install -y python-minimal)
-      become: True
-      changed_when: False
+      become: true
+      changed_when: false
 
 - hosts: all
-  become: yes
+  become: true
   tasks:
 
     - name: Update all caches to avoid errors due to missing remote archives
       apt:
-        update_cache: yes
-      changed_when: False
+        update_cache: true
+      changed_when: false
diff --git a/roles/database_server/tasks/main.yml b/roles/database_server/tasks/main.yml
index 02c969ef080e153287009942283dbb0d1dde5a3d..2cc551597f234eb71df8f4a77956ead59982db33 100644
--- a/roles/database_server/tasks/main.yml
+++ b/roles/database_server/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Install MariaDB
   apt:
     name: "{{ item }}"
-    state: installed
+    state: present
   with_items:
     - mariadb-client
     - mariadb-server
@@ -21,7 +21,7 @@
 
 - name: Set password for the root database user
   mysql_user:
-    check_implicit_admin: yes
+    check_implicit_admin: true
     name: root
     password: "{{ db_root_password }}"