diff --git a/docs/federation/resolutions/drafts/018.md b/docs/federation/resolutions/drafts/018.md
deleted file mode 100644
index 82cfc87..0000000
--- a/docs/federation/resolutions/drafts/018.md
+++ /dev/null
@@ -1,19 +0,0 @@
----
-title: "Resolution 18: EOTL joins the Co-op Cloud Federation - 10-02-2024"
----
-
-- Deadline: 28-02-2024
-- Size: Large
-
-### Summary
-
-[EOTL](https://codeberg.org/eotl)
-
-[@basebuilder](https://git.coopcloud.tech/basebuilder) has been active in contributions
-to the Co-op Cloud documentation and some Abra use and testing.
-
-EOTL is working to manage their multi-language stack with Co-op Cloud recipes ASAP.
-
-### Details
-
-EOTL is self-funded and volunteer based, they are able to pay the membership fees at this time.
diff --git a/docs/federation/resolutions/in-progress/018.md b/docs/federation/resolutions/in-progress/018.md
new file mode 100644
index 0000000..48cb0bd
--- /dev/null
+++ b/docs/federation/resolutions/in-progress/018.md
@@ -0,0 +1,19 @@
+---
+title: "Resolution 18"
+---
+
+- Topic: EOTL joins the Co-op Cloud Federation
+- Date: 12-03-24
+- Deadline: 26-03-2024
+- Size: Large
+
+### Summary
+
+> [EOTL](https://codeberg.org/eotl)
+
+[@basebuilder](https://git.coopcloud.tech/basebuilder) has been active in contributions
+to the Co-op Cloud documentation and Abra testing.
+
+### Details
+
+N/A.
diff --git a/docs/federation/resolutions/passed/017.md b/docs/federation/resolutions/passed/017.md
index e1a3003..fe818a6 100644
--- a/docs/federation/resolutions/passed/017.md
+++ b/docs/federation/resolutions/passed/017.md
@@ -9,7 +9,7 @@ title: "Resolution 017"
 
 ### Summary
 
-[BeWater Co-op](https://bewater.contact).
+> [BeWater Co-op](https://bewater.contact).
 
 `@decentral1se` is a member and has been active in Abra hacking & coordination
 on several issues. BeWater maintains several small-scale Co-op Cloud
diff --git a/mkdocs.yml b/mkdocs.yml
index 98b22d5..d1c6cbd 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -124,6 +124,7 @@ nav:
           - federation/resolutions/passed/017.md
         - "In Progress":
           - federation/resolutions/in-progress/013.md
+          - federation/resolutions/in-progress/018.md
       - "Minutes":
         - federation/minutes/index.md
         - "Recently":