diff --git a/index.md b/index.md
index 9e12884..07faf73 100644
--- a/index.md
+++ b/index.md
@@ -5,9 +5,12 @@ they are worked on. You can also get real-time updates of service outages
 on our [Slack channel](https://join.slack.com/t/foundriesio/shared_invite/enQtNTc5NDkxNTI5NTExLWQ1Yjc3NDA2MjI3NzA3YzkxYjEzNzlhZjQ0M2QxYTIzYmIzZjlmOThmZGU0NTk5MWEwZGIwMTU2YWE4N2I5NWQ).
 
 ### Upcoming Events:
- * [CI worker network maintenance](2020-02-13-online-net)
+ * [Compute cluster upgrade](maintenance/2020-09-22-infra-compute-upgrade)
+
+### Past Events:
+ * [CI worker network maintenance](maintenance/2020-02-13-online-net)
 
 ### Previous Outages:
 
- * [2020-02-18 hub.foundries.io disruption](2020-02-18-hub-fio.md)
- * [2019-11-14 hub.foundries.io outage](2019-11-14-hub-fio)
+ * [2020-02-18 hub.foundries.io disruption](outage/2020-02-18-hub-fio)
+ * [2019-11-14 hub.foundries.io outage](outage/2019-11-14-hub-fio)
diff --git a/2020-02-13-online-net.md b/maintenance/2020-02-13-online-net.md
similarity index 100%
rename from 2020-02-13-online-net.md
rename to maintenance/2020-02-13-online-net.md
diff --git a/maintenance/2020-09-22-infra-compute-upgrade.md b/maintenance/2020-09-22-infra-compute-upgrade.md
new file mode 100644
index 0000000..801dce1
--- /dev/null
+++ b/maintenance/2020-09-22-infra-compute-upgrade.md
@@ -0,0 +1,5 @@
+## Compute cluster upgrade
+
+On Tue, 2020-09-22, compute cluster will be upgraded.
+During the maintenance, our infrastructure team will upgrade only control-plane components.
+Performance of some [foundries.io](https://foundries.io/foundries.io) services might be impacted, but service interruption is not expected.
diff --git a/2019-11-14-hub-fio.md b/outage/2019-11-14-hub-fio.md
similarity index 100%
rename from 2019-11-14-hub-fio.md
rename to outage/2019-11-14-hub-fio.md
diff --git a/2020-02-18-hub-fio.md b/outage/2020-02-18-hub-fio.md
similarity index 100%
rename from 2020-02-18-hub-fio.md
rename to outage/2020-02-18-hub-fio.md