diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 6796f5b2..6f9dfaf3 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -5,7 +5,7 @@
 ### Environment
 
 * Platform: aws, azure, bare-metal, google-cloud, digital-ocean
-* OS: container-linux, flatcar-linux
+* OS: fedora-coreos, flatcar-linux
 * Release: Typhoon version or Git SHA (reporting latest is **not** helpful)
 * Terraform: `terraform version` (reporting latest is **not** helpful)
 * Plugins: Provider plugin versions (reporting latest is **not** helpful)
diff --git a/README.md b/README.md
index 9cb9f908..4a7d67d3 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,8 @@ Typhoon is available for [Flatcar Container Linux](https://www.flatcar-linux.org
 
 * [Docs](https://typhoon.psdn.io)
 * Architecture [concepts](https://typhoon.psdn.io/architecture/concepts/) and [operating systems](https://typhoon.psdn.io/architecture/operating-systems/)
-* Tutorials for [AWS](docs/cl/aws.md), [Azure](docs/cl/azure.md), [Bare-Metal](docs/cl/bare-metal.md), [Digital Ocean](docs/cl/digital-ocean.md), and [Google-Cloud](docs/cl/google-cloud.md)
+* Fedora CoreOS tutorials for [AWS](docs/fedora-coreos/aws.md), [Bare-Metal](docs/fedora-coreos/bare-metal.md), and [Google Cloud](docs/fedora-coreos/google-cloud.md)
+* Flatcar Linux tutorials for [AWS](docs/cl/aws.md), [Azure](docs/cl/azure.md), [Bare-Metal](docs/cl/bare-metal.md), [DigitalOcean](docs/cl/digital-ocean.md), and [Google Cloud](docs/cl/google-cloud.md)
 
 ## Usage
 
diff --git a/docs/architecture/operating-systems.md b/docs/architecture/operating-systems.md
index 50f30a6d..276aff1c 100644
--- a/docs/architecture/operating-systems.md
+++ b/docs/architecture/operating-systems.md
@@ -1,6 +1,6 @@
 # Operating Systems
 
-Typhoon supports [Container Linux](https://coreos.com/why/), [Flatcar Linux](https://www.flatcar-linux.org/) and [Fedora CoreOS](https://getfedora.org/coreos/) (preview). These operating systems were chosen because they offer:
+Typhoon supports [Fedora CoreOS](https://getfedora.org/coreos/), [Flatcar Linux](https://www.flatcar-linux.org/) and Container Linux (EOL in May 2020). These operating systems were chosen because they offer:
 
 * Minimalism and focus on clustered operation
 * Automated and atomic operating system upgrades
@@ -9,16 +9,18 @@ Typhoon supports [Container Linux](https://coreos.com/why/), [Flatcar Linux](htt
 
 Together, they diversify Typhoon to support a range of container technologies.
 
-* Container Linux: Gentoo core, rkt-fly, docker
 * Fedora CoreOS: rpm-ostree, podman, moby
+* Flatcar Linux: Gentoo core, rkt-fly, docker
 
 ## Host Properties
 
-| Property          | Container Linux / Flatcar Linux | Fedora CoreOS |
+| Property          | Flatcar Linux | Fedora CoreOS |
 |-------------------|---------------------------------|---------------|
+| Kernel            | ~4.19.x | ~5.5.x |
+| systemd           | 241 | 243 |
 | Ignition system   | Ignition v2.x spec | Ignition v3.x spec |
-| Container Engine  | docker    | docker |
-| storage driver    | overlay2  | overlay2 |
+| Container Engine  | docker 18.06.3-ce  | docker 18.09.8 |
+| storage driver    | overlay2 (extfs)  | overlay2 (xfs) |
 | logging driver    | json-file | journald |
 | cgroup driver     | cgroupfs (except Flatcar edge) | systemd  |
 | Networking        | systemd-networkd | NetworkManager |
@@ -26,7 +28,7 @@ Together, they diversify Typhoon to support a range of container technologies.
 
 ## Kubernetes Properties
 
-| Property          | Container Linux | Fedora CoreOS |
+| Property          | Flatcar Linux | Fedora CoreOS |
 |-------------------|-----------------|---------------|
 | single-master     | all platforms | all platforms |
 | multi-master      | all platforms | all platforms |
diff --git a/docs/index.md b/docs/index.md
index 3da5d32d..c59dcf86 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -50,7 +50,8 @@ Typhoon is available for [Flatcar Container Linux](https://www.flatcar-linux.org
 ## Documentation
 
 * Architecture [concepts](architecture/concepts.md) and [operating-systems](architecture/operating-systems.md)
-* Tutorials for [AWS](cl/aws.md), [Azure](cl/azure.md), [Bare-Metal](cl/bare-metal.md), [Digital Ocean](cl/digital-ocean.md), and [Google-Cloud](cl/google-cloud.md)
+* Fedora CoreOS tutorials for [AWS](fedora-coreos/aws.md), [Bare-Metal](fedora-coreos/bare-metal.md), and [Google Cloud](fedora-coreos/google-cloud.md)
+* Flatcar Linux tutorials for [AWS](cl/aws.md), [Azure](cl/azure.md), [Bare-Metal](cl/bare-metal.md), [DigitalOcean](cl/digital-ocean.md), and [Google Cloud](cl/google-cloud.md)
 
 ## Example
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 45d35c0c..ae9f3fcb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -53,16 +53,16 @@ nav:
     - 'Bare-Metal': 'architecture/bare-metal.md'
     - 'DigitalOcean': 'architecture/digitalocean.md'
     - 'Google Cloud': 'architecture/google-cloud.md'
+  - 'Fedora CoreOS':
+    - 'AWS': 'fedora-coreos/aws.md'
+    - 'Bare-Metal': 'fedora-coreos/bare-metal.md'
+    - 'Google Cloud': 'fedora-coreos/google-cloud.md'
   - 'Container Linux':
     - 'AWS': 'cl/aws.md'
     - 'Azure': 'cl/azure.md'
     - 'Bare-Metal': 'cl/bare-metal.md'
     - 'Digital Ocean': 'cl/digital-ocean.md'
     - 'Google Cloud': 'cl/google-cloud.md'
-  - 'Fedora CoreOS':
-    - 'AWS': 'fedora-coreos/aws.md'
-    - 'Bare-Metal': 'fedora-coreos/bare-metal.md'
-    - 'Google Cloud': 'fedora-coreos/google-cloud.md'
   - 'Topics':
     - 'Maintenance': 'topics/maintenance.md'
     - 'Hardware': 'topics/hardware.md'