diff --git a/operator/charts/patroni-services/templates/powa-ui/powa-backend-tls-policy.yaml b/operator/charts/patroni-services/templates/powa-ui/powa-backend-tls-policy.yaml
index 56379c0..9889715 100644
--- a/operator/charts/patroni-services/templates/powa-ui/powa-backend-tls-policy.yaml
+++ b/operator/charts/patroni-services/templates/powa-ui/powa-backend-tls-policy.yaml
@@ -4,6 +4,8 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: BackendTLSPolicy
 metadata:
   name: powa-ui-backend-tls-policy
+  labels:
+    {{ include "kubernetes.labels" . | nindent 4 }}
 spec:
   targetRefs:
   - group: ""
diff --git a/operator/charts/patroni-services/templates/powa-ui/powa-gateway-deployment.yaml b/operator/charts/patroni-services/templates/powa-ui/powa-gateway-deployment.yaml
index aa0ce46..2255bbb 100644
--- a/operator/charts/patroni-services/templates/powa-ui/powa-gateway-deployment.yaml
+++ b/operator/charts/patroni-services/templates/powa-ui/powa-gateway-deployment.yaml
@@ -4,6 +4,8 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: powa-ui-httproute
+  labels:
+    {{ include "kubernetes.labels" . | nindent 4 }}
 spec:
   parentRefs:
   - name: {{ .Values.powaUI.ingress.gatewayName | default "default-external-gateway" }}
diff --git a/operator/charts/patroni-services/templates/powa-ui/powa-http-route.yaml b/operator/charts/patroni-services/templates/powa-ui/powa-http-route.yaml
index 27ff3ea..77b64e6 100644
--- a/operator/charts/patroni-services/templates/powa-ui/powa-http-route.yaml
+++ b/operator/charts/patroni-services/templates/powa-ui/powa-http-route.yaml
@@ -4,6 +4,8 @@ apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
   name: powa-ui-frontend-redirect
+  labels:
+    {{ include "kubernetes.labels" . | nindent 4 }}
 spec:
   parentRefs:
   - name: {{ .Values.powaUI.ingress.gatewayName | default "default-external-gateway" }}
diff --git a/services/backup-daemon/docker/granular/pg_backup.py b/services/backup-daemon/docker/granular/pg_backup.py
index d51900b..6a3fccc 100644
--- a/services/backup-daemon/docker/granular/pg_backup.py
+++ b/services/backup-daemon/docker/granular/pg_backup.py
@@ -525,7 +525,8 @@ def process_backup_request(self):
                 self.backup_single_database(database)
                 self.on_success(database)
             except Exception as e:  # Call on_failure here to mark database backup failed on any exception.
-                self.on_failure(database, e)
+                if not self.is_cancelled():
+                    self.on_failure(database, e)
                 raise e
             finally:
                 self.cleanup(database)
@@ -573,6 +574,8 @@ def run(self):
             self._mark_done(backups.BackupStatus.SUCCESSFUL)
             self.log.info(self.log_msg("Backup request processing has been completed."))
         except Exception as e:
+            if self.is_cancelled():
+                return
             self.log.exception(self.log_msg("Backup request processing has failed."))
             self.update_status('errorMessage', f'Backup failed: {e}')
             self._mark_done(backups.BackupStatus.FAILED)
diff --git a/tests/robot/check_terminate_backup_api/keywords.robot b/tests/robot/check_terminate_backup_api/keywords.robot
index 0a303ec..e3a7fd4 100644
--- a/tests/robot/check_terminate_backup_api/keywords.robot
+++ b/tests/robot/check_terminate_backup_api/keywords.robot
@@ -37,4 +37,4 @@ Prepare Auth
     ${POSTGRES_USER}=  Get Environment Variable  POSTGRES_USER  default=postgres
     ${PG_ROOT_PASSWORD}=  Get Environment Variable  PG_ROOT_PASSWORD
     ${auth}=  Create List  ${POSTGRES_USER}  ${PG_ROOT_PASSWORD}
-    reterun  ${auth}
+    [Return]  ${auth}