diff --git a/data/address-formats.json b/data/address-formats.json
index f5a7c08db..2ae32f39b 100644
--- a/data/address-formats.json
+++ b/data/address-formats.json
@@ -3,13 +3,17 @@
         "format": [["housenumber", "street"], ["city", "postcode"]]
     },
     {
-        "countryCodes": ["gb"],
+        "countryCodes": ["gb", "ie"],
         "format": [["housename"], ["housenumber", "street"], ["city", "postcode"]]
     },
     {
-        "countryCodes": ["at", "ch", "de"],
+        "countryCodes": ["ad", "at", "ba", "be", "ch", "cz", "de", "dk", "es", "fi", "gr", "hr", "is", "it", "li", "nl", "no", "pl", "pt", "se", "si", "sk", "sm", "va"],
         "format": [["street", "housenumber"], ["postcode", "city"]]
     },
+    {
+        "countryCodes": ["fr", "lu", "mo"],
+        "format": [["housenumber", "street"], ["postcode", "city"]]
+    },
     {
         "countryCodes": ["br"],
         "format": [["street"], ["housenumber", "suburb"], ["city", "postcode"]]