diff --git a/.gitmodules b/.gitmodules
index e299100..21be809 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -88,3 +88,18 @@
 [submodule "roles/ericomeehan.nginx-rtmp"]
 	path = roles/ericomeehan.nginx-rtmp
 	url = git@gitea.eom.dev:DevOps/ansible-role-nginx-rtmp.git
+[submodule "roles/ericomeehan.mediawiki"]
+	path = roles/ericomeehan.mediawiki
+	url = git@gitea.eom.dev:DevOps/ansible-role-mediawiki.git
+[submodule "roles/ericomeehan.pixelfed"]
+	path = roles/ericomeehan.pixelfed
+	url = git@gitea.eom.dev:DevOps/ansible-role-pixelfed.git
+[submodule "roles/ericomeehan.shkeeper"]
+	path = roles/ericomeehan.shkeeper
+	url = git@gitea.eom.dev:DevOps/ansible-role-shkeeper.git
+[submodule "roles/ericomeehan.counter-strike-2"]
+	path = roles/ericomeehan.counter-strike-2
+	url = git@gitea.eom.dev:Gaming/ansible-role-counter-strike-2.git
+[submodule "roles/ericomeehan.peertube"]
+	path = roles/ericomeehan.peertube
+	url = git@gitea.eom.dev:DevOps/ansible-role-peertube.git
diff --git a/.localai.yaml.swp b/.localai.yaml.swp
deleted file mode 100644
index 87040d8..0000000
Binary files a/.localai.yaml.swp and /dev/null differ
diff --git a/counter-strike-2.yaml b/counter-strike-2.yaml
new file mode 100644
index 0000000..0b2454a
--- /dev/null
+++ b/counter-strike-2.yaml
@@ -0,0 +1,19 @@
+- name: cs2
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.counter-strike-2
+      vars:
+        cs2_servername: "changeme"
+        cs2_cheats: "0"
+        cs2_server_hibernate: "0"
+        cs2_lan: "0"
+        cs2_maxplayers: "16"
+        cs2_gamealias: "casual"
+        cs2_mapgroup: "mg_active"
+        cs2_startmap: "de_inferno"
+        cs2_bot_difficulty: "3"
+        cs2_bot_quota: ""
+        cs2_bot_quota_mode: ""
diff --git a/ejabberd.yaml b/ejabberd.yaml
new file mode 100644
index 0000000..58cdef7
--- /dev/null
+++ b/ejabberd.yaml
@@ -0,0 +1,13 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.ejabberd
+      vars:
+        ejabberd_macro_admin: "ejabberd@eom.dev"
+        ejabberd_macro_password: "{{ ejabberd_admin_password }}"
+        ejabberd_pvc_size_data: 2Ti
+        ejabberd_pvc_size_db: 2Ti
+
diff --git a/eom.yaml b/eom.yaml
index d481903..7166056 100644
--- a/eom.yaml
+++ b/eom.yaml
@@ -1,8 +1,7 @@
----
-- name: Deploy eom.dev one service at a time
-  hosts: imac
+- name: Execute test
+  hosts: alpha-control-plane
   become: true
   vars_files:
     - ../secrets.yaml
   roles:
