diff --git a/config.ini b/config.ini
index bcf221a..f3d1fe8 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     = f29
-ref         = %(os_name)s/%(release)s/%(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 = http://dl.fedoraproject.org/pub/fedora/linux//development/29/%(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 e75f6f3..b4f5325 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -1,11 +1,13 @@
 {
-    "ref": "fedora/29/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
 
     "repos": [],
 
     "selinux": true,
 
+    "recommends": false,
+
     "documentation": false,
 
     "automatic_version_prefix": "29",
@@ -67,27 +69,27 @@
     "check-passwd": { "type": "file", "filename": "passwd" },
     "check-groups": { "type": "file", "filename": "group" },
 
-    "packages": ["atomic",
-         "fedora-release",
+    "packages": ["fedora-release-iot",
          "glibc", "nss-altfiles", "shadow-utils",
          "sssd-client", "libsss_sudo",
          "dracut-config-generic", "kernel",
          "dracut-network",
-         "rpm-ostree", "lvm2",
+         "rpm-ostree", "polkit", "lvm2",
          "chrony", "zram",
-         "cryptsetup",
-         "authconfig",
+         "cryptsetup", "pinentry",
+         "authconfig", "keyutils",
          "e2fsprogs",
          "gnupg2",
          "basesystem",
          "python3",
          "bash",
          "xz", "gzip",
+         "usbguard",
          "coreutils",
          "which",
          "curl",
          "iptables-services", "iptables", "firewalld",
-         "NetworkManager", "NetworkManager-wifi",
+         "NetworkManager", "NetworkManager-wifi", "NetworkManager-wwan",
          "dnsmasq", "traceroute",
          "hostname", "iproute", "iputils",
          "openssh-clients", "openssh-server", "passwd",
@@ -106,23 +108,27 @@
          "audit", "rng-tools",
          "bluez", "bluez-libs", "wpan-tools",
          "kernel-tools", "libgpiod-utils",
-         "podman",
+         "podman", "container-selinux", "skopeo", "criu",
+	 "slirp4netns",
+         "clevis", "clevis-dracut", "clevis-luks",
          "attr"],
 
-    "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2",
-                         "efibootmgr", "shim-aa64", "atomic-devmode",
+    "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", "efibootmgr", "shim-aa64",
                          "uboot-tools", "uboot-images-armv8", "bcm283x-firmware",
-                         "fwupdate", "fwupdate-efi", "arm-image-installer"],
+                         "fwupdate", "fwupdate-efi", "arm-image-installer",
+                         "iwl7260-firmware"],
 
-    "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr", "atomic-devmode",
-                        "uboot-tools", "uboot-images-armv7", "bcm283x-firmware"],
+    "packages-armhfp": ["grub2-efi-arm", "ostree-grub2", "efibootmgr",
+                        "uboot-tools", "uboot-images-armv7", "bcm283x-firmware",
                         "arm-image-installer"],
 
-    "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2",
-                        "efibootmgr", "shim-x64", "atomic-devmode",
-                        "fwupdate", "fwupdate-efi", "microcode_ctl"],
+    "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", "efibootmgr", "shim-x64",
+                        "fwupdate", "fwupdate-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"],
 
     "default_target": "multi-user.target",
 
-    "units": ["initial-setup.service"]
+    "units": ["NetworkManager.service", "firewalld.service", "rngd.service", "sshd.service", "zram-swap.service"]
 }
diff --git a/fedora-iot-updates-stable.json b/fedora-iot-updates-stable.json
index c954c21..aeb0024 100644
--- a/fedora-iot-updates-stable.json
+++ b/fedora-iot-updates-stable.json
@@ -1,5 +1,5 @@
 
-    "ref": "fedora/29/${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 6e49a20..5d008fe 100644
--- a/fedora-iot-updates-testing.json
+++ b/fedora-iot-updates-testing.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/29/${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 2ce09e3..63d3e32 100644
--- a/fedora-iot.json
+++ b/fedora-iot.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/29/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "repos": ["fedora-29"],
     "include": "fedora-iot-base.json"