diff --git a/tests/roles/setup_check_pgbackrest/defaults/main.yml b/tests/roles/setup_check_pgbackrest/defaults/main.yml
index 1a32132..17edead 100644
--- a/tests/roles/setup_check_pgbackrest/defaults/main.yml
+++ b/tests/roles/setup_check_pgbackrest/defaults/main.yml
@@ -10,6 +10,7 @@ build_packages:
   Debian:
     - libjson-perl
     - libdata-dump-perl
+    - perl-doc
   RedHat:
     - nagios-plugins
     - perl-JSON
diff --git a/tests/roles/setup_check_pgbackrest/tasks/icinga2-config.yml b/tests/roles/setup_check_pgbackrest/tasks/icinga2-config.yml
index 486d961..7f2d365 100644
--- a/tests/roles/setup_check_pgbackrest/tasks/icinga2-config.yml
+++ b/tests/roles/setup_check_pgbackrest/tasks/icinga2-config.yml
@@ -230,7 +230,7 @@
   loop: "{{ pgbackrest_servers }}"
   when: "'icinga2' in group_names"
 
-- name: Create Icinga2 check retention services for repo host
+- name: Create Icinga2 check archives services for repo host
   telekom_mms.icinga_director.icinga_service:
     state: present
     url: "{{ icinga_url }}"
diff --git a/tests/roles/setup_pgbackrest/templates/pgbackrest-dbserver.conf.j2 b/tests/roles/setup_pgbackrest/templates/pgbackrest-dbserver.conf.j2
index b3542b2..b6c5356 100644
--- a/tests/roles/setup_pgbackrest/templates/pgbackrest-dbserver.conf.j2
+++ b/tests/roles/setup_pgbackrest/templates/pgbackrest-dbserver.conf.j2
@@ -25,6 +25,8 @@ repo1-storage-verify-tls=n
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 start-fast=y
 {% elif pgbackrest_repo_type == "azure" %}
 repo1-type=azure
@@ -37,6 +39,8 @@ repo1-storage-verify-tls=n
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 start-fast=y
 {% elif pgbackrest_repo_type == "multi" %}
 repo1-type=s3
@@ -51,6 +55,8 @@ repo1-storage-verify-tls=n
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 repo2-type=azure
 repo2-path=/repo2
 repo2-storage-host={{ pgbackrest_repo_azure_host }}
@@ -61,6 +67,8 @@ repo2-storage-verify-tls=n
 repo2-retention-full={{ pgbackrest_repo_retention_full }}
 repo2-cipher-type=aes-256-cbc
 repo2-cipher-pass={{ pgbackrest_repo2_cipher_pass }}
+repo2-bundle=y
+repo2-block=y
 start-fast=y
 {% else %}
 repo1-type=posix
@@ -68,6 +76,8 @@ repo1-path={{ pgbackrest_repo_path }}
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 start-fast=y
 {% endif %}
 log-level-console=info
diff --git a/tests/roles/setup_pgbackrest/templates/pgbackrest-repository.conf.j2 b/tests/roles/setup_pgbackrest/templates/pgbackrest-repository.conf.j2
index 42762ff..af826fe 100644
--- a/tests/roles/setup_pgbackrest/templates/pgbackrest-repository.conf.j2
+++ b/tests/roles/setup_pgbackrest/templates/pgbackrest-repository.conf.j2
@@ -12,6 +12,8 @@ repo1-storage-verify-tls=n
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 {% elif pgbackrest_repo_type == "azure" %}
 repo1-type=azure
 repo1-path=/repo1
@@ -23,6 +25,8 @@ repo1-storage-verify-tls=n
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 {% elif pgbackrest_repo_type == "multi" %}
 repo1-type=s3
 repo1-path=/repo1
@@ -36,6 +40,8 @@ repo1-storage-verify-tls=n
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 repo2-type=azure
 repo2-path=/repo2
 repo2-storage-host={{ pgbackrest_repo_azure_host }}
@@ -46,12 +52,16 @@ repo2-storage-verify-tls=n
 repo2-retention-full={{ pgbackrest_repo_retention_full }}
 repo2-cipher-type=aes-256-cbc
 repo2-cipher-pass={{ pgbackrest_repo2_cipher_pass }}
+repo2-bundle=y
+repo2-block=y
 {% else %}
 repo1-type=posix
 repo1-path={{ pgbackrest_repo_path }}
 repo1-retention-full={{ pgbackrest_repo_retention_full }}
 repo1-cipher-type=aes-256-cbc
 repo1-cipher-pass={{ pgbackrest_repo1_cipher_pass }}
+repo1-bundle=y
+repo1-block=y
 {% endif %}
 log-level-console=info
 log-level-file=debug