diff --git a/ansible/build.gradle.kts b/ansible/build.gradle.kts
index 7883b5a41..188a2a16d 100644
--- a/ansible/build.gradle.kts
+++ b/ansible/build.gradle.kts
@@ -32,7 +32,6 @@ dependencies {
     pvpPlugin(project(path = ":plugins:civmodcore-paper", configuration = "shadow"))
     pvpPlugin(project(path = ":plugins:combattagplus-paper"))
     pvpPlugin(project(path = ":plugins:finale-paper"))
-    pvpPlugin(project(path = ":plugins:namecolors-paper"))
     pvpPlugin(project(path = ":plugins:simpleadminhacks-paper"))
 }
 
diff --git a/ansible/files/pvp-config/plugins/SimpleAdminHacks/config.yml b/ansible/files/pvp-config/plugins/SimpleAdminHacks/config.yml
index a6c649922..9e721e7f6 100644
--- a/ansible/files/pvp-config/plugins/SimpleAdminHacks/config.yml
+++ b/ansible/files/pvp-config/plugins/SimpleAdminHacks/config.yml
@@ -567,7 +567,7 @@ hacks:
     unsafe_materials: [LAVA, WATER]
     ott_timeout: 1d
   ToggleLamp:
-    enabled: true
+    enabled: false
     cooldownTime: 100
   DespawnFix:
     enabled: true
diff --git a/ansible/src/pvp-plugins/Chunky-1.4.10.jar b/ansible/src/pvp-plugins/Chunky-1.4.10.jar
new file mode 120000
index 000000000..ac19a1859
--- /dev/null
+++ b/ansible/src/pvp-plugins/Chunky-1.4.10.jar
@@ -0,0 +1 @@
+../paper-plugins/Chunky-1.4.10.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/ChunkyBorder-1.2.13.jar b/ansible/src/pvp-plugins/ChunkyBorder-1.2.13.jar
new file mode 120000
index 000000000..b7e50ae04
--- /dev/null
+++ b/ansible/src/pvp-plugins/ChunkyBorder-1.2.13.jar
@@ -0,0 +1 @@
+../paper-plugins/ChunkyBorder-1.2.13.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/GEmote-1.0.1.jar b/ansible/src/pvp-plugins/GEmote-1.0.1.jar
new file mode 120000
index 000000000..d86ea8e52
--- /dev/null
+++ b/ansible/src/pvp-plugins/GEmote-1.0.1.jar
@@ -0,0 +1 @@
+../paper-plugins/GEmote-1.0.1.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/GSit-1.10.0.jar b/ansible/src/pvp-plugins/GSit-1.10.0.jar
new file mode 120000
index 000000000..b0a2edf06
--- /dev/null
+++ b/ansible/src/pvp-plugins/GSit-1.10.0.jar
@@ -0,0 +1 @@
+../paper-plugins/GSit-1.10.0.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/LuckPerms-Bukkit-5.4.131.jar b/ansible/src/pvp-plugins/LuckPerms-Bukkit-5.4.131.jar
new file mode 120000
index 000000000..1e83b2925
--- /dev/null
+++ b/ansible/src/pvp-plugins/LuckPerms-Bukkit-5.4.131.jar
@@ -0,0 +1 @@
+../paper-plugins/LuckPerms-Bukkit-5.4.131.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/ProtocolLib.jar b/ansible/src/pvp-plugins/ProtocolLib.jar
new file mode 120000
index 000000000..5f5fba007
--- /dev/null
+++ b/ansible/src/pvp-plugins/ProtocolLib.jar
@@ -0,0 +1 @@
+../paper-plugins/ProtocolLib.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/SuperVanish-6.2.20.jar b/ansible/src/pvp-plugins/SuperVanish-6.2.20.jar
new file mode 120000
index 000000000..0064e1eab
--- /dev/null
+++ b/ansible/src/pvp-plugins/SuperVanish-6.2.20.jar
@@ -0,0 +1 @@
+../paper-plugins/SuperVanish-6.2.20.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/TAB v4.1.7.jar b/ansible/src/pvp-plugins/TAB v4.1.7.jar
new file mode 120000
index 000000000..d688072ac
--- /dev/null
+++ b/ansible/src/pvp-plugins/TAB v4.1.7.jar	
@@ -0,0 +1 @@
+../paper-plugins/TAB v4.1.7.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/Vault.jar b/ansible/src/pvp-plugins/Vault.jar
new file mode 120000
index 000000000..355dbc7d6
--- /dev/null
+++ b/ansible/src/pvp-plugins/Vault.jar
@@ -0,0 +1 @@
+../paper-plugins/Vault.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/ViaBackwards-5.0.3.jar b/ansible/src/pvp-plugins/ViaBackwards-5.0.3.jar
new file mode 120000
index 000000000..5f600cc9a
--- /dev/null
+++ b/ansible/src/pvp-plugins/ViaBackwards-5.0.3.jar
@@ -0,0 +1 @@
+../paper-plugins/ViaBackwards-5.0.3.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/ViaVersion-5.0.3.jar b/ansible/src/pvp-plugins/ViaVersion-5.0.3.jar
new file mode 120000
index 000000000..d27c64b08
--- /dev/null
+++ b/ansible/src/pvp-plugins/ViaVersion-5.0.3.jar
@@ -0,0 +1 @@
+../paper-plugins/ViaVersion-5.0.3.jar
\ No newline at end of file
diff --git a/ansible/src/pvp-plugins/WorldEditSelectionVisualizer-2.1.7.jar b/ansible/src/pvp-plugins/WorldEditSelectionVisualizer-2.1.7.jar
new file mode 100644
index 000000000..e69de29bb
diff --git a/ansible/src/pvp-plugins/worldedit-bukkit-7.3.6.jar b/ansible/src/pvp-plugins/worldedit-bukkit-7.3.6.jar
new file mode 120000
index 000000000..1bfcfc6ed
--- /dev/null
+++ b/ansible/src/pvp-plugins/worldedit-bukkit-7.3.6.jar
@@ -0,0 +1 @@
+../paper-plugins/worldedit-bukkit-7.3.6.jar
\ No newline at end of file
diff --git a/ansible/templates/stacks/minecraft.yml.j2 b/ansible/templates/stacks/minecraft.yml.j2
index 9ec5ff01c..a5eafe0b0 100644
--- a/ansible/templates/stacks/minecraft.yml.j2
+++ b/ansible/templates/stacks/minecraft.yml.j2
@@ -81,7 +81,6 @@ services:
             CIV_MYSQL_HOST: minecraft_mariadb
             CIV_MYSQL_USERNAME: '{{secret.minecraft.mysql.username}}'
             CIV_MYSQL_PASSWORD: '{{secret.minecraft.mysql.password}}'