-    - role: ericomeehan.ericomeehan
+    - role: ericomeehan.eom
diff --git a/fictwiki.yaml b/fictwiki.yaml
new file mode 100644
index 0000000..2180915
--- /dev/null
+++ b/fictwiki.yaml
@@ -0,0 +1,18 @@
+- name: mediawiki
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.mediawiki
+      vars:
+        mediawiki_deploy_localsettings: true
+        mediawiki_deploy_logo: true
+        mediawiki_namespace: "fictwiki"
+        mediawiki_pvc_size_archive: "2Ti"
+        mediawiki_pvc_size_data: "2Ti"
+        mediawiki_pvc_size_db: "2Ti"
+        mediawiki_admin_password: "{{ fictwiki_admin_password }}"
+        mediawiki_mariadb_root_password: "{{ fictwiki_mariadb_root_password }}"
+        mediawiki_mariadb_password: "{{ fictwiki_mariadb_password }}"
+        mediawiki_hostname: "fictwiki.eom.dev"
diff --git a/inspircd.yaml b/inspircd.yaml
new file mode 100644
index 0000000..6781ed6
--- /dev/null
+++ b/inspircd.yaml
@@ -0,0 +1,22 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.inspircd
+      vars:
+        inspircd_admin_desc: "Server Administrator"
+        inspircd_admin_email: "eric@eom.dev"
+        inspircd_admin_name: "Eric Meehan"
+        inspircd_connect_password: ""
+        inspircd_net_name: "eom.dev"
+        inspircd_net_suffix: "eom.dev"
+        inspircd_server_name: "inspircd.eom.dev"
+        inspircd_services_name: "anope.eom.dev"
+        inspircd_services_vhost: "anope.eom.dev"
+        inspircd_pvc_size_config: "256Mi"
+        inspircd_pvc_size_data: "2Ti"
+        inspircd_pvc_size_db: "256Gi"
+
+
diff --git a/test.yaml b/jasmin.yaml
similarity index 78%
rename from test.yaml
rename to jasmin.yaml
index 7166056..5fa9055 100644
--- a/test.yaml
+++ b/jasmin.yaml
@@ -4,4 +4,4 @@
   vars_files:
     - ../secrets.yaml
   roles:
