diff --git a/roles/create_certification_project/templates/create_project_helmchart.json.j2 b/roles/create_certification_project/templates/create_project_helmchart.json.j2
index db9ca9c82..1aad168ea 100644
--- a/roles/create_certification_project/templates/create_project_helmchart.json.j2
+++ b/roles/create_certification_project/templates/create_project_helmchart.json.j2
@@ -1,11 +1,13 @@
 {
     "certification_status": "Started",
+    {% if cert_settings is defined and cert_settings.email_address is defined %}
     "contacts": [
       {
         "email_address": "{{ cert_settings.email_address }}",
         "type": "Technical contact"
       }
     ],
+    {% endif %}
     "helm_chart": {
       "chart_name": "{{ current_chart_name }}",
       "distribution_method": "{{ cert_settings.distribution_method }}",
diff --git a/roles/create_certification_project/templates/create_project_openshift_cnf.json.j2 b/roles/create_certification_project/templates/create_project_openshift_cnf.json.j2
index 73a8ef8a6..b2a1bd889 100644
--- a/roles/create_certification_project/templates/create_project_openshift_cnf.json.j2
+++ b/roles/create_certification_project/templates/create_project_openshift_cnf.json.j2
@@ -1,11 +1,13 @@
 {
   "certification_status": "Started",
+  {% if cert_settings is defined and cert_settings.email_address is defined %}
   "contacts": [
     {
-      "email_address": "{{ cert_listings.email_address }}",
+      "email_address": "{{ cert_settings.email_address }}",
       "type": "Technical contact"
     }
   ],
+  {% endif %}
   "name": "{{ current_cnf_name }}",
   "project_status": "active",
   "type": "OpenShift-cnf"
diff --git a/roles/create_helmchart/README.md b/roles/create_helmchart/README.md
index 5d7b30f90..4e75db150 100644
--- a/roles/create_helmchart/README.md
+++ b/roles/create_helmchart/README.md
@@ -64,13 +64,13 @@ helmchart_to_certify:
     create_helmchart_project: true
 
 cert_settings:
-   email_address: "mail@example.com"
-   distribution_method: "undistributed" #undistributed==>Web catalog only, external==> charts.openshift.io
-   github_usernames: "xusername"
-   application_categories: "Networking"
-   long_description: "This is a long description about this sample chart"
-   application_categories: "Networking"
-   distribution_instructions: "Instruction how to get this helm-chart"
+  email_address: "mail@example.com"
+  distribution_method: "undistributed" #undistributed==>Web catalog only, external==> charts.openshift.io
+  github_usernames: "xusername"
+  application_categories: "Networking"
+  long_description: "This is a long description about this sample chart"
+  application_categories: "Networking"
+  distribution_instructions: "Instruction how to get this helm-chart"
 
 cert_listings:
   published: false
diff --git a/roles/openshift_cnf/README.md b/roles/openshift_cnf/README.md
index 671603790..0273512d1 100644
--- a/roles/openshift_cnf/README.md
+++ b/roles/openshift_cnf/README.md
@@ -18,6 +18,13 @@ create_cnf_project       | false
 cnf_name                 | None                                                                       | If defined, it would create Openshift-cnf certification project for vendor validated, cnf_name format: `CNF25.8 + OCP4.12`
 
 
+## Variables to define for project settings under `cert_settings`
+
+Name                          | Default                              | Description
+----------------------------- | ------------------------------------ | -------------
+email_address                 | "mail@example.com"                   | String. Email address is needed for creating openshift-cnf project
+
+
 ## Variables to define for project settings under `cert_listings` main variable
 
 Name                          | Default                              | Description
@@ -25,8 +32,6 @@ Name                          | Default                              | Descripti
 pyxis_product_lists           | None                                 | A list of Product Listings; all of them must be created beforehand [See doc](https://redhat-connect.gitbook.io/red-hat-partner-connect-general-guide/managing-your-account/product-listing). It could contain one or many PLs. If set, it will attach all PLs to both old and new certification projects.
 published                     | false                                | Boolean to enable publishing list of products
 type                          | "container stack"                    | String. Type of product list
-email_address                 | "mail@example.com"                   | String. Email address is needed for creating openshift-cnf project
-
 
 
 ## Example Configuration of Openshift-cnf certification project creation
@@ -47,13 +52,10 @@ cnf_to_certify:
   - cnf_name: "test-upf23.5 OCP4.11.5"
     create_cnf_project: true
 
-cert_listings:
-  # TODO: check the comment with Andrew - mandatory or not mandatory?
-  # Looks like mandatory because cert_listings.email_address is used in the template
-  # create_certification_project/templates/create_project_openshift_cnf.json.j2
-  # TODO: could we delete this contact setup to merge openshift_cnf with other product types?
-  # email_address is mandatory when creating openshift-cnf for vendor validation but does not hurt to define it
+cert_settings:
   email_address: "email@example.com"
+
+cert_listings:
   published: false
   type: "container stack"
   pyxis_product_lists: