diff --git a/galaxy.yml b/galaxy.yml
index 7e54cdc..29d1d00 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -23,7 +23,6 @@ tags:
   - java
 dependencies:
   "middleware_automation.redhat_csp_download": ">=1.2.1"
-  "community.general": ">=5.6.0"
   "ansible.posix": ">=1.4.0"
 repository: https://github.com/ansible-middleware/keycloak
 documentation: https://ansible-middleware.github.io/keycloak
diff --git a/requirements.yml b/requirements.yml
index 4eab0c7..dae1d95 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -2,5 +2,4 @@
 collections:
   - name: middleware_automation.redhat_csp_download
     version: ">=1.2.1"
-  - name: community.general
   - name: ansible.posix
diff --git a/roles/keycloak_realm/tasks/main.yml b/roles/keycloak_realm/tasks/main.yml
index 45ac34b..9233080 100644
--- a/roles/keycloak_realm/tasks/main.yml
+++ b/roles/keycloak_realm/tasks/main.yml
@@ -36,7 +36,7 @@
   when: keycloak_realm_exists.status == 404
 
 - name: Create user federation
-  community.general.keycloak_user_federation:
+  middleware_automation.keycloak.keycloak_user_federation:
     auth_keycloak_url: "{{ keycloak_url }}{{ keycloak_context }}"
     auth_realm: "{{ keycloak_auth_realm }}"
     auth_username: "{{ keycloak_admin_user }}"
@@ -65,7 +65,7 @@
     label: "{{ item.name | default('unnamed client') }}"
 
 - name: Create or update a Keycloak client
-  community.general.keycloak_client:
+  middleware_automation.keycloak.keycloak_client:
     auth_client_id: "{{ keycloak_auth_client }}"
     auth_keycloak_url: "{{ keycloak_url }}{{ keycloak_context }}"
     auth_realm: "{{ keycloak_auth_realm }}"
diff --git a/roles/keycloak_realm/tasks/manage_client_roles.yml b/roles/keycloak_realm/tasks/manage_client_roles.yml
index 6db30fa..4a261b1 100644
--- a/roles/keycloak_realm/tasks/manage_client_roles.yml
+++ b/roles/keycloak_realm/tasks/manage_client_roles.yml
@@ -1,5 +1,5 @@
 - name: Create client roles
-  community.general.keycloak_role:
+  middleware_automation.keycloak.keycloak_role:
     name: "{{ item }}"
     realm: "{{ client.realm }}"
     client_id: "{{ client.name }}"