diff --git a/packages/deployer/test/records/application-deployment-request.yml b/packages/deployer/test/records/application-deployment-request.yml
index 6ae71a6..17fee5f 100644
--- a/packages/deployer/test/records/application-deployment-request.yml
+++ b/packages/deployer/test/records/application-deployment-request.yml
@@ -6,8 +6,8 @@ record:
   dns: deployment-ci-test
   config:
     env:
-      CERC_TEST_WEBAPP_CONFIG1: deployment test config 1
-      CERC_TEST_WEBAPP_CONFIG2: deployment test config 2
+      CERC_TEST_WEBAPP_CONFIG1: "deployment test config 1"
+      CERC_TEST_WEBAPP_CONFIG2: "deployment test config 2"
       CERC_WEBAPP_DEBUG: 0
   meta:
     note: Deployment test @ Thu 11 Apr 2024 07:29:19 AM UTC
diff --git a/packages/deployer/test/test-webapp-deployment.sh b/packages/deployer/test/test-webapp-deployment.sh
index e198b50..68600be 100755
--- a/packages/deployer/test/test-webapp-deployment.sh
+++ b/packages/deployer/test/test-webapp-deployment.sh
@@ -97,7 +97,7 @@ echo $DEPLOYMENT_REQUEST_ID
 
 # Deployment checks
 RETRY_INTERVAL=30
-MAX_RETRIES=10
+MAX_RETRIES=20
 
 # Check that a ApplicationDeploymentRecord is published
 retry_count=0
@@ -163,7 +163,7 @@ echo $REMOVAL_REQUEST_ID
 # Check that a ApplicationDeploymentRemovalRecord is published
 retry_count=0
 while true; do
-  removal_records_response=$(yarn --silent laconic -c $CONFIG_FILE cns record list --type ApplicationDeploymentRemovalRecord --all --name "$APP_NAME" request $REMOVAL_REQUEST_ID)
+  removal_records_response=$(yarn --silent laconic -c $CONFIG_FILE cns record list --type ApplicationDeploymentRemovalRecord --all request $REMOVAL_REQUEST_ID)
   len_removal_records=$(echo $removal_records_response | jq 'length')
 
   # Check if number of records returned is 0
@@ -180,7 +180,7 @@ while true; do
     fi
   else
     echo "ApplicationDeploymentRemovalRecord found"
-    REMOVAL_RECORD_ID=$(echo $deployment_records_response | jq -r '.[0].id')
+    REMOVAL_RECORD_ID=$(echo $removal_records_response | jq -r '.[0].id')
     echo $REMOVAL_RECORD_ID
     break
   fi