diff --git a/roles/osbs-client/defaults/main.yml b/roles/osbs-client/defaults/main.yml
index 034abd4fe2..5882bae2b9 100644
--- a/roles/osbs-client/defaults/main.yml
+++ b/roles/osbs-client/defaults/main.yml
@@ -33,3 +33,6 @@ default:
   registry_api_versions: v2
   builder_openshift_url: https://172.17.0.1:8443/
   koji_certs_secret: false
+  use_kerberos: false
+  kerberos_keytab: ""
+  kerberos_principal: ""
diff --git a/roles/osbs-client/templates/osbs.conf.j2 b/roles/osbs-client/templates/osbs.conf.j2
index 1bdfa60c15..aea56762fc 100644
--- a/roles/osbs-client/templates/osbs.conf.j2
+++ b/roles/osbs-client/templates/osbs.conf.j2
@@ -4,22 +4,22 @@ build_json_dir = {{ general.build_json_dir }}
 openshift_required_version = {{ general.openshift_required_version }}
 
 [default]
-{% if default.username %}
+{% if default.username is defined %}
 username = {{ default.username }}
 {% endif %}
-{% if default.password %}
+{% if default.password is defined %}
 password = {{ default.password }}
 {% endif %}
-{% if default.koji_certs_secret %}
+{% if default.koji_certs_secret is defined %}
 koji_certs_secret = {{ default.koji_certs_secret }}
 {% endif %}
-{% if default.use_kerberos %}
+{% if default.use_kerberos is defined %}
 use_kerberos = {{ default.use_kerberos }}
 {% endif %}
-{% if default.kerberos_keytab %}
+{% if default.kerberos_keytab is defined %}
 kerberos_keytab = {{ default.kerberos_keytab }}
 {% endif %}
-{% if default.kerberos_principal %}
+{% if default.kerberos_principal is defined %}
 kerberos_principal = {{ default.kerberos_principal }}
 {% endif %}
 openshift_url = {{ default.openshift_url }}
@@ -41,22 +41,22 @@ builder_openshift_url = {{ default.builder_openshift_url }}
 
 [scratch]
 scratch = true
-{% if default.username %}
+{% if default.username is defined %}
 username = {{ default.username }}
 {% endif %}
-{% if default.password %}
+{% if default.password is defined %}
 password = {{ default.password }}
 {% endif %}
-{% if default.koji_certs_secret %}
+{% if default.koji_certs_secret is defined %}
 koji_certs_secret = {{ default.koji_certs_secret }}
 {% endif %}
-{% if default.use_kerberos %}
+{% if default.use_kerberos is defined %}
 use_kerberos = {{ default.use_kerberos }}
 {% endif %}
-{% if default.kerberos_keytab %}
+{% if default.kerberos_keytab is defined %}
 kerberos_keytab = {{ default.kerberos_keytab }}
 {% endif %}
-{% if default.kerberos_principal %}
+{% if default.kerberos_principal is defined %}
 kerberos_principal = {{ default.kerberos_principal }}
 {% endif %}
 openshift_url = {{ default.openshift_url }}