diff --git a/nodes/centaurus.kosmos.org.json b/nodes/centaurus.kosmos.org.json
index 59c6b79..38bc7d4 100644
--- a/nodes/centaurus.kosmos.org.json
+++ b/nodes/centaurus.kosmos.org.json
@@ -27,13 +27,13 @@
       "kosmos_gitea::default",
       "kosmos_gitea::backup",
       "kosmos-postgresql::replica",
+      "kosmos-postgresql::firewall_replicas",
       "kosmos_discourse",
       "kosmos_discourse::default",
       "kosmos_drone",
       "kosmos_drone::default",
       "kosmos_kvm::host",
       "kosmos-ejabberd::firewall",
-      "kosmos-postgresql::firewall_replicas",
       "kosmos_zerotier::firewall",
       "apt::default",
       "timezone_iii::default",
@@ -87,7 +87,6 @@
     "role[drone]",
     "recipe[kosmos_kvm::host]",
     "recipe[kosmos-ejabberd::firewall]",
-    "recipe[kosmos-postgresql::firewall_replicas]",
     "recipe[kosmos_zerotier::firewall]"
   ]
 }
\ No newline at end of file
diff --git a/nodes/draco.kosmos.org.json b/nodes/draco.kosmos.org.json
index f463aad..ece1685 100644
--- a/nodes/draco.kosmos.org.json
+++ b/nodes/draco.kosmos.org.json
@@ -12,19 +12,20 @@
     "hostname": "draco",
     "ipaddress": "148.251.237.73",
     "roles": [
-      "postgresql_replica"
+      "postgresql_primary"
     ],
     "recipes": [
       "kosmos-base",
       "kosmos-base::default",
       "kosmos_encfs",
       "kosmos_encfs::default",
-      "kosmos-postgresql::replica",
+      "kosmos-postgresql",
+      "kosmos-postgresql::default",
+      "kosmos-postgresql::firewall_replicas",
       "kosmos_kvm::host",
       "kosmos-ejabberd::firewall",
       "kosmos-ipfs::firewall_swarm",
       "kosmos-ipfs::firewall_public_gateway",
-      "kosmos-postgresql::firewall_replicas",
       "kosmos-bitcoin::firewall",
       "kosmos_zerotier::firewall",
       "kosmos-nginx::firewall",
@@ -62,12 +63,11 @@
   "run_list": [
     "recipe[kosmos-base]",
     "recipe[kosmos_encfs]",
-    "role[postgresql_replica]",
+    "role[postgresql_primary]",
     "recipe[kosmos_kvm::host]",
     "recipe[kosmos-ejabberd::firewall]",
     "recipe[kosmos-ipfs::firewall_swarm]",
     "recipe[kosmos-ipfs::firewall_public_gateway]",
-    "recipe[kosmos-postgresql::firewall_replicas]",
     "recipe[kosmos-bitcoin::firewall]",
     "recipe[kosmos_zerotier::firewall]",
     "recipe[kosmos-nginx::firewall]"
diff --git a/roles/postgresql_primary.rb b/roles/postgresql_primary.rb
index 0cb0ccd..16db3d9 100644
--- a/roles/postgresql_primary.rb
+++ b/roles/postgresql_primary.rb
@@ -2,4 +2,5 @@ name "postgresql_primary"
 
 run_list %w(
   kosmos-postgresql::default
+  kosmos-postgresql::firewall_replicas
 )
diff --git a/roles/postgresql_replica.rb b/roles/postgresql_replica.rb
index 8ee5100..3b247b2 100644
--- a/roles/postgresql_replica.rb
+++ b/roles/postgresql_replica.rb
@@ -2,4 +2,5 @@ name "postgresql_replica"
 
 run_list %w(
   kosmos-postgresql::replica
+  kosmos-postgresql::firewall_replicas
 )