diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cac7c3b1967a3ae2fb7bff785648539a8cfb025b..852a0380f2b94cd1180d2083f3eed76b98b1b5d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,6 +69,10 @@
   rules:
     - when: always
 
+.cert_manager_rules:
+  rules:
+    - when: always
+
 .rocketchat_rules:
   rules:
     - changes:
@@ -230,7 +234,6 @@ enable-eventrouter:
     - .enable_app_template
     - .eventrouter_rules
 
-
 enable-loki-stack:
   variables:
     APP: "loki-stack"
@@ -351,6 +354,13 @@ setup-openappstack:
     - .ssh_setup
   interruptible: true
 
+cert-manager-helm-release:
+  variables:
+    APP: "cert-manager"
+  extends:
+    - .helm-release
+    - .cert_manager_rules
+
 eventrouter-helm-release:
   variables:
     APP: "eventrouter"
@@ -424,6 +434,15 @@ wordpress-helm-release:
     - .ssh_setup
   interruptible: true
 
+cert-manager-ready:
+  variables:
+    APP: "cert-manager"
+  needs:
+    - job: cert-manager-helm-release
+  extends:
+    - .apps-ready
+    - .cert_manager_rules
+
 eventrouter-ready:
   variables:
     APP: "eventrouter"
diff --git a/test/pytest/test_app_deployments.py b/test/pytest/test_app_deployments.py
index 01fadbdc4650c7294134f1b7975fb9285902d18d..b127a1146f7d70ba1e9138170f2aae530d98dcdb 100644
--- a/test/pytest/test_app_deployments.py
+++ b/test/pytest/test_app_deployments.py
@@ -25,6 +25,10 @@ EXPECTED_RELEASES = {
 }
 
 EXPECTED_APP_LABELS = {
+    'cert-manager': {
+        'namespace': 'cert-manager',
+        'label_selector': 'app.kubernetes.io/instance=cert-manager'
+    },
     'eventrouter': {
         'namespace': 'oas',
         'label_selector': 'app=eventrouter'},