diff --git a/deploy/operations/ci/aws-1/test.sh b/deploy/operations/ci/aws-1/test.sh
index 413149e69..7ec6de01e 100755
--- a/deploy/operations/ci/aws-1/test.sh
+++ b/deploy/operations/ci/aws-1/test.sh
@@ -37,7 +37,7 @@ kubectl apply -f "aws_auth_config_map.yml"
 cd "$BASEDIR/../../../services/helm-charts/dss"
 RELEASE_NAME="dss"
 helm dep update --kube-context="$KUBE_CONTEXT"
-helm upgrade --install --kube-context="$KUBE_CONTEXT" -f "${WORKSPACE_LOCATION}/helm_values.yml" "$RELEASE_NAME" .
+helm upgrade --install --kube-context="$KUBE_CONTEXT" -f "${WORKSPACE_LOCATION}/helm_values.yml" --wait --wait-for-jobs --timeout 15m "$RELEASE_NAME" .
 
 # TODO: Test the deployment of the DSS
 
@@ -48,7 +48,7 @@ fi
 
 # Cleanup
 # Delete workloads
-helm uninstall --kube-context="$KUBE_CONTEXT" "$RELEASE_NAME"
+helm uninstall --kube-context="$KUBE_CONTEXT" --wait --timeout 15m "$RELEASE_NAME"
 
 # Delete PVC to delete persistant volumes
 kubectl delete pvc --all=true