diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 99f04fc..6eb3fa2 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -5,8 +5,11 @@ cont_recreate: false
 cont_restart: false
 
 # CloudFlare Origin certificates
-cloudflare_origin_crt: '{{lookup("passwordstore", "cloud/Cloudflare/origin.crt returnall=true")}}'
-cloudflare_origin_key: '{{lookup("passwordstore", "cloud/Cloudflare/origin.key returnall=true")}}'
+origin_certs:
+  - domain: 'status.im'
+    crt: '{{lookup("passwordstore", "cloud/Cloudflare/status.im/origin.crt returnall=true")}}'
+    key: '{{lookup("passwordstore", "cloud/Cloudflare/status.im/origin.key returnall=true")}}'
+    default: true
 
 # Root password
 bootstrap__root_pass: '{{lookup("passwordstore", "hosts/admin-pass")}}'
diff --git a/ansible/main.yml b/ansible/main.yml
index 09caf7f..0e65b23 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -11,7 +11,7 @@
   hosts:
     - nimbus-master
   roles:
-    - { role: origin-cert,  tags: origin-cert }
+    - { role: origin-certs, tags: origin-certs }
     - { role: nimbus-stats, tags: nimbus-stats }
 
 - name: Configure Nimbus cluster
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 89b1596..4de4202 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -1,5 +1,5 @@
-- name: origin-cert
-  src: git@github.com:status-im/infra-role-origin-cert.git
+- name: origin-certs
+  src: git@github.com:status-im/infra-role-origin-certs.git
   scm: git
 
 - name: infra-role-tinc