-    - role: ericomeehan.eom
+    - role: ericomeehan.jasmin
diff --git a/lemmy.yaml b/lemmy.yaml
new file mode 100644
index 0000000..d863f0e
--- /dev/null
+++ b/lemmy.yaml
@@ -0,0 +1,365 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.lemmy
+      vars:
+        serverName: "lemmy.eom.dev"
+
+        smtp:
+          server: "postfix.eom.dev:25"
+          username: lemmy
+          password: "{{ lemmy_admin_password }}"
+          from: lemmy@eom.dev
+          tls: true
+        admin:
+          username: lemmy_admin
+          password: "{{ lemmy_admin_password }}"
+          email: lemmy@eom.dev
+        config:
+          siteName: Lemmy on Kubernetes
+          tls: true
+          imageMode: StoreLinkPreviews
+        extraConfig: {}
+        nameOverride: ""
+        fullnameOverride: ""
+        taskrunner:
+          enabled: false
+
+          image:
+            _keep: true
+            # repository: docker.io/dessalines/lemmy
+            # pullPolicy: IfNotPresent
+            # tag:
+
+          env:
+            # RUST_BACKTRACE: 1
+
+          envFrom:
+            # - secretRef:
+            #    name: my-extra-secrets
+
+          podAnnotations: {}
+
+          podSecurityContext: {}
+            # fsGroup: 2000
+
+          securityContext: {}
+            # capabilities:
+            #   drop:
+            #   - ALL
+            # readOnlyRootFilesystem: true
+            # runAsNonRoot: true
+            # runAsUser: 1000
+
+          resources: {}
+            # limits:
+            #   cpu: 100m
+            #   memory: 128Mi
+            # requests:
+            #   cpu: 100m
+            #   memory: 128Mi
+
+          nodeSelector: {}
+
+          tolerations: []
+
+          affinity: {}
+
+        federationsender:
+          enabled: false
+
+          image:
+            _keep: true
+            # repository: docker.io/dessalines/lemmy
+            # pullPolicy: IfNotPresent
+            # tag:
+
+          env:
+            # RUST_BACKTRACE: 1
+
+          envFrom:
+            # - secretRef:
+            #    name: my-extra-secrets
+
+          podAnnotations: {}
+
+          podSecurityContext: {}
+            # fsGroup: 2000
+
+          securityContext: {}
+            # capabilities:
+            #   drop:
+            #   - ALL
+            # readOnlyRootFilesystem: true
+            # runAsNonRoot: true
+            # runAsUser: 1000
+
+          resources: {}
+            # limits:
+            #   cpu: 100m
+            #   memory: 128Mi
+            # requests:
+            #   cpu: 100m
+            #   memory: 128Mi
+
+          nodeSelector: {}
+
+          tolerations: []
+
+          affinity: {}
+
+        frontend:
+          image:
+            repository: docker.io/dessalines/lemmy-ui
+            # pullPolicy: IfNotPresent
+            # tag:
+
+          replicaCount: 1
+
+          strategy:
+            type: RollingUpdate
+
+          env:
+            # LEMMY_UI_DEBUG: true
+
+          envFrom:
+            # - secretRef:
+            #    name: my-extra-secrets
+
+          livenessProbe:
+            httpGet:
+              path: /robots.txt
+              port: http
+
+          readinessProbe:
+            httpGet:
+              path: /robots.txt
+              port: http
+
+          # startupProbe:
+          #   httpGet:
+          #     path: /robots.txt
+          #     port: http
+
+          podAnnotations: {}
+
+          podSecurityContext: {}
+            # fsGroup: 2000
+
+          securityContext: {}
+            # capabilities:
+            #   drop:
+            #   - ALL
+            # readOnlyRootFilesystem: true
+            # runAsNonRoot: true
+            # runAsUser: 1000
+
+          service:
+            type: ClusterIP
+            port: 80
+            sessionAffinity: ClientIP
+
+          resources: {}
+            # limits:
+            #   cpu: 100m
+            #   memory: 128Mi
+            # requests:
+            #   cpu: 100m
+            #   memory: 128Mi
+
+          nodeSelector: {}
+
+          tolerations: []
+
+          affinity: {}
+
+        pictrs:
+          ## NB: pict-rs uses a Sled database by default, which can only be opened by a single instance
+          replicaCount: 1
+
+          strategy:
+            type: Recreate
+
+          ## Generated on first install if left empty
+          # apiKey:
+
+          ## Can also be provided using an existing secret, note that the value is only
+          ## updated on helm upgrades due to Lemmy's configuration system
+          # existingSecret: ""
+          existingSecretKey: apikey
+
+          storage:
+            ## Storage method for media, can be filesystem or object_storage
+            method: filesystem
+
+            objectStorage:
+              ## For self-hosted S3, note that region _must_ also be provided, even for self-hosted S3
+              # endpoint: https://minio.example.com
+              usePathStyle: false
+
+              bucketName: lemmy-pictrs
+              # region:
+              # accessKey:
+              # secretKey:
+              # sessionToken:
+
+              # existingSecret: pictrs-secret
+              # existingSecretAccessKey: access-key
+              # existingSecretSecretKey: secret-key
+
+          env:
+            PICTRS__MEDIA__VIDEO_CODEC: vp9
+            PICTRS__MEDIA__GIF__MAX_WIDTH: 256
+            PICTRS__MEDIA__GIF__MAX_HEIGHT: 256
+            PICTRS__MEDIA__GIF__MAX_AREA: 65536
+            PICTRS__MEDIA__GIF__MAX_FRAME_COUNT: 400
+
+          envFrom:
+            # - secretRef:
+            #    name: my-extra-secrets
+
+          image:
+            repository: docker.io/asonix/pictrs
+            pullPolicy: IfNotPresent
+            tag: 0.4.0-beta.19
+
+          ## Used by both the sled database and also media itself if using the filesystem storage method
+          persistence:
+            enabled: true
+            accessMode: ReadWriteOnce
+            size: 16Gi
+            # existingClaim:
+            # storageClass:
+
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: http
+
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: http
+
+          startupProbe:
+            httpGet:
+              path: /healthz
+              port: http
+
+          podAnnotations: {}
+
+          podSecurityContext: {}
+            # fsGroup: 2000
+
+          securityContext: {}
+            # capabilities:
+            #   drop:
+            #   - ALL
+            # readOnlyRootFilesystem: true
+            # runAsNonRoot: true
+            # runAsUser: 1000
+
+          service:
+            type: ClusterIP
+            port: 80
+
+          resources: {}
+            # limits:
+            #   cpu: 100m
+            #   memory: 128Mi
+            # requests:
+            #   cpu: 100m
+            #   memory: 128Mi
+
+          nodeSelector: {}
+
+          tolerations: []
+
+          affinity: {}
+
+        proxy:
+          enabled: true
+          replicaCount: 1
+
+          strategy:
+            type: RollingUpdate
+
+          image:
+            repository: nginx
+            pullPolicy: Always
+            tag: 1-alpine
+
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+
+          podAnnotations: {}
+
+          podSecurityContext: {}
+            # fsGroup: 2000
+
+          securityContext: {}
+            # capabilities:
+            #   drop:
+            #   - ALL
+            # readOnlyRootFilesystem: true
+            # runAsNonRoot: true
+            # runAsUser: 1000
+
+          service:
+            type: ClusterIP
+            port: 80
+
+          resources: {}
+            # limits:
+            #   cpu: 100m
+            #   memory: 128Mi
+            # requests:
+            #   cpu: 100m
+            #   memory: 128Mi
+
+          nodeSelector: {}
+
+          tolerations: []
+
+          affinity: {}
+
+        postgresql:
+          enabled: true
+          # host:
+
+          poolSize: 10
+
+          auth:
+            username: lemmy
+            database: lemmy
+            # password:
+
+          service:
+            port: 5432
+
+          ## This may need to be set to 'require' if your PostgreSQL database forbids unencrypted connections
+          # sslmode: prefer
+
+        ingress:
+          enabled: true
+          className: "nginx"
+          annotations:
+            kubernetes.io/ingress.class: nginx
+            kubernetes.io/tls-acme: "true"
+          hosts:
+            - lemmy.eom.dev
+          tls:
+            - secretName: lemmy-tls
+              hosts:
+                - lemmy.eom.dev
+
diff --git a/localai.yaml b/localai.yaml
index 8fdcdea..de8bd67 100644
--- a/localai.yaml
+++ b/localai.yaml
@@ -6,7 +6,8 @@
   roles:
     - role: ericomeehan.localai
       vars:
-        localai_disable_webui: "true"
-        localai_watchdog_idle: "true"
+        localai_disable_webui: "false"
+        localai_debug: "true"
+        localai_watchdog_idle: "false"
         localai_watchdog_idle_timeout: "1m"
-        localai_watchdog_busy: "true"
+        localai_watchdog_busy: "false"
diff --git a/luanti-s5.yaml b/luanti-s5.yaml
new file mode 100644
index 0000000..ebd55ee
--- /dev/null
+++ b/luanti-s5.yaml
@@ -0,0 +1,74 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.luanti
+      vars:
+        worldname: SeasonV
+        release_namespace: luanti-s5
+        mod_urls:
+          - https://codeberg.org/tenplus1/ambience.git
+          - https://github.com/minetest-mods/anvil.git
+          - https://gitlab.com/zughy-friends-minetest/arena_lib.git
+          - https://gitlab.com/zughy-friends-minetest/audio_lib.git
+          - https://gitlab.com/rubenwardy/awards.git
+          - https://github.com/blockexchange/blockexchange.git
+          - https://github.com/appgurueu/character_anim.git
+          - https://github.com/rubenwardy/ChatCmdBuilder.git
+          - https://github.com/minetest-mods/commoditymarket.git
+          - https://github.com/mt-mods/controls.git
+          - https://github.com/ElCeejo/creatura.git
+          - https://github.com/mt-mods/currency.git
+          - https://github.com/EvergreenTheTree/death_messages.git
+          - https://github.com/mt-mods/display_modpack.git
+          - https://github.com/minetest-mods/edit.git
+          - https://github.com/PieAreSquared11/Player-Factions-Redo.git
+          - https://github.com/PieAreSquared11/Factions-Todo-List.git
+          - https://codeberg.org/tenplus1/farming.git
+          - https://github.com/Amaz1/flight.git
+          - https://github.com/mt-mods/hangglider.git
+          - https://codeberg.org/SumianVoice/item_physics.git
+          - https://github.com/C-C-Minetest-Server/mailbox.git
+          - https://github.com/fluxionary/luanti-name_monoid.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_3d_armor_minimized.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_expanded_city_commoditymarket.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_matrix_chat.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_placeable_adventure_map_island_creator.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_protector_mapblocks.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_protector_mapblocks_grid.git
+          - https://gitea.eom.dev/Gaming/luanti_mod_pvp_zones.git
+          - https://gitlab.com/zughy-friends-minetest/minetest-murder-mod.git
+          - https://repo.or.cz/minetest_pep.git
+          - https://github.com/minetest-mods/mesecons.git
+          - https://codeberg.org/tenplus1/mobs_redo.git
+          - https://codeberg.org/tenplus1/mobs_animal.git
+          - https://codeberg.org/tenplus1/mobs_npc.git
+          - https://codeberg.org/tenplus1/mob_horse.git
+          - https://codeberg.org/tenplus1/mobs_water.git
+          - https://codeberg.org/tenplus1/mobs_skeletons.git
+          - https://codeberg.org/tenplus1/mobs_slimes.git
+          - https://github.com/appgurueu/modlib.git
+          - https://github.com/minetest-mods/moreblocks.git
+          - https://github.com/mt-historical/music_modpack.git
+          - https://gitlab.com/zughy-friends-minetest/panel_lib.git
+          - https://gitlab.com/zughy-friends-minetest/parties.git
+          - https://github.com/BuckarooBanzay/placeholder.git
+          - https://codeberg.org/Wuzzy/minetest_playereffects.git
+          - https://github.com/BuckarooBanzay/mtzip.git
+          - https://github.com/mt-mods/promise.git
+          - https://gitlab.com/OrangeBlob/realtime.git
+          - https://github.com/D00Med/scifi_nodes.git
+          - https://github.com/mt-mods/signs_lib.git
+          - https://github.com/minetest-mods/skinsdb.git
+          - https://github.com/minetest-mods/stamina.git
+          - https://codeberg.org/tenplus1/teleport_potion.git
+          - https://github.com/minetest-mods/unified_inventory.git
+          - https://github.com/wireva/visible_sneak.git
+          - https://gitlab.com/zughy-friends-minetest/weapons_lib.git
+          - https://github.com/minetest-mods/wielded_light.git
+          - https://bitbucket.org/minetest_gamers/x_bows.git
+          - https://github.com/mt-mods/xcompat.git
+          - https://bitbucket.org/minetest_gamers/x_enchanting.git
+          
diff --git a/luanti.yaml b/luanti.yaml
new file mode 100644
index 0000000..b373981
--- /dev/null
+++ b/luanti.yaml
@@ -0,0 +1,68 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.luanti
+      vars:
+        worldname: SeasonIV
+        release_namespace: luanti-season-iv
+        mod_urls:
+          - https://gitea.eom.dev/Gaming/3d_armor_minimized.git
+          - https://codeberg.org/tenplus1/ambience.git
+          - https://github.com/minetest-mods/anvil.git
+          - https://gitlab.com/zughy-friends-minetest/arena_lib.git
+          - https://gitlab.com/zughy-friends-minetest/audio_lib.git
+          - https://gitlab.com/rubenwardy/awards.git
+          - https://github.com/appgurueu/character_anim.git
+          - https://github.com/rubenwardy/ChatCmdBuilder.git
+          - https://github.com/minetest-mods/commoditymarket.git
+          - https://github.com/mt-mods/controls.git
+          - https://github.com/ElCeejo/creatura.git
+          - https://github.com/mt-mods/currency.git
+          - https://github.com/EvergreenTheTree/death_messages.git
+          - https://github.com/mt-mods/display_modpack.git
+          - https://github.com/minetest-mods/edit.git
+          - https://gitea.eom.dev/Gaming/expanded_city_commoditymarket.git
+          - https://github.com/PieAreSquared11/Player-Factions-Redo.git
+          - https://github.com/PieAreSquared11/Factions-Todo-List.git
+          - https://codeberg.org/tenplus1/farming.git
+          - https://git.phreedom.club/localhost_frssoft/fediauth.git
+          - https://github.com/Amaz1/flight.git
+          - https://github.com/mt-mods/hangglider.git
+          - https://github.com/minetest-mods/irc.git
+          - https://codeberg.org/SumianVoice/item_physics.git
+          - https://github.com/C-C-Minetest-Server/mailbox.git
+          - https://github.com/fluxionary/luanti-name_monoid.git
+          - https://gitea.eom.dev/Gaming/matrix_chat.git
+          - https://gitlab.com/zughy-friends-minetest/minetest-murder-mod.git
+          - https://github.com/minetest-mods/mesecons.git
+          - https://codeberg.org/tenplus1/mobs_redo.git
+          - https://codeberg.org/tenplus1/mobs_animal.git
+          - https://codeberg.org/tenplus1/mobs_npc.git
+          - https://codeberg.org/tenplus1/mob_horse.git
+          - https://codeberg.org/tenplus1/mobs_water.git
+          - https://codeberg.org/tenplus1/mobs_skeletons.git
+          - https://codeberg.org/tenplus1/mobs_slimes.git
+          - https://github.com/appgurueu/modlib.git
+          - https://github.com/minetest-mods/moreblocks.git
+          - https://github.com/mt-historical/music_modpack.git
+          - https://gitlab.com/zughy-friends-minetest/panel_lib.git
+          - https://gitlab.com/zughy-friends-minetest/parties.git
+          - https://repo.or.cz/minetest_pep.git
+          - https://codeberg.org/Wuzzy/minetest_playereffects.git
+          - https://codeberg.org/tenplus1/protector.git
+          - https://gitea.eom.dev/Gaming/pvp_zones.git
+          - https://github.com/mt-mods/signs_lib.git
+          - https://github.com/minetest-mods/skinsdb.git
+          - https://github.com/minetest-mods/stamina.git
+          - https://codeberg.org/tenplus1/teleport_potion.git
+          - https://github.com/minetest-mods/unified_inventory.git
+          - https://github.com/wireva/visible_sneak.git
+          - https://gitlab.com/zughy-friends-minetest/weapons_lib.git
+          - https://github.com/minetest-mods/wielded_light.git
+          - https://bitbucket.org/minetest_gamers/x_bows.git
+          - https://github.com/mt-mods/xcompat.git
+          - https://bitbucket.org/minetest_gamers/x_enchanting.git
+          
diff --git a/mailman3.yaml b/mailman3.yaml
new file mode 100644
index 0000000..fbd695c
--- /dev/null
+++ b/mailman3.yaml
@@ -0,0 +1,7 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.mailman3
diff --git a/main.yaml b/main.yaml
index 5f7bb26..4a344ba 100644
--- a/main.yaml
+++ b/main.yaml
@@ -238,6 +238,9 @@
               acme.cert-manager.io/http01-edit-in-place: 'true'
             extraArgs:
               update-status: "false"
