diff --git a/roles/setup_selfsigned_cert/tasks/main.yml b/roles/setup_selfsigned_cert/tasks/main.yml
index 0a2c6dfa..ec2e7ec7 100644
--- a/roles/setup_selfsigned_cert/tasks/main.yml
+++ b/roles/setup_selfsigned_cert/tasks/main.yml
@@ -31,12 +31,11 @@
   become: true
 
 - name: Generate an OpenSSL private key
-  community.crypto.openssl_privatekey:
+  openssl_privatekey:
     path: "{{ privatekey_path }}"
 
-
 - name: Generate an OpenSSL CSR
-  community.crypto.openssl_csr:
+  openssl_csr:
     path: "{{ csr_path }}"
     privatekey_path: "{{ privatekey_path }}"
     common_name: "{{ cert_common_name }}"
@@ -45,24 +44,24 @@
     locality_name: "{{ cert_locality }}"
     organization_name: "{{ cert_organization }}"
     organizational_unit_name: "{{ cert_organizational_unit }}"
-    basic_constraints_critical: true
-    create_subject_key_identifier: true
+    basic_constraints_critical: yes
+    create_subject_key_identifier: yes
     basic_constraints: ["CA:TRUE"]
 
 - name: Generate a selfsigned OpenSSL CA Certificate
-  community.crypto.x509_certificate:
+  openssl_certificate:
     path: "{{ ownca_path }}"
     privatekey_path: "{{ privatekey_path }}"
     csr_path: "{{ csr_path }}"
     provider: selfsigned
 
 - name: Generate an ownca OpenSSL Certificate
-  community.crypto.x509_certificate:
+  openssl_certificate:
     path: "{{ cert_path }}"
     ownca_privatekey_path: "{{ privatekey_path }}"
     csr_path: "{{ csr_path }}"
     ownca_path: "{{ ownca_path }}"
-    ownca_create_authority_key_identifier: true
+    ownca_create_authority_key_identifier: yes
     provider: ownca
 
 - name: Set cert in CA trust