diff --git a/config.ini b/config.ini
index 45ff24a..f4c2eda 100644
--- a/config.ini
+++ b/config.ini
@@ -11,8 +11,8 @@ tree_name   = docker-host
 tree_file   = %(os_name)s-%(tree_name)s.json
 arch        = x86_64
 release     = f31
-ref         = %(os_name)s/rawhide/%(arch)s/%(tree_name)s
-yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux//development/rawhide/%(arch)s/os/
+ref         = %(os_name)s/stable/%(arch)s/%(tree_name)s
+yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/31/Everything/%(arch)s/os/
 # lorax_additional_repos = http://127.0.0.1/fedora-iot/local-overrides
 lorax_include_packages = fedora-productimg-iot
 docker_os_name = fedora
diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index bf5ca32..36d0350 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/rawhide/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
 
     "repos": [],
@@ -77,8 +77,8 @@
          "rpm-ostree", "polkit", "lvm2",
          "chrony", "zram",
          "cryptsetup", "pinentry",
-         "authconfig", "keyutils",
-         "e2fsprogs",
+         "keyutils",
+         "e2fsprogs", "xfsprogs", "dosfstools",
          "gnupg2",
          "basesystem",
          "python3",
@@ -89,6 +89,7 @@
          "curl",
          "firewalld", "iptables",
          "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan",
+         "wpa_supplicant", "iwd",
          "dnsmasq", "traceroute",
          "hostname", "iproute", "iputils",
          "openssh-clients", "openssh-server", "passwd",
@@ -106,7 +107,7 @@
          "policycoreutils-python-utils",
          "setools-console",
          "audit", "rng-tools",
-         "bluez", "bluez-libs", "wpan-tools",
+         "bluez", "bluez-libs", "bluez-mesh", "wpan-tools",
          "kernel-tools", "libgpiod-utils",
          "podman", "container-selinux", "skopeo", "criu",
 	 "slirp4netns",
@@ -115,15 +116,13 @@
 
     "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64",
                          "uboot-tools", "uboot-images-armv8", "bcm283x-firmware",
-                         "fwupdate", "fwupdate-efi", "arm-image-installer",
-                         "iwl7260-firmware"],
+                         "arm-image-installer", "iwl7260-firmware"],
 
     "packages-armhfp": ["grub2-efi-arm", "efibootmgr",
                         "uboot-tools", "uboot-images-armv7", "bcm283x-firmware",
                         "arm-image-installer"],
 
-    "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64",
-                        "fwupdate", "fwupdate-efi", "microcode_ctl",
+    "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "microcode_ctl",
                         "iwl1000-firmware", "iwl100-firmware", "iwl105-firmware", "iwl135-firmware",
                         "iwl2000-firmware", "iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware",
                         "iwl5150-firmware", "iwl6000-firmware", "iwl6050-firmware", "iwl7260-firmware"],
diff --git a/fedora-iot-rawhide.tdl b/fedora-iot-rawhide.tdl
index 8ad38cb..9d4056b 100644
--- a/fedora-iot-rawhide.tdl
+++ b/fedora-iot-rawhide.tdl
@@ -1,5 +1,5 @@
 <template>
-    <name>rawhide</name>
+    <name>branched</name>
     <os>
         <name>Fedora</name>
         <version>20</version>
diff --git a/fedora-iot-updates-stable.json b/fedora-iot-updates-stable.json
index 1bacd21..aeb0024 100644
--- a/fedora-iot-updates-stable.json
+++ b/fedora-iot-updates-stable.json
@@ -1,5 +1,5 @@
 
-    "ref": "fedora/devel/${basearch}/updates/iot",
+    "ref": "fedora/stable/${basearch}/updates/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "include": "fedora-iot-base.json"
 }
diff --git a/fedora-iot-updates-testing.json b/fedora-iot-updates-testing.json
index 96b50ac..5d008fe 100644
--- a/fedora-iot-updates-testing.json
+++ b/fedora-iot-updates-testing.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/rawhide/${basearch}/testing/iot",
+    "ref": "fedora/stable/${basearch}/testing/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "include": "fedora-iot-base.json"
 }
diff --git a/fedora-iot.json b/fedora-iot.json
index d9f8e40..8370f3d 100644
--- a/fedora-iot.json
+++ b/fedora-iot.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/rawhide/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "repos": ["fedora-31"],
     "include": "fedora-iot-base.json"