diff --git a/defaults/krill-pubd.conf b/defaults/krill-pubd.conf
index 4fa10c515..b6d4325e8 100644
--- a/defaults/krill-pubd.conf
+++ b/defaults/krill-pubd.conf
@@ -6,22 +6,15 @@
 
 # Specify the storage used by Krill.
 #
-# Currently, Krill supports two flavours of storage: disk
-# or a Postgresql database. Support for other databases or
-# key value store implementations may be added in future.
+# Currently, Krill supports disk based storage only.
 #
-# If you use disk-backed storage, you MUST ensure that
-# only one Krill node using this storage is active at any
-# given moment. Transactionality is not guaranteed across nodes
-# when using this option.
-#
-# If a database back-end is used, it is possible to have multiple
-# concurrent active Krill instances use it. Database replication
-# can further improve availability as long as this is transparent to Krill.
+# You can use a shared disk and a standby Krill node for redundancy.
+# However, data corruption issues can occur if you run multiple active
+# Krill nodes using a shared disk. Therefore, you MUST ensure that only
+# one Krill node is active at any given time.
 #
 # Example configurations:
 # storage_uri = "/var/lib/krill/data/"
-# storage_uri = "postgres://postgres@localhost/postgres" 
 #
 # Default:
 # storage_uri = "./data"
@@ -258,4 +251,4 @@
 # audit or research.
 #
 # If set to true files will be archived in a directory under '$data_dir/repo/archive'
-# rrdp_files_archive = false
\ No newline at end of file
+# rrdp_files_archive = false
diff --git a/defaults/krill-testbed.conf b/defaults/krill-testbed.conf
index 436395a6e..b4ebcf4a9 100644
--- a/defaults/krill-testbed.conf
+++ b/defaults/krill-testbed.conf
@@ -36,22 +36,15 @@
 
 # Specify the storage used by Krill.
 #
-# Currently, Krill supports two flavours of storage: disk
-# or a Postgresql database. Support for other databases or
-# key value store implementations may be added in future.
+# Currently, Krill supports disk based storage only.
 #
-# If you use disk-backed storage, you MUST ensure that
-# only one Krill node using this storage is active at any
-# given moment. Transactionality is not guaranteed across nodes
-# when using this option.
-#
-# If a database back-end is used, it is possible to have multiple
-# concurrent active Krill instances use it. Database replication
-# can further improve availability as long as this is transparent to Krill.
+# You can use a shared disk and a standby Krill node for redundancy.
+# However, data corruption issues can occur if you run multiple active
+# Krill nodes using a shared disk. Therefore, you MUST ensure that only
+# one Krill node is active at any given time.
 #
 # Example configurations:
 # storage_uri = "/var/lib/krill/data/"
-# storage_uri = "postgres://postgres@localhost/postgres" 
 #
 # Default:
 # storage_uri = "./data"
diff --git a/defaults/krill.conf b/defaults/krill.conf
index c85f48e7d..0b7cfd8a1 100644
--- a/defaults/krill.conf
+++ b/defaults/krill.conf
@@ -6,22 +6,15 @@
 
 # Specify the storage used by Krill.
 #
-# Currently, Krill supports two flavours of storage: disk
-# or a Postgresql database. Support for other databases or
-# key value store implementations may be added in future.
+# Currently, Krill supports disk based storage only.
 #
-# If you use disk-backed storage, you MUST ensure that
-# only one Krill node using this storage is active at any
-# given moment. Transactionality is not guaranteed across nodes
-# when using this option.
-#
-# If a database back-end is used, it is possible to have multiple
-# concurrent active Krill instances use it. Database replication
-# can further improve availability as long as this is transparent to Krill.
+# You can use a shared disk and a standby Krill node for redundancy.
+# However, data corruption issues can occur if you run multiple active
+# Krill nodes using a shared disk. Therefore, you MUST ensure that only
+# one Krill node is active at any given time.
 #
 # Example configurations:
 # storage_uri = "/var/lib/krill/data/"
-# storage_uri = "postgres://postgres@localhost/postgres" 
 #
 # Default:
 # storage_uri = "./data"
@@ -466,4 +459,4 @@
 # timing_child_certificate_valid_weeks = 52
 # timing_child_certificate_reissue_weeks_before = 4
 # timing_roa_valid_weeks = 52
-# timing_roa_reissue_weeks_before = 4
\ No newline at end of file
+# timing_roa_reissue_weeks_before = 4
diff --git a/test-resources/krill-init-multi-user.conf b/test-resources/krill-init-multi-user.conf
index 68528db0e..8db927150 100644
--- a/test-resources/krill-init-multi-user.conf
+++ b/test-resources/krill-init-multi-user.conf
@@ -6,22 +6,15 @@
 
 # Specify the storage used by Krill.
 #
-# Currently, Krill supports two flavours of storage: disk
-# or a Postgresql database. Support for other databases or
-# key value store implementations may be added in future.
+# Currently, Krill supports disk based storage only.
 #
-# If you use disk-backed storage, you MUST ensure that
-# only one Krill node using this storage is active at any
-# given moment. Transactionality is not guaranteed across nodes
-# when using this option.
-#
-# If a database back-end is used, it is possible to have multiple
-# concurrent active Krill instances use it. Database replication
-# can further improve availability as long as this is transparent to Krill.
+# You can use a shared disk and a standby Krill node for redundancy.
+# However, data corruption issues can occur if you run multiple active
+# Krill nodes using a shared disk. Therefore, you MUST ensure that only
+# one Krill node is active at any given time.
 #
 # Example configurations:
 # storage_uri = "/var/lib/krill/data/"
-# storage_uri = "postgres://postgres@localhost/postgres" 
 #
 # Default:
 # storage_uri = "./data"
@@ -469,6 +462,7 @@ service_uri = "https://localhost:3001/"
 # timing_roa_reissue_weeks_before = 4
 
 
+
 ######################################################################################
 #                                                                                    #
 #               ----==== WEB UI MULTI-USER LOGIN CONFIGURATION ====----              #
diff --git a/test-resources/krill-init.conf b/test-resources/krill-init.conf
index 9c00ed97b..c18bf1bba 100644
--- a/test-resources/krill-init.conf
+++ b/test-resources/krill-init.conf
@@ -6,22 +6,15 @@
 
 # Specify the storage used by Krill.
 #
-# Currently, Krill supports two flavours of storage: disk
-# or a Postgresql database. Support for other databases or
-# key value store implementations may be added in future.
+# Currently, Krill supports disk based storage only.
 #
-# If you use disk-backed storage, you MUST ensure that
-# only one Krill node using this storage is active at any
-# given moment. Transactionality is not guaranteed across nodes
-# when using this option.
-#
-# If a database back-end is used, it is possible to have multiple
-# concurrent active Krill instances use it. Database replication
-# can further improve availability as long as this is transparent to Krill.
+# You can use a shared disk and a standby Krill node for redundancy.
+# However, data corruption issues can occur if you run multiple active
+# Krill nodes using a shared disk. Therefore, you MUST ensure that only
+# one Krill node is active at any given time.
 #
 # Example configurations:
 # storage_uri = "/var/lib/krill/data/"
-# storage_uri = "postgres://postgres@localhost/postgres" 
 #
 # Default:
 # storage_uri = "./data"
@@ -466,4 +459,4 @@ service_uri = "https://localhost:3001/"
 # timing_child_certificate_valid_weeks = 52
 # timing_child_certificate_reissue_weeks_before = 4
 # timing_roa_valid_weeks = 52
-# timing_roa_reissue_weeks_before = 4
\ No newline at end of file
+# timing_roa_reissue_weeks_before = 4