diff --git a/etc/postgresql/15/main/conf.d/10-custom.conf b/etc/postgresql/15/main/conf.d/10-custom.conf
deleted file mode 100644
index 9e5b149..0000000
--- a/etc/postgresql/15/main/conf.d/10-custom.conf
+++ /dev/null
@@ -1 +0,0 @@
-full_page_writes = off
diff --git a/etc/postgresql/15/main/conf.d/optimizations-general.conf b/etc/postgresql/15/main/conf.d/optimizations-general.conf
new file mode 100644
index 0000000..1e81c5d
--- /dev/null
+++ b/etc/postgresql/15/main/conf.d/optimizations-general.conf
@@ -0,0 +1,11 @@
+# https://vadosware.io/post/everything-ive-seen-on-optimizing-postgres-on-zfs-on-linux/
+# https://www.percona.com/sites/default/files/presentations/pg-Performance-Tuning.pdf
+
+shared_buffers = 6GB
+work_mem = 1GB
+maintenance_work_mem = 1GB
+effective_io_concurrency = 100
+max_worker_processes = 12
+max_parallel_workers = 12
+max_parellel_workers_per_gather = 3
+max_parellel_workers_per_gather = 3
\ No newline at end of file
diff --git a/etc/postgresql/15/main/conf.d/optimizations-zfs.conf b/etc/postgresql/15/main/conf.d/optimizations-zfs.conf
new file mode 100644
index 0000000..ac7a444
--- /dev/null
+++ b/etc/postgresql/15/main/conf.d/optimizations-zfs.conf
@@ -0,0 +1,6 @@
+# https://vadosware.io/post/everything-ive-seen-on-optimizing-postgres-on-zfs-on-linux/
+
+full_page_writes = off
+wal_init_zero = off
+wal_recycle = off
+effective_cache_size = 32GB
\ No newline at end of file