diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml
index 6e6a28383b..4cbb8fa101 100644
--- a/inventory/service/groups.yaml
+++ b/inventory/service/groups.yaml
@@ -36,7 +36,18 @@ groups:
   backup-server:
     - backup01.ca-ymq-1.vexxhost.opendev.org
   borg-backup:
+    - etherpad[0-9]*.opendev.org
+    - gitea01.opendev.org
+    - review[0-9]*.openstack.org
+    - review-dev[0-9]*.open*.org
+    - zuul[0-9]*.open*.org
+    # All these servers are "special-cased" in specifically
+    # as they are puppet and should be replaced "soon"
     - ethercalc02.openstack.org
+    - ask01.openstack.org
+    - lists.openstack.org
+    - storyboard01.opendev.org
+    - translate01.openstack.org
   borg-backup-server:
     - backup02.ca-ymq-1.vexxhost.opendev.org
     - backup01.ord.rax.opendev.org
diff --git a/inventory/service/host_vars/zuul01.openstack.org b/inventory/service/host_vars/zuul01.openstack.org
index 7c06ced676..397eb226a4 100644
--- a/inventory/service/host_vars/zuul01.openstack.org
+++ b/inventory/service/host_vars/zuul01.openstack.org
@@ -3,3 +3,6 @@ letsencrypt_certs:
   zuul-opendev-main:
     - zuul.opendev.org
     - zuul.openstack.org
+borg_backup_excludes_extra:
+  - /var/lib/zuul/backup/*
+  - /var/lib/zuul/times/*
diff --git a/playbooks/roles/borg-backup/defaults/main.yaml b/playbooks/roles/borg-backup/defaults/main.yaml
index 1d7cb4c3cb..db3177f407 100644
--- a/playbooks/roles/borg-backup/defaults/main.yaml
+++ b/playbooks/roles/borg-backup/defaults/main.yaml
@@ -3,6 +3,8 @@ borg_backup_excludes:
   - '/home/*.cache/*'
   - '/var/cache/*'
   - '/var/tmp/*'
+  - '/var/run/*'
+  - '/var/lock/*'
   - '/var/lib/lxcfs/*'
   - '/var/lib/docker/*'
 borg_backup_excludes_extra: []
diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
index c43ccbd034..ae59ded35d 100644
--- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
+++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
@@ -40,6 +40,7 @@ results:
 
   review01.openstack.org:
     - backup
+    - borg-backup
     - gerrit
     - letsencrypt
     - review