diff --git a/.github/scripts/organization.yaml.j2 b/.github/scripts/organization.yaml.j2
index c808a5d..43bc3a3 100644
--- a/.github/scripts/organization.yaml.j2
+++ b/.github/scripts/organization.yaml.j2
@@ -13,8 +13,8 @@ dostawa:
   miasto: {{ organization.city }}
   telefon: {{ organization.phone_number }}
   email: {{ organization.email }}
-  kod_paczkomatu: {{ organization.package_box_code }}
-  dodatkowe_informacje: {{ organization.additional_info }}
+  kod_paczkomatu:{% if organization.package_box_code %} {{ organization.package_box_code }}{% endif %}
+  dodatkowe_informacje:{% if organization.additional_info %} {{ organization.additional_info }}{% endif %}
 
 produkty:
   - nazwa: Testowy produkt