diff --git a/defaults/main.yml b/defaults/main.yml
index f71e5da..f3f0ee5 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 orientdb_install: False
 orientdb_enabled: True
-orientdb_version: 3.0.31
+orientdb_version: 3.2.0
 orientdb_archive_commpression: tar.gz
 orientdb_dir: 'orientdb'
 orientdb_tar_filename: '{{ orientdb_dir }}-{{ orientdb_version }}'
@@ -23,7 +23,7 @@ orientdb_configuration_files:
   - automatic-backup.json
 
 orientdb_ssl_enabled: False
-orientdb_letsencrypt_ssl_enabled: False  
+orientdb_letsencrypt_ssl_enabled: False
 orientdb_ssl_client_auth_enabled: False
 
 orientdb_hooks_classes:
@@ -32,7 +32,7 @@ orientdb_hooks_classes:
   - { name: 'org.gcube.informationsystem.orientdb.hooks.IsRelatedToHook', position: 'REGULAR' }
 
 #orientdb_hooks_jars:
-#  - 'http://maven.research-infrastructures.eu/nexus/service/local/artifact/maven/redirect?r=gcube-snapshots&g=org.gcube.information-system&a=resource-registry-orientdb-hooks&v=1.3.0-SNAPSHOT&e=jar&c=jar-with-dependencies'
+#  - 'https://nexus.d4science.org/nexus/service/local/artifact/maven/redirect?r=gcube-snapshots&g=org.gcube.information-system&a=resource-registry-orientdb-hooks&v=1.3.0-SNAPSHOT&e=jar&c=jar-with-dependencies'
 #orientdb_hooks_to_be_removed:
 # - hook*.jar
 
diff --git a/tasks/main.yml b/tasks/main.yml
index 8d9e951..99e4f35 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,7 +2,7 @@
 - block:
     - name: Create the orientdb user
       user: name={{ orientdb_user }} home={{ orientdb_base_dir }} createhome=yes shell=/bin/bash
-      
+
     - name: Get the orientdb distribution
       get_url: url={{ orientdb_binary_distribution_url }} dest={{ orientdb_base_dir }}/{{ orientdb_tar_file }} validate_certs=no
 
@@ -17,7 +17,12 @@
       file: src={{ orientdb_tar_filename }} dest={{ orientdb_install_dir }} state=link
 
     - name: Create a orientdb log directory out of the distribution directory
-      file: dest={{ orientdb_log_dir }} state=directory owner={{ orientdb_user }} group={{ orientdb_user }} mode=0755
+      file:
+        dest: '{{ orientdb_log_dir }}'
+        state: directory
+        owner: '{{ orientdb_user }}'
+        group: '{{ orientdb_user }}'
+        mode: '0755'
 
     - name: Link the log directory inside the orientdb user home
       become: True
@@ -28,7 +33,7 @@
       become: True
       become_user: '{{ orientdb_user }}'
       file: dest={{ item }} state=directory mode=0750
-      with_items:
+      loop:
         - '{{ orientdb_data_dir }}'
         - '{{ orientdb_pid_dir }}'
         - '{{ orientdb_automatic_backup_directory }}'
@@ -49,15 +54,25 @@
       notify: Restart orientdb
 
     - name: Fix the pid file path inside the start and shutdown scripts
-      lineinfile: dest={{ orientdb_install_dir }}/bin/{{ item }} regexp="^ORIENTDB_PID=.*$" line="ORIENTDB_PID={{ orientdb_pid_dir }}/orientdb.pid" insertafter="^PRG=.*$" firstmatch=yes
-      with_items:
+      lineinfile:
+        dest: '{{ orientdb_install_dir }}/bin/{{ item }}'
+        regexp: "^ORIENTDB_PID=.*$"
+        line: "ORIENTDB_PID={{ orientdb_pid_dir }}/orientdb.pid"
+        insertafter: "^PRG=.*$"
+        firstmatch: yes
+      loop:
         - server.sh
         - shutdown.sh
       tags: [ 'orientdb', 'orientdb_pid' ]
 
     - name: Install the orientdb configuration files
-      template: src={{ item }}.j2 dest={{ orientdb_install_dir }}/config/{{ item }} owner={{ orientdb_user }} group={{ orientdb_user }} mode=0640
-      with_items: '{{ orientdb_configuration_files }}'
+      template:
+        src: '{{ item }}.j2'
+        dest: '{{ orientdb_install_dir }}/config/{{ item }}'
+        owner: '{{ orientdb_user }}'
+        group: '{{ orientdb_user }}'
+        mode: '0640'
+      loop: '{{ orientdb_configuration_files }}'
       notify: Restart orientdb
       tags: [ 'orientdb', 'orientdb_config' ]
 
@@ -93,7 +108,7 @@
       service: name=orientdb state=stopped enabled=no
       when: not orientdb_enabled
 
-  tags: orientdb
+  tags: [ 'orientdb' ]
   when: orientdb_install
 
 - block:
@@ -157,6 +172,6 @@
           name: "Remove old orientdb backups"
           state: absent
 
-  tags: orientdb
+  tags: [ 'orientdb' ]
   when: not orientdb_install