diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index 6a65e50..f0fcd1c 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -189,9 +189,9 @@ write_welcome_conf(){
     fi
     if ${geoip}; then
         echo 'geoip:' >> "$conf"
-        echo '    style:  "json"' >> "$conf"
-        echo '    url:    "https://geoip.kde.org/v1/calamares"' >> "$conf"
-        echo '    selector: "time_zone"' >> "$conf"
+        echo '    style:  "xml"' >> "$conf"
+        echo '    url:    "https://geoip.kde.org/v1/ubiquity"' >> "$conf"
+        echo '    selector: "CountryCode"' >> "$conf"
     fi
 }
 
@@ -264,9 +264,9 @@ write_locale_conf(){
     echo "localeGenPath: /etc/locale.gen" >> "$conf"
     if ${geoip}; then
         echo 'geoip:' >> "$conf"
-        echo '    style:  "json"' >> "$conf"
-        echo '    url:    "https://geoip.kde.org/v1/calamares"' >> "$conf"
-        echo '    selector: ""' >> "$conf"
+        echo '    style:  "xml"' >> "$conf"
+        echo '    url:    "https://geoip.kde.org/v1/ubiquity"' >> "$conf"
+        echo '    selector: "TimeZone"' >> "$conf"
     else
         echo "region: America" >> "$conf"
         echo "zone: New_York" >> "$conf"