diff --git a/.github/workflows/database-backup.yml b/.github/workflows/database-backup.yml
index 9edccca3..b535fba8 100644
--- a/.github/workflows/database-backup.yml
+++ b/.github/workflows/database-backup.yml
@@ -34,7 +34,7 @@ jobs:
     name: Backup database
     runs-on: ubuntu-latest
     environment:
-      name: ${{ inputs.environment || 'production' }}
+      name: aks-${{ inputs.environment || 'production' }}
     env:
       DEPLOY_ENV: ${{ inputs.environment || 'production'  }}
       BACKUP_FILE: ${{ inputs.backup-file || 'schedule'  }}
@@ -66,7 +66,7 @@ jobs:
         with:
           storage-account: ${{ env.STORAGE_ACCOUNT_NAME }}
           resource-group: ${{ env.RESOURCE_GROUP_NAME }}
-          app-name: ${{ env.SERVICE_SHORT }}-${{ env.DEPLOY_ENV }}-api
+          app-name: ${{ env.SERVICE_NAME }}-${{ env.DEPLOY_ENV }}
           cluster: ${{ env.CLUSTER }}
           azure-credentials: ${{ secrets.AZURE_CREDENTIALS }}
           backup-file: ${{ env.BACKUP_FILE }}.sql
diff --git a/terraform/application/config/test.tfvars.json b/terraform/application/config/test.tfvars.json
index 98ec3cce..f4463dfb 100644
--- a/terraform/application/config/test.tfvars.json
+++ b/terraform/application/config/test.tfvars.json
@@ -1,5 +1,6 @@
 {
   "cluster": "test",
   "namespace": "tra-test",
-  "evidence_container_retention_in_days": 1
+  "evidence_container_retention_in_days": 1,
+  "enable_postgres_backup_storage": true
 }