diff --git a/roles/miniflux/defaults/main.yml b/roles/miniflux/defaults/main.yml
index c9693a5..6e3425b 100644
--- a/roles/miniflux/defaults/main.yml
+++ b/roles/miniflux/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to install
-miniflux_version: 2.0.34
+miniflux_version: 2.0.35
 # URL of the binary to install
 miniflux_bin_url: https://github.com/miniflux/v2/releases/download/{{ miniflux_version }}/miniflux-linux-amd64
 # Expected sha1 of the binary
-miniflux_bin_sha1: dd4ef2a91d7e84d8945daf54df9cb7dd05e22b3f
+miniflux_bin_sha1: b4558abc1252a71e862494a1461104aff9cfcfb8
 # Should ansible handle upgrades ? If false, only initial install will be done
 miniflux_manage_upgrade: True
 
diff --git a/roles/navidrome/defaults/main.yml b/roles/navidrome/defaults/main.yml
index c6aeebc..397aff6 100644
--- a/roles/navidrome/defaults/main.yml
+++ b/roles/navidrome/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to deploy
-nd_version: 0.47.0
+nd_version: 0.47.5
 # URL of the archive
 nd_archive_url: https://github.com/navidrome/navidrome/releases/download/v{{ nd_version }}/navidrome_{{ nd_version }}_Linux_x86_64.tar.gz
 # Expected sha1 of the archive
-nd_archive_sha1: 3d06456e26953931399d001f1d3c412f48ac9f34
+nd_archive_sha1: bbfe114bfb0c71f7d09821c194e3f57b8e93b710
 
 # Should ansible handle upgrades, or only initial install ?
 nd_manage_upgrade: True
diff --git a/roles/pgadmin4/defaults/main.yml b/roles/pgadmin4/defaults/main.yml
index a9b818f..084df8d 100644
--- a/roles/pgadmin4/defaults/main.yml
+++ b/roles/pgadmin4/defaults/main.yml
@@ -10,7 +10,7 @@ pga_src_ip: []
 # Root dir where the app will be installed
 pga_root_dir: /opt/pgadmin4_{{ pga_id }}
 # Version to deploy
-pga_version: '6.3'
+pga_version: '6.4'
 # URL of the wheel
 pga_pip_url: https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v{{ pga_version }}/pip/pgadmin4-{{ pga_version }}-py3-none-any.whl
 
diff --git a/roles/phpmyadmin/defaults/main.yml b/roles/phpmyadmin/defaults/main.yml
index 3c54535..5e97ddf 100644
--- a/roles/phpmyadmin/defaults/main.yml
+++ b/roles/phpmyadmin/defaults/main.yml
@@ -1,14 +1,14 @@
 ---
 
 # Version to deploy
-pma_version: 5.1.1
+pma_version: 5.1.2
 # ID of the instance. Several instances can be installed on the same server
 # they must have different ID
 pma_id: "1"
 # URL from where the archive will be downloaded
 pma_archive_url: https://files.phpmyadmin.net/phpMyAdmin/{{ pma_version }}/phpMyAdmin-{{ pma_version }}-all-languages.zip
 # Expected sha256 of the archive, to verify the download
-pma_archive_sha256: 78a5d93621f9fdfc221a530705025dc79c1abc7a4d6a940a9d0a9a3719d0554c
+pma_archive_sha256: 7f5d783fedd0d290714b93bd20c8dfff0663fc571445a89c329dfc3d5147ea93
 # Should ansible handle upgrades. If False, then only the initial install will be done
 pma_manage_upgrade: True
 # Where phpMyAdmin will be installed
diff --git a/roles/zabbix_agent/defaults/main.yml b/roles/zabbix_agent/defaults/main.yml
index b8cc4ab..898d6a0 100644
--- a/roles/zabbix_agent/defaults/main.yml
+++ b/roles/zabbix_agent/defaults/main.yml
@@ -1,5 +1,8 @@
 ---
 zabbix_agent_port: 10050
+# Use agent 2 (go)
+zabbix_agent2: False
+
 # List of servers allowed to connect to the agent (passive checks)
 zabbix_agent_servers:
   - 51.91.175.34
@@ -21,7 +24,7 @@ zabbix_agent_base_conf:
   TLSPSKIdentity: "{{ inventory_hostname }}-agent"
   TLSConnect: psk
   TLSAccept: 'unencrypted,psk'
-  StartAgents: 5
+  StartAgents: 5 # This one will be ignored on agent2
 zabbix_agent_extra_conf: {}
 zabbix_agent_conf: "{{ zabbix_agent_base_conf | combine(zabbix_agent_extra_conf, recursive=True) }}"
 
diff --git a/roles/zabbix_agent/handlers/main.yml b/roles/zabbix_agent/handlers/main.yml
index 0e65a01..6c26713 100644
--- a/roles/zabbix_agent/handlers/main.yml
+++ b/roles/zabbix_agent/handlers/main.yml
@@ -1,3 +1,3 @@
 ---
 - name: restart zabbix-agent
-  service: name=zabbix-agent state=restarted enabled=yes
+  service: name={{ zabbix_agent2 | ternary('zabbix-agent2', 'zabbix-agent') }} state=restarted
diff --git a/roles/zabbix_agent/tasks/conf.yml b/roles/zabbix_agent/tasks/conf.yml
index ce8f68a..6ce29c5 100644
--- a/roles/zabbix_agent/tasks/conf.yml
+++ b/roles/zabbix_agent/tasks/conf.yml
@@ -1,11 +1,11 @@
 ---
 - name: Deploy Zabbix Agent configuration
-  template: src=zabbix_agentd.conf.j2 dest=/etc/zabbix/zabbix_agentd.conf
+  template: src=zabbix_agentd.conf.j2 dest=/etc/zabbix/{{ zabbix_agent2 | ternary('zabbix_agent2.conf', 'zabbix_agentd.conf') }}
   notify: restart zabbix-agent
   tags: zabbix
 
 - name: Detect if vfs.dev.discovery is supported natively
-  shell: zabbix_agentd -t vfs.dev.discovery -c /dev/null | grep -q ZBX_NOTSUPPORTED
+  shell: "{{ zabbix_agent2 | ternary('zabbix_agent2', 'zabbix_agentd') }} -t vfs.dev.discovery -c /dev/null | grep -q ZBX_NOTSUPPORTED"
   register: zabbix_dev_disco
   failed_when: False
   changed_when: False
diff --git a/roles/zabbix_agent/tasks/facts.yml b/roles/zabbix_agent/tasks/facts.yml
index 0ab84e5..c6cd310 100644
--- a/roles/zabbix_agent/tasks/facts.yml
+++ b/roles/zabbix_agent/tasks/facts.yml
@@ -7,3 +7,19 @@
     - vars/{{ ansible_distribution }}.yml
     - vars/{{ ansible_os_family }}.yml
   tags: zabbix
+
+- name: Check if agent is installed
+  stat: path=/lib/systemd/system/zabbix-agent.service
+  register: zabbix_agent_installed
+  tags: zabbix
+
+- name: Check if agent2 is installed
+  stat: path=/lib/systemd/system/zabbix-agent2.service
+  register: zabbix_agent2_installed
+  tags: zabbix
+
+# zabbix-agent2 is only supported on Debian >= 9
+- name: Disable agent2 on older Debian
+  set_fact: zabbix_agent2=False
+  when: ansible_os_family == 'Debian' and ansible_distribution_major_version is version('9', '<')
+  tags: zabbix
diff --git a/roles/zabbix_agent/tasks/install.yml b/roles/zabbix_agent/tasks/install.yml
new file mode 100644
index 0000000..5c9eaab
--- /dev/null
+++ b/roles/zabbix_agent/tasks/install.yml
@@ -0,0 +1,30 @@
+---
+
+- when: zabbix_agent2 and zabbix_agent_installed.stat.exists
+  block:
+    - name: Stop zabbix-agent
+      service: name=zabbix-agent state=stopped enabled=False
+
+    # Note : don't remove it as it'll be pulled as a dependency of zabbix-agent-addons
+  tags: zabbix
+
+- when: not zabbix_agent2 and zabbix_agent2_installed.stat.exists
+  block:
+    - name: Stop zabbix-agent2
+      service: name=zabbix-agent2 state=stopped enabled=False
+
+    - name: Remove zabbix-agent2
+      package:
+        name:
+          - zabbix-agent2
+        state: absent
+
+  tags: zabbix
+
+- name: Install zabbix-agent
+  package:
+    name:
+      - "{{ (zabbix_agent2) | ternary('zabbix-agent2', 'zabbix-agent') }}"
+    state: "{{ zabbix_agent_update | ternary('latest', 'present') }}"
+  notify: restart zabbix-agent
+  tags: zabbix
diff --git a/roles/zabbix_agent/tasks/install_Debian.yml b/roles/zabbix_agent/tasks/install_Debian.yml
index db60088..f688d6d 100644
--- a/roles/zabbix_agent/tasks/install_Debian.yml
+++ b/roles/zabbix_agent/tasks/install_Debian.yml
@@ -1,12 +1,5 @@
 ---
 
-- name: Install agent and dependencies
-  apt:
-    name: "{{ zabbix_agent_packages }}"
-    state: "{{ zabbix_agent_update | ternary('latest','present') }}"
-    policy_rc_d: 101 # Prevent the daemon from starting automatically after install
-  tags: zabbix
-
 - name: Create needed directories
   file: path={{ item }} state=directory
   with_items:
diff --git a/roles/zabbix_agent/tasks/install_RedHat.yml b/roles/zabbix_agent/tasks/install_RedHat.yml
index 4657a11..ff1c8f3 100644
--- a/roles/zabbix_agent/tasks/install_RedHat.yml
+++ b/roles/zabbix_agent/tasks/install_RedHat.yml
@@ -1,6 +1,6 @@
 ---
 
-- name: Install Zabbix Agent and additional scripts
+- name: Install additional scripts
   yum:
     name: "{{ zabbix_agent_packages }}"
     state: "{{ zabbix_agent_update | ternary('latest','present') }}"
diff --git a/roles/zabbix_agent/tasks/main.yml b/roles/zabbix_agent/tasks/main.yml
index 2c03615..f54746f 100644
--- a/roles/zabbix_agent/tasks/main.yml
+++ b/roles/zabbix_agent/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
 
 - include: facts.yml
+- include: install.yml
 - include: install_{{ ansible_os_family }}.yml
 - include: selinux.yml
   when: ansible_selinux.status == 'enabled'
diff --git a/roles/zabbix_agent/tasks/service.yml b/roles/zabbix_agent/tasks/service.yml
index 0b173a9..c633d53 100644
--- a/roles/zabbix_agent/tasks/service.yml
+++ b/roles/zabbix_agent/tasks/service.yml
@@ -1,4 +1,4 @@
 ---
 - name: Start Zabbix Agent
-  service: name=zabbix-agent state=started enabled=True
+  service: name={{ zabbix_agent2 | ternary('zabbix-agent2', 'zabbix-agent') }} state=started enabled=True
   tags: zabbix
diff --git a/roles/zabbix_agent/templates/zabbix_agentd.conf.j2 b/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
index d4d4157..33d12d3 100644
--- a/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
+++ b/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
@@ -1,4 +1,7 @@
 {% for key in zabbix_agent_conf.keys() | list %}
+{% if zabbix_agent2 and key in ['StartAgents'] %}
+# Ignoring directive {{ key }}={{ zabbix_agent_conf[key] }} as it's not supported in agent2
+{% else %}
 {% if not zabbix_agent_conf[key] is string and zabbix_agent_conf[key] is iterable %}
 {% for x in zabbix_agent_conf[key] %}
 {{ key }}={{ x }}
@@ -6,4 +9,5 @@
 {% else %}
 {{ key }}={{ zabbix_agent_conf[key] }}
 {% endif %}
+{% endif %}
 {% endfor %}
diff --git a/roles/zabbix_agent/vars/Debian-10.yml b/roles/zabbix_agent/vars/Debian-10.yml
index b95a501..8157f56 100644
--- a/roles/zabbix_agent/vars/Debian-10.yml
+++ b/roles/zabbix_agent/vars/Debian-10.yml
@@ -1,7 +1,6 @@
 ---
 
 zabbix_agent_packages:
-  - zabbix-agent
   - openssl
   - git
   - libconfig-simple-perl
diff --git a/roles/zabbix_agent/vars/Debian-11.yml b/roles/zabbix_agent/vars/Debian-11.yml
index b95a501..8157f56 100644
--- a/roles/zabbix_agent/vars/Debian-11.yml
+++ b/roles/zabbix_agent/vars/Debian-11.yml
@@ -1,7 +1,6 @@
 ---
 
 zabbix_agent_packages:
-  - zabbix-agent
   - openssl
   - git
   - libconfig-simple-perl
diff --git a/roles/zabbix_agent/vars/Debian-9.yml b/roles/zabbix_agent/vars/Debian-9.yml
index b95a501..8157f56 100644
--- a/roles/zabbix_agent/vars/Debian-9.yml
+++ b/roles/zabbix_agent/vars/Debian-9.yml
@@ -1,7 +1,6 @@
 ---
 
 zabbix_agent_packages:
-  - zabbix-agent
   - openssl
   - git
   - libconfig-simple-perl
diff --git a/roles/zabbix_agent/vars/RedHat-7.yml b/roles/zabbix_agent/vars/RedHat-7.yml
index 03b9f60..c473598 100644
--- a/roles/zabbix_agent/vars/RedHat-7.yml
+++ b/roles/zabbix_agent/vars/RedHat-7.yml
@@ -1,7 +1,6 @@
 ---
 
 zabbix_agent_packages:
-  - zabbix-agent
   - zabbix-agent-addons
   - policycoreutils-python
   - openssl
diff --git a/roles/zabbix_agent/vars/RedHat-8.yml b/roles/zabbix_agent/vars/RedHat-8.yml
index 71726b6..2cde59e 100644
--- a/roles/zabbix_agent/vars/RedHat-8.yml
+++ b/roles/zabbix_agent/vars/RedHat-8.yml
@@ -1,7 +1,6 @@
 ---
 
 zabbix_agent_packages:
-  - zabbix-agent
   - zabbix-agent-addons
   - policycoreutils-python-utils
   - openssl
diff --git a/roles/zabbix_agent/vars/Ubuntu-20.yml b/roles/zabbix_agent/vars/Ubuntu-20.yml
index b95a501..8157f56 100644
--- a/roles/zabbix_agent/vars/Ubuntu-20.yml
+++ b/roles/zabbix_agent/vars/Ubuntu-20.yml
@@ -1,7 +1,6 @@
 ---
 
 zabbix_agent_packages:
-  - zabbix-agent
   - openssl
   - git
   - libconfig-simple-perl