-            CIV_MYSQL_DATABASE: minecraft
 
             CIV_POSTGRES_HOST: minecraft_postgres
             CIV_POSTGRES_USERNAME: '{{secret.minecraft.postgres.username}}'
@@ -154,18 +153,17 @@ services:
             STOP_DURATION: 3600
 
             CIV_SERVER_NAME: prod-server
-    {% if setting.minecraft.whitelist %}
+{% if setting.minecraft.whitelist %}
             ENABLE_WHITELIST: 'true'
             CIV_WHITELIST: 'true'
-    {% else %}
+{% else %}
             ENABLE_WHITELIST: 'false'
             CIV_WHITELIST: 'false'
-    {% endif %}
+{% endif %}
 
             CIV_MYSQL_HOST: minecraft_mariadb
             CIV_MYSQL_USERNAME: '{{secret.minecraft.mysql.username}}'
             CIV_MYSQL_PASSWORD: '{{secret.minecraft.mysql.password}}'
-            CIV_MYSQL_DATABASE: minecraft
 
             CIV_POSTGRES_HOST: minecraft_postgres
             CIV_POSTGRES_USERNAME: '{{secret.minecraft.postgres.username}}'
@@ -183,7 +181,6 @@ services:
             # Persistence
             - /opt/stacks/minecraft/pvp-data:/data
             # Config & Plugins
-            - /opt/stacks/minecraft/paper-config:/paper-config
             - /opt/stacks/minecraft/pvp-config:/config
             - /opt/stacks/minecraft/pvp-plugins:/plugins
             # Private Config & Plugins
diff --git a/containers/provisioning/mariadb/docker-entrypoint-initdb.d/0100_create_databases.sql b/containers/provisioning/mariadb/docker-entrypoint-initdb.d/0100_create_databases.sql
index 3a8e8c4bb..57a51c647 100644
--- a/containers/provisioning/mariadb/docker-entrypoint-initdb.d/0100_create_databases.sql
+++ b/containers/provisioning/mariadb/docker-entrypoint-initdb.d/0100_create_databases.sql
@@ -25,3 +25,9 @@ GRANT ALL PRIVILEGES ON `castlegates`.* TO 'mariadb'@'%';
 GRANT ALL PRIVILEGES ON `essenceglue`.* TO 'mariadb'@'%';
 GRANT ALL PRIVILEGES ON `exilepearl`.* TO 'mariadb'@'%';
 GRANT ALL PRIVILEGES ON `realisticbiomes`.* TO 'mariadb'@'%';
+
+CREATE DATABASE pvp_civduties;
+CREATE DATABASE pvp_civmodcore;
+
+GRANT ALL PRIVILEGES ON `pvp_civduties`.* TO 'mariadb'@'%';
+GRANT ALL PRIVILEGES ON `pvp_civmodcore`.* TO 'mariadb'@'%';