diff --git a/.github/azure/deployVM.ps1 b/.github/azure/deployVM.ps1
index 4b36e85611..b2715feb2e 100644
--- a/.github/azure/deployVM.ps1
+++ b/.github/azure/deployVM.ps1
@@ -31,6 +31,10 @@ param(
     [string]
     $serverName,
 
+    [Parameter(Mandatory = $True)]
+    [string]
+    $vmImage,
+
     [Parameter(Mandatory = $True)]
     [string]
     $adminLogin,
@@ -81,7 +85,7 @@ try {
     az vm create  `
         --resource-group $resourceGroupName `
         --name $serverName `
-        --image testgpu-image-20200219162635 `
+        --image $vmImage `
         --admin-username $adminLogin `
         --admin-password $adminPassword
     }
diff --git a/.github/workflows/pytest-gpu.yml b/.github/workflows/pytest-gpu.yml
index 1cb0bcde6f..162bbb6a79 100644
--- a/.github/workflows/pytest-gpu.yml
+++ b/.github/workflows/pytest-gpu.yml
@@ -30,7 +30,8 @@ jobs:
       env:
         RESOURCE_GROUP: ${{ secrets.RESOURCE_GROUP }}
         RESOURCE_GROUP_REGION: uksouth
-        SERVER_NAME: gpu_ci_vm
+        SERVER_NAME: gpu_ci_vm_${{ steps.extract_branch.outputs.branch }}
+        IMAGE: gpu_ci_vm-image-21022020
       run: >
         pwsh -command "& '${{ env.OUTPUT_PATH }}\.github\azure\deployVM.ps1'"
         -servicePrincipal ${{ secrets.SERVICE_PRINCIPAL_APPID }}
@@ -40,6 +41,7 @@ jobs:
         -resourceGroupName $RESOURCE_GROUP
         -resourceGroupNameRegion $RESOURCE_GROUP_REGION
         -serverName $SERVER_NAME
+        -vmImage $IMAGE
         -adminLogin ${{ secrets.ADMIN_LOGIN }}
         -adminPassword ${{ secrets.ADMIN_PASSWORD }}
 
@@ -58,6 +60,10 @@ jobs:
           source ~/anaconda3/etc/profile.d/conda.sh
           conda activate devito
           cd ~/programs/devito
+          # Ensure no merge conflicts arise
+          git checkout master
+          git rev-parse --verify --quiet ${{ steps.extract_branch.outputs.branch }}
+          if [ $? -eq 0 ]; then git branch -D ${{ steps.extract_branch.outputs.branch }}; fi
           git fetch
           git checkout ${{ steps.extract_branch.outputs.branch }}
           git pull
diff --git a/tests/test_gpu.py b/tests/test_gpu.py
index 476a12822f..8b3252674f 100644
--- a/tests/test_gpu.py
+++ b/tests/test_gpu.py
@@ -111,4 +111,4 @@ def test_iso_ac(self):
         op = Operator([stencil] + src_term + rec_term, dle=('advanced', {'openmp': True}))
         op(time=time_range.num-1, dt=dt)
 
-        assert np.isclose(norm(rec), 495.54, atol=1e-1, rtol=0)
+        assert np.isclose(norm(rec), 490.54, atol=1e-2, rtol=0)