diff --git a/.github/deploy/Utilities/SqlServer/Get-SpnAccessTokenToSqlServer.ps1 b/.github/deploy/Utilities/SqlServer/Get-SpnAccessTokenToSqlServer.ps1
new file mode 100644
index 00000000..9b265379
--- /dev/null
+++ b/.github/deploy/Utilities/SqlServer/Get-SpnAccessTokenToSqlServer.ps1
@@ -0,0 +1,83 @@
+
+function Get-SpnAccessTokenToSqlServer {
+
+    param (
+      [Parameter(Mandatory=$true)]
+      [ValidateNotNullOrEmpty()]
+      [string]
+      $tenantId,
+
+      [Parameter(Mandatory=$true)]
+      [ValidateNotNullOrEmpty()]
+      [string]
+      $clientId,
+
+      [Parameter(Mandatory=$true)]
+      [ValidateNotNullOrEmpty()]
+      [string]
+      $clientSecret
+    )
+
+    Write-Host "   Get access token for SPN to SQL server..." -ForegroundColor DarkYellow
+    # From: https://docs.microsoft.com/en-us/powershell/module/sqlserver/invoke-sqlcmd?view=sqlserver-ps
+$request = Invoke-RestMethod -Method POST `
+-Uri "https://login.microsoftonline.com/$tenantId/oauth2/token"`
+-Body @{ resource="https://database.windows.net/"; grant_type="client_credentials"; client_id=$dbSpn.clientId; client_secret=$dbSpn.secretText }`
+-ContentType "application/x-www-form-urlencoded"
+Throw-WhenError -output $request
+
+    $bearerToken = Get-OAuthToken `
+      -tenantId $tenantId `
+      -clientId $clientId `
+      -clientSecret $clientSecret
+
+    $managementToken = Get-OAuthToken `
+      -tenantId $tenantId `
+      -clientId $clientId `
+      -clientSecret $clientSecret `
+      -scope "https://management.core.windows.net/"
+
+    # Calling any Azure Databricks API endpoint with a SPN management token and the resource ID
+    # Will automatically add the SPN as an admin user in Databricks
+    # See https://docs.microsoft.com/en-us/azure/databricks/dev-tools/api/latest/aad/service-prin-aad-token#admin-user-login
+
+    $headers = New-Object "System.Collections.Generic.Dictionary[[String],[String]]"
+    $headers.Add("Authorization", "Bearer $bearerToken")
+    $headers.Add("X-Databricks-Azure-SP-Management-Token", "$managementToken")
+    $headers.Add("X-Databricks-Azure-Workspace-Resource-Id", "$resourceId")
+
+    # Comment
+    $Stoploop = $false
+    [int]$Retrycount = 0
+
+    do {
+      try {
+        $response = Invoke-WebRequest `
+        -Uri "https://$workspaceUrl/api/2.0/clusters/list-node-types" `
+        -Method 'GET' `
+        -Headers $headers
+
+        if ($response.StatusCode -ne 200) {
+          Write-Error $response.StatusDescription
+          throw
+        }
+
+        Write-Host "Job completed"
+        $Stoploop = $true
+      }
+      catch {
+        if ($Retrycount -gt 10){
+          throw
+          $Stoploop = $true
+        }
+        else {
+          Write-Host "  Databricks API failed. retry in 10 seconds" -ForegroundColor Red
+          Start-Sleep -Seconds 10
+          $Retrycount = $Retrycount + 1
+        }
+      }
+    } While ($Stoploop -eq $false)
+
+
+    return $bearerToken
+  }
diff --git a/.github/deploy/Utilities/SqlServer/all.ps1 b/.github/deploy/Utilities/SqlServer/all.ps1
new file mode 100644
index 00000000..e69de29b
diff --git a/.github/deploy/Utilities/all.ps1 b/.github/deploy/Utilities/all.ps1
index 66596f27..ed571c6c 100644
--- a/.github/deploy/Utilities/all.ps1
+++ b/.github/deploy/Utilities/all.ps1
@@ -3,4 +3,4 @@
 . "$PSScriptRoot\Deploy\all.ps1"
 . "$PSScriptRoot\Databricks\all.ps1"
 . "$PSScriptRoot\Graph\all.ps1"
-
+. "$PSScriptRoot\SqlServer\all.ps1"
diff --git a/.github/deploy/steps/65-Provision-Spn-db-user.ps1 b/.github/deploy/steps/65-Provision-Spn-db-user.ps1
index cc2dfaf7..d4bac92d 100644
--- a/.github/deploy/steps/65-Provision-Spn-db-user.ps1
+++ b/.github/deploy/steps/65-Provision-Spn-db-user.ps1
@@ -10,7 +10,8 @@ Graph-CreateRole -principalId $spId -roleDefinitionId 88d8e3e3-8f55-4a1e-953a-9b
 Ignore-Errors  # The role may already be there if we re-deploy
 
 Write-Host "Waiting for role to settle...." -ForegroundColor DarkYellow
-Start-Sleep -seconds 60 # If the Directory Reader is not there, increase te seconds here.
+#Start-Sleep -seconds 60 # If the Directory Reader is not there, increase te seconds here.
+#skip this and let's see where it fails
 
 $dbUserName = $mountSpn.name
 $ReadRights = $true