diff --git a/config.ini b/config.ini
index 3a0c11e..c89c292 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     = f30
-ref         = %(os_name)s/devel/%(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/30/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 de35d47..4f36899 100644
--- a/fedora-iot-base.json
+++ b/fedora-iot-base.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/devel/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
 
     "repos": [],
@@ -74,10 +74,10 @@
          "sssd-client", "libsss_sudo",
          "dracut-config-generic", "kernel",
          "dracut-network",
-         "rpm-ostree", "lvm2",
+         "rpm-ostree", "polkit", "lvm2",
          "chrony", "zram",
          "cryptsetup", "pinentry",
-         "authconfig",
+         "authconfig", "keyutils",
          "e2fsprogs",
          "gnupg2",
          "basesystem",
@@ -97,10 +97,10 @@
          "sudo", "systemd", "util-linux", "vim-minimal",
          "less", "tar",
 	 "fwupd", "usbguard",
-         "greenboot", "greenboot-grub2", "greenboot-ostree-grub2", "greenboot-reboot",
+         "greenboot", "greenboot-grub2", "greenboot-rpm-ostree-grub2", "greenboot-reboot", "greenboot-status",
          "initial-setup",
          "cloud-utils-growpart",
-         "rsync", "atomic-devmode",
+         "rsync",
          "bash-completion",
          "tmux", "screen",
          "policycoreutils-python-utils",
@@ -108,19 +108,21 @@
          "audit", "rng-tools",
          "bluez", "bluez-libs", "wpan-tools",
          "kernel-tools", "libgpiod-utils",
-         "podman", "criu",
+         "podman", "container-selinux", "skopeo", "criu",
+	 "slirp4netns",
          "clevis", "clevis-dracut", "clevis-luks",
          "attr"],
 
-    "packages-aarch64": ["grub2-efi-aa64", "ostree-grub2", "efibootmgr", "shim-aa64",
+    "packages-aarch64": ["grub2-efi-aa64", "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",
+    "packages-armhfp": ["grub2-efi-arm", "efibootmgr",
                         "uboot-tools", "uboot-images-armv7", "bcm283x-firmware",
                         "arm-image-installer"],
 
-    "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", "efibootmgr", "shim-x64",
+    "packages-x86_64": ["grub2", "grub2-efi-x64", "efibootmgr", "shim-x64",
                         "fwupdate", "fwupdate-efi", "microcode_ctl",
                         "iwl1000-firmware", "iwl100-firmware", "iwl105-firmware", "iwl135-firmware",
                         "iwl2000-firmware", "iwl2030-firmware", "iwl3160-firmware", "iwl5000-firmware",
@@ -128,5 +130,5 @@
 
     "default_target": "multi-user.target",
 
-    "units": ["NetworkManager.service", "sshd.service", "rngd.service", "zram-swap.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 1bacd21..4cd2d57 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 d0b3866..5d008fe 100644
--- a/fedora-iot-updates-testing.json
+++ b/fedora-iot-updates-testing.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/devel/${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 c2fd98b..73cf756 100644
--- a/fedora-iot.json
+++ b/fedora-iot.json
@@ -1,5 +1,5 @@
 {
-    "ref": "fedora/devel/${basearch}/iot",
+    "ref": "fedora/stable/${basearch}/iot",
     "ex-jigdo-spec": "fedora-iot.spec",
     "repos": ["fedora-30"],
     "include": "fedora-iot-base.json"