diff --git a/config.ini b/config.ini
index c3def07..35fd99c 100644
--- a/config.ini
+++ b/config.ini
@@ -10,9 +10,9 @@ os_pretty_name = Fedora IoT
 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/
+release     = f36
+ref         = %(os_name)s/stable/%(arch)s/%(tree_name)s
+yum_baseurl = http://dl.fedoraproject.org/pub/fedora/linux/development/36/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-35.repo b/fedora-36.repo
similarity index 61%
rename from fedora-35.repo
rename to fedora-36.repo
index 901cd0a..51639ff 100644
--- a/fedora-35.repo
+++ b/fedora-36.repo
@@ -1,12 +1,12 @@
-[fedora-35]
-name=Fedora 35 - $basearch
+[fedora-36]
+name=Fedora 36 - $basearch
 failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/35/Everything/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-35&arch=$basearch
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/36/Everything/$basearch/os/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-36&arch=$basearch
 enabled=1
 #metadata_expire=7d
 repo_gpgcheck=0
 type=rpm
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-35-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-36-$basearch
 skip_if_unavailable=False
diff --git a/fedora-iot-base.json b/fedora-iot-base.json
index c7675bc..4055655 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": [],
@@ -10,8 +10,8 @@
 
     "documentation": false,
 
-    "automatic_version_prefix": "35",
-    "mutate-os-release": "35",
+    "automatic_version_prefix": "36",
+    "mutate-os-release": "36",
 
     "initramfs-args": ["--no-hostonly",
                        "--add", "ignition watchdog"],
@@ -73,60 +73,60 @@
     "packages": ["fedora-release-iot",
          "glibc", "glibc-minimal-langpack", "nss-altfiles",
          "sssd-client", "libsss_sudo", "shadow-utils",
-         "kernel",
+         "kernel", "linux-firmware",
          "dracut-config-generic", "dracut-network",
-         "rpm-ostree", "polkit", "lvm2",
+         "rpm-ostree", "rpm", "polkit", "lvm2",
          "cryptsetup", "pinentry",
          "keyutils", "cracklib-dicts",
-         "e2fsprogs", "xfsprogs", "dosfstools",
-         "gnupg2",
+         "e2fsprogs", "dosfstools",
+         "gnupg2", "authselect",
          "basesystem", "python3", "bash",
          "xz", "gzip",
-         "coreutils", "which", "curl",
+         "coreutils", "which", "curl", "attr",
          "firewalld", "iptables",
          "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan",
          "wpa_supplicant", "wireless-regdb", "iwd", "tpm2-pkcs11",
          "dnsmasq", "traceroute",
          "hostname", "iproute", "iputils",
          "openssh-clients", "openssh-server", "passwd",
-         "policycoreutils", "procps-ng", "rootfiles", "rpm",
+         "policycoreutils", "procps-ng", "rootfiles",
          "selinux-policy-targeted", "setup", "shadow-utils",
          "sudo", "util-linux", "vim-minimal",
          "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",
          "ima-evm-utils", "openssl",
          "bash-completion",
          "tmux", "screen",
          "policycoreutils-python-utils",
          "setools-console", "usbguard",
-         "audit", "rng-tools", "chrony",
+         "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",
 
-    "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service",
+    "units": ["NetworkManager.service", "firewalld.service", "sshd.service",
               "zezere_ignition.timer", "zezere_ignition_banner.service",
               "greenboot-grub2-set-counter.service", "greenboot-grub2-set-success.service", "greenboot-healthcheck.service", 
               "greenboot-rpm-ostree-grub2-check-fallback.service", "greenboot-status.service", "greenboot-task-runner.service",
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..2e90508 100644
--- a/fedora-iot.json
+++ b/fedora-iot.json
@@ -1,6 +1,6 @@
 {
-    "ref": "fedora/rawhide/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
-    "repos": ["fedora-35"],
+    "repos": ["fedora-36"],
     "include": "fedora-iot-base.json"
 }