diff --git a/ansible/roles/es-mapping/files/indices/cert-templates.json b/ansible/roles/es-mapping/files/indices/cert-templates.json
new file mode 100644
index 0000000000000000000000000000000000000000..adb3af3688b8ced07ecf4b969e44659208c072b7
--- /dev/null
+++ b/ansible/roles/es-mapping/files/indices/cert-templates.json
@@ -0,0 +1,47 @@
+{
+    "settings": {
+        "index": {
+            "number_of_shards": "5",
+            "number_of_replicas": "1",
+            "analysis": {
+                "filter": {
+                    "mynGram": {
+                        "token_chars": [
+                            "letter",
+                            "digit",
+                            "whitespace",
+                            "punctuation",
+                            "symbol"
+                        ],
+                        "min_gram": "1",
+                        "type": "ngram",
+                        "max_gram": "20"
+                    }
+                },
+                "analyzer": {
+                    "cs_index_analyzer": {
+                        "filter": [
+                            "lowercase",
+                            "mynGram"
+                        ],
+                        "type": "custom",
+                        "tokenizer": "standard"
+                    },
+                    "keylower": {
+                        "filter": "lowercase",
+                        "type": "custom",
+                        "tokenizer": "keyword"
+                    },
+                    "cs_search_analyzer": {
+                        "filter": [
+                            "lowercase",
+                            "standard"
+                        ],
+                        "type": "custom",
+                        "tokenizer": "standard"
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ansible/roles/es-mapping/files/mappings/cert-templates-mapping.json b/ansible/roles/es-mapping/files/mappings/cert-templates-mapping.json
new file mode 100644
index 0000000000000000000000000000000000000000..e8af59a9b7d2b523724290a40701f4c6fea10578
--- /dev/null
+++ b/ansible/roles/es-mapping/files/mappings/cert-templates-mapping.json
@@ -0,0 +1,177 @@
+{
+    "settings": {
+        "index": {
+            "number_of_shards": "5",
+            "number_of_replicas": "1",
+            "analysis": {
+                "filter": {
+                    "mynGram": {
+                        "token_chars": [
+                            "letter",
+                            "digit",
+                            "whitespace",
+                            "punctuation",
+                            "symbol"
+                        ],
+                        "min_gram": "1",
+                        "type": "ngram",
+                        "max_gram": "20"
+                    }
+                },
+                "analyzer": {
+                    "cs_index_analyzer": {
+                        "filter": [
+                            "lowercase",
+                            "mynGram"
+                        ],
+                        "type": "custom",
+                        "tokenizer": "standard"
+                    },
+                    "keylower": {
+                        "filter": "lowercase",
+                        "type": "custom",
+                        "tokenizer": "keyword"
+                    },
+                    "cs_search_analyzer": {
+                        "filter": [
+                            "lowercase",
+                            "standard"
+                        ],
+                        "type": "custom",
+                        "tokenizer": "standard"
+                    }
+                }
+            }
+        }
+    },
+    "mappings": {
+        "_doc": {
+            "dynamic": false,
+            "properties": {
+                "all_fields": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower"
+                        }
+                    },
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer"
+                },
+                "identifier": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "name": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "template": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "params": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "createdBy": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "updatedBy": {
+                    "type": "text",
+                    "fields": {
+                        "raw": {
+                            "type": "text",
+                            "analyzer": "keylower",
+                            "fielddata": true
+                        }
+                    },
+                    "copy_to": [
+                        "all_fields"
+                    ],
+                    "analyzer": "cs_index_analyzer",
+                    "search_analyzer": "cs_search_analyzer",
+                    "fielddata": true
+                },
+                "createdOn": {
+                    "type": "date",
+                    "fields": {
+                        "raw": {
+                            "type": "date"
+                        }
+                    }
+                },
+                "updatedOn": {
+                    "type": "date",
+                    "fields": {
+                        "raw": {
+                            "type": "date"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env b/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
index 4f8b5dffbe1dbb195365fddaf61d376b6f1f0445..775fbdf0cf55689f05df9870efb7e9d1452ab93d 100644
--- a/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
+++ b/ansible/roles/stack-sunbird/templates/sunbird_cert-service.env
@@ -4,4 +4,5 @@ AZURE_STORAGE_SECRET={{sunbird_azure_storage_key}}
 AZURE_STORAGE_KEY={{sunbird_azure_storage_account}}
 sunbird_cert_domain_url={{proto}}://{{proxy_server_name}}
 sunbird_cert_enc_service_url=http://enc-service:8013
-download_link_expiry_timeout=600
\ No newline at end of file
+download_link_expiry_timeout=600
+es_conn_info={{sunbird_es_host}}:{{sunbird_es_port}}
\ No newline at end of file