diff --git a/helm-toolkit/Chart.yaml b/helm-toolkit/Chart.yaml
index f6e3f7987..d13bdbc3a 100644
--- a/helm-toolkit/Chart.yaml
+++ b/helm-toolkit/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Helm-Toolkit
 name: helm-toolkit
-version: 0.2.16
+version: 0.2.17
 home: https://docs.openstack.org/openstack-helm
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
 sources:
diff --git a/helm-toolkit/templates/scripts/db-backup-restore/_backup_main.sh.tpl b/helm-toolkit/templates/scripts/db-backup-restore/_backup_main.sh.tpl
index d4e104c90..7c62bc426 100755
--- a/helm-toolkit/templates/scripts/db-backup-restore/_backup_main.sh.tpl
+++ b/helm-toolkit/templates/scripts/db-backup-restore/_backup_main.sh.tpl
@@ -165,7 +165,7 @@ send_to_remote_server() {
       log ERROR "${DB_NAME}_backup" "Access denied by keystone: ${RESULT}"
       return 1
     else
-      echo $RESULT | grep -E "ConnectionError|Failed to discover available identity versions"
+      echo $RESULT | grep -E "ConnectionError|Failed to discover available identity versions|Service Unavailable"
       if [[ $? -eq 0 ]]; then
         log ERROR "${DB_NAME}_backup" "Could not reach the RGW: ${RESULT}"
         # In this case, keystone or the site/node may be temporarily down.
diff --git a/releasenotes/notes/helm-toolkit.yaml b/releasenotes/notes/helm-toolkit.yaml
index 0fe99def5..c3ba67b7a 100644
--- a/releasenotes/notes/helm-toolkit.yaml
+++ b/releasenotes/notes/helm-toolkit.yaml
@@ -23,4 +23,5 @@ helm-toolkit:
   - 0.2.14 Remove TLS_OPTION argument from s3 bucket creation job
   - 0.2.15 Adding TLS rabbitmq logic
   - 0.2.16 Add manual mode to the created backup file name
+  - 0.2.17 Update db backup/restore retry for sending to remote
 ...