diff --git a/roles/certificates/tasks/main.yml b/roles/certificates/tasks/main.yml
index 1f6d636..9f6b85e 100644
--- a/roles/certificates/tasks/main.yml
+++ b/roles/certificates/tasks/main.yml
@@ -18,25 +18,12 @@
       kubernetes.core.k8s_info:
         api_version: v1
         kind: Secret
-        name: cert-manager-selfsigned-ca
+        name: "{{ atmosphere_issuer_config.type == 'self-signed' | ternary('cert-manager-selfsigned-ca', 'cert-manager-issuer-ca') }}"
         namespace: openstack
         wait: true
         wait_sleep: 1
         wait_timeout: 300
       register: _openstack_helm_root_secret
-      when: atmosphere_issuer_config.type == "self-signed"
-
-    - name: Wait till the secret is created
-      kubernetes.core.k8s_info:
-        api_version: v1
-        kind: Secret
-        name: cert-manager-issuer-ca
-        namespace: openstack
-        wait: true
-        wait_sleep: 1
-        wait_timeout: 300
-      register: _openstack_helm_root_secret
-      when: atmosphere_issuer_config.type == "ca"
 
     - name: Copy CA certificate on host
       ansible.builtin.copy: