diff --git a/.github/workflows/deploy-test-monitoring-DO.yml b/.github/workflows/deploy-test-monitoring-DO.yml
index 364e5ad..5d77d71 100644
--- a/.github/workflows/deploy-test-monitoring-DO.yml
+++ b/.github/workflows/deploy-test-monitoring-DO.yml
@@ -12,21 +12,19 @@ env:
   DROPLET_SIZE: "s-2vcpu-4gb-120gb-intel"
   DROPLET_REGION: "fra1"
   DROPLET_IMAGE: "ubuntu-22-04-x64"
-  VPC_UUID: "${{ secrets.VPC_ID }}"
+  VPC_UUID: "your-vpc-uuid"
 
 jobs:
   create-run-test-destroy:
     runs-on: ubuntu-latest
     steps:
-      # Checkout the code
       - name: Checkout code
         uses: actions/checkout@v3
 
-      # Create a DigitalOcean Droplet
       - name: Create DigitalOcean Droplet
         id: create_droplet
         run: |
-          curl -X POST -H 'Content-Type: application/json' \
+          DROPLET_ID=$(curl -X POST -H 'Content-Type: application/json' \
             -H "Authorization: Bearer ${{ secrets.DO_API_TOKEN }}" \
             -d '{
               "name": "${{ env.DROPLET_NAME }}",
@@ -36,50 +34,56 @@ jobs:
               "vpc_uuid": "${{ env.VPC_UUID }}",
               "ssh_keys": ["${{ secrets.SSH_KEY_ID }}"]
             }' \
-            $DO_API_URL
-          echo "::set-output name=droplet_id::$(jq -r '.droplet.id')"
+            $DO_API_URL | jq -r '.droplet.id')
+          echo "droplet_id=${DROPLET_ID}" >> $GITHUB_ENV
 
-      # Wait for the droplet to become active
       - name: Wait for Droplet to be Active
         run: |
-          while [ "$(curl -X GET -H 'Content-Type: application/json' \
-            -H 'Authorization: Bearer ${{ secrets.DO_API_TOKEN }}' \
-            "https://api.digitalocean.com/v2/droplets/${{ steps.create_droplet.outputs.droplet_id }}" | jq -r '.droplet.status')" != "active" ]; do
-              echo "Waiting for droplet to be active..."
+          for i in {1..15}; do
+            DROPLET_STATUS=$(curl -X GET -H 'Content-Type: application/json' \
+              -H "Authorization: Bearer ${{ secrets.DO_API_TOKEN }}" \
+              "https://api.digitalocean.com/v2/droplets/${{ env.droplet_id }}" | jq -r '.droplet.status')
+
+            if [ "$DROPLET_STATUS" == "active" ]; then
+              echo "Droplet is active!"
+              break
+            else
+              echo "Waiting for droplet to be active... Current status: $DROPLET_STATUS"
               sleep 10
+            fi
+
+            if [ "$i" -eq 15 ]; then
+              echo "Droplet did not become active in time."
+              exit 1
+            fi
           done
 
-      # Fetch Droplet IP Address
       - name: Fetch Droplet IP Address
         id: get_ip
         run: |
           IP_ADDRESS=$(curl -X GET -H 'Content-Type: application/json' \
-            -H 'Authorization: Bearer ${{ secrets.DO_API_TOKEN }}' \
-            "https://api.digitalocean.com/v2/droplets/${{ steps.create_droplet.outputs.droplet_id }}" | jq -r '.droplet.networks.v4[0].ip_address')
-          echo "::set-output name=ip::${IP_ADDRESS}"
+            -H "Authorization: Bearer ${{ secrets.DO_API_TOKEN }}" \
+            "https://api.digitalocean.com/v2/droplets/${{ env.droplet_id }}" | jq -r '.droplet.networks.v4[0].ip_address')
+          echo "ip=${IP_ADDRESS}" >> $GITHUB_ENV
 
-      # Run the Ansible Playbook on the droplet
       - name: Run Ansible Playbook
         uses: dawidd6/action-ansible-playbook@v2
         with:
           playbook: playbooks/site.yml
           inventory: inventory/inventory.yml
-          extra_args: "-i ${{ steps.get_ip.outputs.ip }}, -u root --private-key ${{ secrets.SSH_PRIVATE_KEY }}"
-        
-      # Install pytest and run tests
+          extra_args: "-i ${{ env.ip }}, -u root --private-key ${{ secrets.SSH_PRIVATE_KEY }}"
+
       - name: Install and Run pytest
         run: |
           pip install pytest testinfra
           pytest --ansible-inventory=./inventory/inventory.yml --force-ansible --connection=ansible
 
-      # Destroy the droplet after the test
       - name: Destroy DigitalOcean Droplet
         run: |
           curl -X DELETE -H 'Content-Type: application/json' \
             -H "Authorization: Bearer ${{ secrets.DO_API_TOKEN }}" \
-            "https://api.digitalocean.com/v2/droplets/${{ steps.create_droplet.outputs.droplet_id }}"
+            "https://api.digitalocean.com/v2/droplets/${{ env.droplet_id }}"
 
-      # Archive test results
       - name: Archive Test Results
         uses: actions/upload-artifact@v3
         with: