diff --git a/tasks/db_setup.yml b/tasks/db_setup.yml
index aca206e..09b01f8 100644
--- a/tasks/db_setup.yml
+++ b/tasks/db_setup.yml
@@ -28,7 +28,7 @@
     - common-mariadb
   block:
     - name: Create database for service
-      mysql_db:
+      community.mysql.mysql_db:
         name: "{{ item.name }}"
         login_host: "{{ _oslodb_setup_endpoint | default(omit) }}"
         login_port: "{{ _oslodb_setup_port | default(omit) }}"
@@ -36,7 +36,7 @@
       no_log: true
 
     - name: Grant access to the database for the service
-      mysql_user:
+      community.mysql.mysql_user:
         name: "{{ item.1.username }}"
         password: "{{ item.1.password }}"
         host: "{{ item.1.host | default('%') }}"
diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index dd6e02e..3e2a363 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -29,12 +29,12 @@
     - common-rabbitmq
   block:
     - name: Add RPC RabbitMQ vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "{{ _oslomsg_rpc_vhost }}"
         state: "present"
 
     - name: Apply RPC RabbitMQ vhost policies
-      rabbitmq_policy:
+      community.rabbitmq.rabbitmq_policy:
         name: "{{ item.name }}"
         pattern: "{{ item.pattern }}"
         priority: "{{ item.priority | default(0) }}"
@@ -43,7 +43,7 @@
       loop: "{{ _oslomsg_rpc_policies | default([]) + oslomsg_rpc_policies }}"
 
     - name: Add RPC RabbitMQ user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "{{ _oslomsg_rpc_userid }}"
         password: "{{ _oslomsg_rpc_password }}"
         update_password: always
@@ -63,7 +63,7 @@
     - common-rabbitmq
   block:
     - name: Add Notify RabbitMQ vhost
-      rabbitmq_vhost:
+      community.rabbitmq.rabbitmq_vhost:
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
       when:
@@ -71,7 +71,7 @@
           (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Apply Notify RabbitMQ vhost policies
-      rabbitmq_policy:
+      community.rabbitmq.rabbitmq_policy:
         name: "{{ item.name }}"
         pattern: "{{ item.pattern }}"
         priority: "{{ item.priority | default(0) }}"
@@ -83,7 +83,7 @@
           (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Add Notify RabbitMQ user
-      rabbitmq_user:
+      community.rabbitmq.rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
         password: "{{ _oslomsg_notify_password }}"
         update_password: always