+            config:
+              use-forwarded-headers: "true"
+              allow-snippet-annotations: "true"
 
     - name: Deploy cert-manager
       kubernetes.core.helm:
diff --git a/mediawiki.yaml b/mediawiki.yaml
new file mode 100644
index 0000000..d0fdbf2
--- /dev/null
+++ b/mediawiki.yaml
@@ -0,0 +1,15 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.mediawiki
+      vars:
+        mediawiki_deploy_localsettings: false
+        mediawiki_hostname: "mediawiki.eom.dev"
+        mediawiki_namespace: "mediawiki"
+        mediawiki_pvc_size_archive: "64Gi"
+        mediawiki_pvc_size_data: "2Ti"
+        mediawiki_pvc_size_db: "2Ti"
+
diff --git a/nginx-rtmp.yaml b/nginx-rtmp.yaml
index 8486399..b396202 100644
--- a/nginx-rtmp.yaml
+++ b/nginx-rtmp.yaml
@@ -5,3 +5,5 @@
     - ../secrets.yaml
   roles:
     - role: ericomeehan.nginx-rtmp
+      vars:
+        nginx_rtmp_push_targets: "{{ nginx_rtmp_push_targets }}"
diff --git a/open-archiver.yaml b/open-archiver.yaml
new file mode 100644
index 0000000..1738a2e
--- /dev/null
+++ b/open-archiver.yaml
@@ -0,0 +1,22 @@
+- name: open-archiver
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.open-archiver
+      vars:
+        open_archiver_all_inclusive_archive: "false"
+        open_archiver_body_size_limit: "100M"
+        open_archiver_enable_deletion: "true"
+        open_archiver_jwt_expires_in: "7d"
+        open_archiver_meili_indexing_batch: "500"
+        open_archiver_node_env: "production"
+        open_archiver_pvc_size_data: "2Ti"
+        open_archiver_pvc_size_meilidata: "2Ti"
+        open_archiver_pvc_size_open_archiver: "2Ti"
+        open_archiver_pvc_size_postgresql: "2Ti"
+        open_archiver_rate_limit_max_requests: "100"
+        open_archiver_rate_limit_window_ms: "900000"
+        open_archiver_sync_frequency: "* * * * *"
+
diff --git a/peertube.yaml b/peertube.yaml
new file mode 100644
index 0000000..eafe2f5
--- /dev/null
+++ b/peertube.yaml
@@ -0,0 +1,7 @@
+- name: peertube
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.peertube
diff --git a/pixelfed.yaml b/pixelfed.yaml
new file mode 100644
index 0000000..32820c2
--- /dev/null
+++ b/pixelfed.yaml
@@ -0,0 +1,7 @@
+- name: Deploy Pixelfed
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.pixelfed
diff --git a/roles/ericomeehan.counter-strike-2 b/roles/ericomeehan.counter-strike-2
new file mode 160000
index 0000000..fba2d54
--- /dev/null
+++ b/roles/ericomeehan.counter-strike-2
@@ -0,0 +1 @@
+Subproject commit fba2d54265280907c6c3e13dc621025584aed270
diff --git a/roles/ericomeehan.eom b/roles/ericomeehan.eom
index 92a024d..259c4aa 160000
--- a/roles/ericomeehan.eom
+++ b/roles/ericomeehan.eom
@@ -1 +1 @@
-Subproject commit 92a024d74467e16337a795ac48ad6aab19535da1
+Subproject commit 259c4aa83f97ca0ce49f63e67daa12860135b7d1
diff --git a/roles/ericomeehan.gitea b/roles/ericomeehan.gitea
index 64ce43e..990ccfe 160000
--- a/roles/ericomeehan.gitea
+++ b/roles/ericomeehan.gitea
@@ -1 +1 @@
-Subproject commit 64ce43ecfba3443f2ddec8bedf926fd3476746e7
+Subproject commit 990ccfef17d2e78b6f0a7789c456773d394c1836
diff --git a/roles/ericomeehan.ingress-nginx b/roles/ericomeehan.ingress-nginx
index efecb20..dbfc2df 160000
--- a/roles/ericomeehan.ingress-nginx
+++ b/roles/ericomeehan.ingress-nginx
@@ -1 +1 @@
-Subproject commit efecb20e5c3530b7fbbaa6709dccfdfd3ea0df8f
+Subproject commit dbfc2dfc480e9410ff383a3775b7629819fc667b
diff --git a/roles/ericomeehan.inspircd b/roles/ericomeehan.inspircd
index 6cb9d53..f612554 160000
--- a/roles/ericomeehan.inspircd
+++ b/roles/ericomeehan.inspircd
@@ -1 +1 @@
-Subproject commit 6cb9d53136163bfdfc9e21b638379e619a7f3b65
+Subproject commit f612554ef36de090126e6662351b3a762cb37409
diff --git a/roles/ericomeehan.luanti b/roles/ericomeehan.luanti
index 5651381..8a07526 160000
--- a/roles/ericomeehan.luanti
+++ b/roles/ericomeehan.luanti
@@ -1 +1 @@
-Subproject commit 56513813163181a7d0c2f0515c78e4b597be8898
+Subproject commit 8a07526c4c5fd8dd047d7f860fb7bf3f833ead46
diff --git a/roles/ericomeehan.mediawiki b/roles/ericomeehan.mediawiki
new file mode 160000
index 0000000..2004f46
--- /dev/null
+++ b/roles/ericomeehan.mediawiki
@@ -0,0 +1 @@
+Subproject commit 2004f46645845fd3c430fe7cd704472518060526
diff --git a/roles/ericomeehan.open-archiver b/roles/ericomeehan.open-archiver
index 2c3021b..0044331 160000
--- a/roles/ericomeehan.open-archiver
+++ b/roles/ericomeehan.open-archiver
@@ -1 +1 @@
-Subproject commit 2c3021b6b6e02a5161d80eb171e434230df1bc9b
+Subproject commit 0044331f01be611851cda29ecf3f2bbec712ba61
diff --git a/roles/ericomeehan.peertube b/roles/ericomeehan.peertube
new file mode 160000
index 0000000..d1acf48
--- /dev/null
+++ b/roles/ericomeehan.peertube
@@ -0,0 +1 @@
+Subproject commit d1acf48b61f41844ce9eeeeed87c162ffb56d4cd
diff --git a/roles/ericomeehan.pixelfed b/roles/ericomeehan.pixelfed
new file mode 160000
index 0000000..5329bf3
--- /dev/null
+++ b/roles/ericomeehan.pixelfed
@@ -0,0 +1 @@
+Subproject commit 5329bf37984da848b346ef834d6517e619c92f10
diff --git a/roles/ericomeehan.shkeeper b/roles/ericomeehan.shkeeper
new file mode 160000
index 0000000..9fb08c0
--- /dev/null
+++ b/roles/ericomeehan.shkeeper
@@ -0,0 +1 @@
+Subproject commit 9fb08c0ad393b048188365976c5ffee6e2f4bb82
diff --git a/shkeeper.yaml b/shkeeper.yaml
new file mode 100644
index 0000000..2d786d3
--- /dev/null
+++ b/shkeeper.yaml
@@ -0,0 +1,7 @@
+- name: deploy
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.shkeeper
diff --git a/tes3mp.yaml b/tes3mp.yaml
index b83002e..1414bd3 100644
--- a/tes3mp.yaml
+++ b/tes3mp.yaml
@@ -6,5 +6,6 @@
   roles:
     - role: ericomeehan.tes3mp
       vars:
-        TES3MP_SERVER_GENERAL_HOSTNAME: "TES3MP on eom.dev"
+        TES3MP_SERVER_GENERAL_HOSTNAME: "tes3mp.eom.dev"
         TES3MP_SERVER_GENERAL_PASSWORD: "{{ tes3mp_server_general_password }}"
+        TES3MP_SERVER_MASTERSERVER_ENABLED: "true"
diff --git a/tor-controller.yaml b/tor-controller.yaml
new file mode 100644
index 0000000..2fb14e2
--- /dev/null
+++ b/tor-controller.yaml
@@ -0,0 +1,7 @@
+- name: Execute test
+  hosts: alpha-control-plane
+  become: true
+  vars_files:
+    - ../secrets.yaml
+  roles:
+    - role: ericomeehan.tor-controller