diff --git a/docs/fedora-docker.ks b/docs/docker.ks
similarity index 85%
rename from docs/fedora-docker.ks
rename to docs/docker.ks
index 4dc5117c..413fa8ba 100644
--- a/docs/fedora-docker.ks
+++ b/docs/docker.ks
@@ -1,7 +1,8 @@
-# Minimal Disk Image
+# Minimal tar Image
 
 # Use network installation
-url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/"
+url --url="http://URL-TO-BASEOS"
+repo --name=appstream --baseurl="http://URL-TO-APPSTREAM/"
 
 # Root password
 rootpw --plaintext replace-this-pw
diff --git a/docs/fedora-atomic-pxe-live-novirt.ks b/docs/fedora-atomic-pxe-live-novirt.ks
deleted file mode 100644
index e0f27800..00000000
--- a/docs/fedora-atomic-pxe-live-novirt.ks
+++ /dev/null
@@ -1,28 +0,0 @@
-# Fedora Atomic PXE Live creation kickstart
-# Suitable for use with livemedia-creator --no-virt
-
-# Settings for unattended installation:
-lang en_US.UTF-8
-keyboard us
-timezone America/New_York
-clearpart --all --initlabel
-rootpw --plaintext atomic
-
-part / --fstype="ext4" --size=6000
-
-shutdown
-
-ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/ --ref=fedora-atomic/rawhide/x86_64/docker-host
-
-services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup
-
-# We copy content of separate /boot partition to root part when building live squashfs image,
-# and we don't want systemd to try to mount it when pxe booting
-%post
-cat /dev/null > /etc/fstab
-%end
-
-%post --erroronfail
-rm -f /etc/ostree/remotes.d/fedora-atomic.conf
-ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/'
-%end
diff --git a/docs/fedora-atomic-pxe-live.ks b/docs/fedora-atomic-pxe-live.ks
deleted file mode 100644
index c9cf5d11..00000000
--- a/docs/fedora-atomic-pxe-live.ks
+++ /dev/null
@@ -1,24 +0,0 @@
-# Settings for unattended installation:
-lang en_US.UTF-8
-keyboard us
-timezone America/New_York
-clearpart --all --initlabel
-rootpw --plaintext atomic
-
-# We are only able to install atomic with separate /boot partition currently
-part / --fstype="ext4" --size=6000
-part /boot --size=500 --fstype="ext4"
-
-shutdown
-
-# Using ostree repo included in installation iso. Respective ostreesetup command is included here.
-# The included kickstart file with the command is created during installation iso compose.
-%include /usr/share/anaconda/interactive-defaults.ks
-
-services --disabled=cloud-init,cloud-init-local,cloud-final,cloud-config,docker-storage-setup
-
-# We copy content of separate /boot partition to root part when building live squashfs image,
-# and we don't want systemd to try to mount it when pxe booting
-%post
-cat /dev/null > /etc/fstab
-%end
diff --git a/docs/fedora-livemedia.ks b/docs/livemedia.ks
similarity index 98%
rename from docs/fedora-livemedia.ks
rename to docs/livemedia.ks
index 65f8bbc5..0886f91f 100644
--- a/docs/fedora-livemedia.ks
+++ b/docs/livemedia.ks
@@ -10,7 +10,8 @@ timezone US/Eastern
 lang en_US.UTF-8
 # Firewall configuration
 firewall --enabled --service=mdns
-url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/"
+url --url="http://URL-TO-BASEOS"
+repo --name=appstream --baseurl="http://URL-TO-APPSTREAM/"
 # Network information
 network  --bootproto=dhcp --device=link --activate
 
@@ -367,24 +368,19 @@ EOF
 %end
 
 %packages
-@anaconda-tools
 @base-x
 @core
-@firefox
 @fonts
 @guest-desktop-agents
 @hardware-support
-@libreoffice
 @multimedia
 @networkmanager-submodules
-@printing
 @workstation-product
 gnome-terminal
 aajohan-comfortaa-fonts
-anaconda
-anaconda-live
 dracut-config-generic
 dracut-live
+system-logos
 glibc-all-langpacks
 kernel
 # Make sure that DNF doesn't pull in debug kernel to satisfy kmod() requires
diff --git a/docs/fedora-minimal.ks b/docs/minimal.ks
similarity index 91%
rename from docs/fedora-minimal.ks
rename to docs/minimal.ks
index ac8e13f3..a5adb976 100644
--- a/docs/fedora-minimal.ks
+++ b/docs/minimal.ks
@@ -4,7 +4,8 @@ sshpw --username=root --plaintext randOmStrinGhERE
 # Firewall configuration
 firewall --enabled
 # Use network installation
-url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/"
+url --url="http://URL-TO-BASEOS"
+repo --name=appstream --baseurl="http://URL-TO-APPSTREAM/"
 # Network information
 network  --bootproto=dhcp --device=link --activate
 
diff --git a/docs/fedora-minimized.ks b/docs/minimized.ks
similarity index 96%
rename from docs/fedora-minimized.ks
rename to docs/minimized.ks
index 9a533a29..79caf905 100644
--- a/docs/fedora-minimized.ks
+++ b/docs/minimized.ks
@@ -4,7 +4,8 @@ sshpw --username=root --plaintext randOmStrinGhERE
 # Firewall configuration
 firewall --enabled
 # Use network installation
-url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/"
+url --url="http://URL-TO-BASEOS"
+repo --name=appstream --baseurl="http://URL-TO-APPSTREAM/"
 # Network information
 network  --bootproto=dhcp --device=link --activate
 
diff --git a/docs/fedora-openstack.ks b/docs/openstack.ks
similarity index 89%
rename from docs/fedora-openstack.ks
rename to docs/openstack.ks
index 9f0a2d6e..8d975920 100644
--- a/docs/fedora-openstack.ks
+++ b/docs/openstack.ks
@@ -1,9 +1,10 @@
-# Minimal Disk Image
+# Minimal OpenStack Disk Image
 #
 # Firewall configuration
 firewall --enabled
 # Use network installation
-url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/"
+url --url="http://URL-TO-BASEOS"
+repo --name=appstream --baseurl="http://URL-TO-APPSTREAM/"
 
 # Root password
 rootpw --plaintext replace-this-pw
diff --git a/docs/fedora-vagrant.ks b/docs/vagrant.ks
similarity index 94%
rename from docs/fedora-vagrant.ks
rename to docs/vagrant.ks
index bc4acc49..266da7fd 100644
--- a/docs/fedora-vagrant.ks
+++ b/docs/vagrant.ks
@@ -4,7 +4,8 @@
 # Firewall configuration
 firewall --enabled
 # Use network installation
-url --url="http://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/"
+url --url="http://URL-TO-BASEOS"
+repo --name=appstream --baseurl="http://URL-TO-APPSTREAM/"
 # Network information
 network  --bootproto=dhcp --activate