diff --git a/.gitmodules b/.gitmodules
index 88ef029..6caf1a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "roles/ericomeehan.mastodon"]
 	path = roles/ericomeehan.mastodon
 	url = git@gitea.eom.dev:DevOps/ansible-role-mastodon.git
+[submodule "roles/ericomeehan.vintage-story"]
+	path = roles/ericomeehan.vintage-story
+	url = git@gitea.eom.dev:Gaming/ansible-role-vintage-story.git
diff --git a/matrix-stack.yaml b/matrix-stack.yaml
new file mode 100644
index 0000000..baa622e
--- /dev/null
+++ b/matrix-stack.yaml
@@ -0,0 +1,9 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.matrix-stack
+      vars:
+        server_name: eom.dev
diff --git a/roles/ericomeehan.eom b/roles/ericomeehan.eom
index 5aac0ef..bc7fb3e 160000
--- a/roles/ericomeehan.eom
+++ b/roles/ericomeehan.eom
@@ -1 +1 @@
-Subproject commit 5aac0ef5a9baa8a5fa0a5efdfa364bd4ea5ecfde
+Subproject commit bc7fb3eaf372827152e628e39d1aa13726a9319f
diff --git a/roles/ericomeehan.luanti b/roles/ericomeehan.luanti
index f662cf4..5651381 160000
--- a/roles/ericomeehan.luanti
+++ b/roles/ericomeehan.luanti
@@ -1 +1 @@
-Subproject commit f662cf422df6ea1313760c3da6252f776b700938
+Subproject commit 56513813163181a7d0c2f0515c78e4b597be8898
diff --git a/roles/ericomeehan.mastodon b/roles/ericomeehan.mastodon
index 5de5270..a90d356 160000
--- a/roles/ericomeehan.mastodon
+++ b/roles/ericomeehan.mastodon
@@ -1 +1 @@
-Subproject commit 5de5270b7346a6b4a3c69fbea3aa56116f158547
+Subproject commit a90d356275a2d2b73f9ccfe309fe8c0da533eff6
diff --git a/roles/ericomeehan.vintage-story b/roles/ericomeehan.vintage-story
new file mode 160000
index 0000000..4fa1d9e
--- /dev/null
+++ b/roles/ericomeehan.vintage-story
@@ -0,0 +1 @@
+Subproject commit 4fa1d9e2d447319a098a7d8cf8a799c20b73d6f6
diff --git a/test.yaml b/test.yaml
index ac66d2e..7166056 100644
--- a/test.yaml
+++ b/test.yaml
@@ -4,4 +4,4 @@
   vars_files:
     - ../secrets.yaml
   roles:
-    - role: ericomeehan.mastodon
+    - role: ericomeehan.eom
diff --git a/vintage-story.yaml b/vintage-story.yaml
new file mode 100644
index 0000000..d9c0d56
--- /dev/null
+++ b/vintage-story.yaml
@@ -0,0 +1,29 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.vintage-story
+      vars:
+        ServerName: "Vintage Story Server on eom.dev"
+        ServerUrl: vintage-story.eom.dev
+        ServerDescription: "A Vintage Story survival server hosted by eom.dev.<br>Join our community on the public <a href='https://discourse.eom.dev/c/gaming/vintage-story/63'>Discourse</a> forum and <a href='https://matrix.to/#/#vintage-story:eom.dev/'>Matrix</a> chat.<br>Also join us for live streams from <a href='https://owncast.eom.dev/'>Owncast</a> on eom.dev."
+        WelcomeMessage: "Welcome to Vintage Story on eom.dev, {0}. May you survive well and prosper.\\nPlease join our external discussions on Discourse and Matrix.\\nhttps://discourse.eom.dev/\\nhttps://matrix.to/#/#vintage-story:eom.dev/"
+        AdvertiseServer: true
+        Password: "{{ vintage_story_server_password }}"
+        WorldConfig:
+          Seed: null
+          SaveFileLocation: /gamedata/vs/Saves/season_i.vcdbs
+          WorldName: Season I
+          AllowCreativeMode: true
+          PlayStyle: surviveandbuild
+          PlayStyleLangCode: surviveandbuild-bands
+          WorldType: standard
+          WorldConfiguration: null
+          MapSizeY: null
+          CreatedByPlayerName: TopHatRick
+          DisabledMods: null
+          RepairMode: false
+        OnlyWhitelisted: true
+        StartupCommands: "/whitelist add 3wm/diYjPGuydHNvOd6H0fDy \\n /op TopHatRick"