diff --git a/tasks/install-database.yml b/tasks/install-database.yml
index e5afe4a511a3b54a7c45e31320f80bf25194406f..ad96877955893b939b61e8ca03d2a9b279ee95ad 100644
--- a/tasks/install-database.yml
+++ b/tasks/install-database.yml
@@ -1,6 +1,4 @@
 ---
-# Adding the database to be used by Keycloak
-
 # Adding the Java Database Driver
 - name : Installation of the latest Java OpenJDK Driver
   become: yes
@@ -8,45 +6,3 @@
     name :
     - libmariadb-java
     state : latest
-
-# Creating the database user and password for keycloak
-
-- name: "Delete the anonymous user."
-  become: yes
-  mysql_user:
-    user: ""
-    state: "absent"
-    login_user: root
-    login_password: "{{ keycloak_mysql_root_password }}"
-    config_file: "{{ mysql_credential_file[(ansible_os_family|lower)] | default(omit) }}"
-  ignore_errors: yes
-
-- name: "Removes the MySQL test database"
-  become: yes
-  mysql_db:
-    name: test
-    state: absent
-    login_user: root
-    login_password: "{{ keycloak_mysql_root_password }}"
-    config_file: "{{ mysql_credential_file[(ansible_os_family|lower)] | default(omit) }}"
-  ignore_errors: yes
-
-- name: "Add Database {{ keycloak_db_name }}."
-  become: yes
-  mysql_db:
-    name: "{{ keycloak_db_name }}"
-    login_user: root
-    login_password: "{{ keycloak_mysql_root_password }}"
-    config_file: "{{ mysql_credential_file[(ansible_os_family|lower)] | default(omit) }}"
-    state: present
-
-- name: "Configure the database user."
-  become: yes
-  mysql_user:
-    name: "{{ keycloak_db_admin }}"
-    password: "{{ keycloak_db_pwd }}"
-    priv: "{{ keycloak_db_name }}.*:ALL"
-    login_user: root
-    login_password: "{{ keycloak_mysql_root_password }}"
-    config_file: "{{ mysql_credential_file[(ansible_os_family|lower)] | default(omit) }}"
-    state: present
diff --git a/tasks/main.yml b/tasks/main.yml
index abbc5204baaddebeedaacdfdfc48e7b6c986c3b6..ee648f7f0521e51ee17516a621993ed7530fdd47 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,14 +13,14 @@
 - name: Setup the logs for keycloak
   include_tasks: install-logs.yml
 
+- name: Install the database java driver
+  include_tasks: install-database.yml
+
 # Update the service
 - name: Import data from previous versions and update the installation.
   include_tasks: update-service.yml
   when: keycloak_previous_version is defined
 
-- name: Get the database running
-  include_tasks: install-database.yml
-
 - name: Download and install the service from archive
   include_tasks: install-service.yml