diff --git a/debian/changelog b/debian/changelog
index bb3cb4a..1fc6f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ rpi-imager (1.7.3) unstable; urgency=medium
   * Fix ""Cannot send events to objects owned by a different thread" warning
   * Update Slovan/Korean language files
   * Allow selecting file names without extension
+  * Add new regulatory-domain parameter to cloud-init files
 
  -- Floris Bos <bos@je-eigen-domein.nl>  Sun, 31 Jul 2022 12:15:17 +0200
 
diff --git a/src/OptionsPopup.qml b/src/OptionsPopup.qml
index b637f9a..4b14e3b 100644
--- a/src/OptionsPopup.qml
+++ b/src/OptionsPopup.qml
@@ -711,6 +711,7 @@ Popup {
             cloudinitnetwork += "wifis:\n"
             cloudinitnetwork += "  renderer: networkd\n"
             cloudinitnetwork += "  wlan0:\n"
+            cloudinitnetwork += "    regulatory-domain: \""+fieldWifiCountry.editText+"\"\n"
             cloudinitnetwork += "    dhcp4: true\n"
             cloudinitnetwork += "    optional: true\n"
             cloudinitnetwork += "    access-points:\n"
@@ -720,9 +721,7 @@ Popup {
                 cloudinitnetwork += "        hidden: true\n"
             }
 
-            /* FIXME: setting wifi country code broken on Ubuntu
-               For unknown reasons udev does not trigger setregdomain automatically and as a result
-               our setting in /etc/default/crda is being ignored by Ubuntu. */
+            /* legacy */
             addCloudInitRun("sed -i 's/^\s*REGDOMAIN=\S*/REGDOMAIN="+fieldWifiCountry.editText+"/' /etc/default/crda || true")
         }
         if (chkLocale.checked) {