diff --git a/config.ini b/config.ini
index c3def07..f0c2e20 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     = f35
-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 = http://dl.fedoraproject.org/pub/fedora/linux/development/35/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 c7675bc..9e2cae2 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": [],
@@ -95,7 +95,7 @@
          "systemd", "systemd-resolved",
          "less", "tar",
 	 "fwupd", "fwupd-plugin-modem-manager",
-         "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status",
+         "greenboot", "greenboot-default-health-checks",
          "ignition", "zezere-ignition",
          "zram-generator", "zram-generator-defaults",
          "rsync", "attr",
@@ -104,25 +104,26 @@
          "tmux", "screen",
          "policycoreutils-python-utils",
          "setools-console", "usbguard",
-         "audit", "rng-tools", "chrony",
+         "rng-tools", "chrony",
          "bluez", "bluez-libs", "bluez-mesh",
          "kernel-tools", "libgpiod-utils",
-         "podman", "podman-plugins", "container-selinux", "skopeo", "criu", "slirp4netns",
+         "podman", "podman-plugins", "container-selinux", "skopeo", "criu",
+	 "containernetworking-plugins", "slirp4netns", "netavark", "aardvark-dns",
          "clevis", "clevis-dracut", "clevis-luks", "clevis-pin-tpm2",
          "parsec", "dbus-parsec"],
 
     "packages-aarch64": ["grub2-efi-aa64", "efibootmgr", "shim-aa64", "fwupd-efi",
-                         "uboot-tools", "uboot-images-armv8", "bcm283x-firmware",
-                         "arm-image-installer", "iwl7260-firmware"],
+                         "uboot-images-armv8", "bcm283x-firmware", "fwupd-plugin-uefi-capsule-data",
+                         "arm-image-installer", "iwl7260-firmware", "iwlax2xx-firmware"],
 
-    "packages-armhfp": ["grub2-efi-arm", "efibootmgr",
-                        "uboot-tools", "uboot-images-armv7", "bcm283x-firmware",
+    "packages-armhfp": ["grub2-efi-arm", "efibootmgr", "uboot-images-armv7", "bcm283x-firmware",
                         "arm-image-installer"],
 
     "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64", "fwupd-efi", "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", "fwupd-plugin-uefi-capsule-data"],
 
     "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 1b7ca7a..4ae8610 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-35"],
     "include": "fedora-iot-base.json"