diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2
index 7db73e5843..1e76fd4839 100644
--- a/roles/osbs-client/templates/osbs.conf.j2
+++ b/roles/osbs-client/templates/osbs.conf.j2
@@ -73,7 +73,9 @@ use_auth = {{ default.use_auth }}
 builder_use_auth = {{ default.builder_use_auth }}
 distribution_scope = {{ default.distribution_scope }}
 registry_api_versions = {{ default.registry_api_versions }}
+{% if default.registry_secret_name %}
 registry_secret = {{ default.registry_secret_name }}
+{%  endif %}
 builder_openshift_url = {{ default.builder_openshift_url }}
 
 [scratch]
@@ -141,6 +143,8 @@ use_auth = {{ default.use_auth }}
 builder_use_auth = {{ default.builder_use_auth }}
 distribution_scope = {{ default.distribution_scope }}
 registry_api_versions = {{ default.registry_api_versions }}
+{% if default.registry_secret_name %}
 registry_secret = {{ default.registry_secret_name }}
+{%  endif %}
 builder_openshift_url = {{ default.builder_openshift_url }}
 unique_tag_only = true