diff --git a/components/automate-backend-deployment/README.md b/components/automate-backend-deployment/README.md
index 9c0d0a5f5a2..89827302285 100644
--- a/components/automate-backend-deployment/README.md
+++ b/components/automate-backend-deployment/README.md
@@ -2,7 +2,7 @@
 
 This provides the `automate-backend-deployment` package.
 
-This package will build a package using terraform/a2ha-terraform, inspecs, test, certs and Makefile. 
+This package will build a package using terraform/a2ha-terraform, inspecs, test, certs and Makefile.
 
 This is the heart of the a2ha because this component will set up a workspace for a2ha and all the a2ha command will get available after installing this package.
 
diff --git a/terraform/a2ha-terraform/modules/automate/files/config.toml.erb b/terraform/a2ha-terraform/modules/automate/files/config.toml.erb
index 3e92a97391b..2e7ac7e50b0 100644
--- a/terraform/a2ha-terraform/modules/automate/files/config.toml.erb
+++ b/terraform/a2ha-terraform/modules/automate/files/config.toml.erb
@@ -32,7 +32,7 @@
         password = "<%= svc_configs[:opensearch]['opensearch_auth']['admin_password'] -%>"
     [global.v1.external.opensearch.ssl]
     <% if overrides[:opensearch_custom_certs_enabled] == true -%>
-      server_name = ""
+      server_name = "<%= cn(svc_configs[:opensearch]['tls']['ssl_cert']) -%>"
       root_cert = """<%= overrides[:opensearch_root_ca] -%>"""
     <% else %>
       server_name = "<%= cn(svc_configs[:opensearch]['tls']['ssl_cert']) -%>"