diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl
index 78b6938..b83f099 100644
--- a/RFXtoRP_HsaCarrier_ActorCreated.ftl
+++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl
@@ -29,9 +29,9 @@
           "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}",
           "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}",
-          <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code) />
+          <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) />
           <#if isCountryCode>
-            "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}",
+            "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}",
           <#else>
             "CountryCode" : "",
           </#if>
diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl
index ecf4ad8..d6cee37 100644
--- a/RFXtoRP_HsaCons_ActorCreated.ftl
+++ b/RFXtoRP_HsaCons_ActorCreated.ftl
@@ -29,9 +29,9 @@
         "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}",
         "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}",
         "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}",
-        <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code) />
+        <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) />
          <#if isCountryCode>
-            "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}",
+            "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}",
           <#else>
             "CountryCode" : "",
           </#if>
diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl
index 7e7e5fd..9fc6f33 100644
--- a/RFXtoRP_HsaSup_ActorCreated.ftl
+++ b/RFXtoRP_HsaSup_ActorCreated.ftl
@@ -28,9 +28,9 @@
           "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}",
          "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}",
           "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}",
-          <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code) />
+          <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) />
           <#if isCountryCode>
-            "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}",
+            "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}",
           <#else>
             "CountryCode" : "",
           </#if>
diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl
index 5aea948..3111b38 100644
--- a/RFXtoRP_HsrDepot_ActorCreated.ftl
+++ b/RFXtoRP_HsrDepot_ActorCreated.ftl
@@ -28,9 +28,9 @@
           "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}",
           "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}",
           "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}",
-          <#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code) />
+          <#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code?upper_case) />
           <#if isCountryCode >
-            "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}",
+            "CountryCode" : "${depot.physical_depot_structured_address.country_code?upper_case?json_string}",
           <#else>
             "CountryCode" : "",
           </#if>