diff --git a/config.ini b/config.ini
index c437a00..7a758a0 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     = f34
-ref         = %(os_name)s/rawhide/%(arch)s/%(tree_name)s
-yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/%(arch)s/os/
+ref         = %(os_name)s/stable/%(arch)s/%(tree_name)s
+yum_baseurl = https://dl.fedoraproject.org/pub/fedora/linux/releases/34/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-34.repo b/fedora-34.repo
index 64b8944..0e54ff7 100644
--- a/fedora-34.repo
+++ b/fedora-34.repo
@@ -5,7 +5,7 @@ failovermethod=priority
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-34&arch=$basearch
 enabled=1
 #metadata_expire=7d
-repo_gpgcheck=1
+repo_gpgcheck=0
 type=rpm
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-34-$basearch
diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index db7f2e8..ec6b969 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": [],
@@ -14,7 +14,7 @@
     "mutate-os-release": "34",
 
     "initramfs-args": ["--no-hostonly",
-                       "--add", "ignition"],
+                       "--add", "ignition watchdog"],
     "boot_location": "new",
 
     "install-langs-comment": "Keep this in sync with treecompose-post.sh",
@@ -93,7 +93,7 @@
          "selinux-policy-targeted", "setup", "shadow-utils",
          "sudo", "systemd", "util-linux", "vim-minimal",
          "less", "tar",
-	 "fwupd", "usbguard",
+	 "fwupd", "fwupd-plugin-modem-manager", "usbguard",
          "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status",
          "ignition", "zezere-ignition",
          "zram-generator", "zram-generator-defaults",
@@ -113,7 +113,7 @@
 
     "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64",
                          "uboot-tools", "uboot-images-armv8", "bcm283x-firmware",
-                         "arm-image-installer", "iwl7260-firmware"],
+                         "arm-image-installer", "iwl7260-firmware", "iwlax2xx-firmware"],
 
     "packages-armhfp": ["grub2-efi-arm", "efibootmgr",
                         "uboot-tools", "uboot-images-armv7", "bcm283x-firmware",
@@ -122,7 +122,8 @@
     "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"],
+                        "iwl5150-firmware", "iwl6000-firmware", "iwl6050-firmware", "iwl7260-firmware",
+                        "iwlax2xx-firmware"],
 
     "default_target": "multi-user.target",
 
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 4f3cf35..9a2fc3e 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-34"],
     "include": "fedora-iot-base.json"