diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02a9c57..0dbc67a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- Fixed issue in Reverse DSC that affected collection query capture
+when collection queries have quotes.
+
 ## [3.0.0] - 2022-01-03
 
 ### Added
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fd7dfd5..a8ef738 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -24,12 +24,15 @@ stages:
         pool:
           vmImage: 'ubuntu 18.04'
         steps:
-          - task: GitVersion@5
-            name: gitVersion
-            displayName: 'Evaluate Next Version'
-            inputs:
-              runtime: 'core'
-              configFilePath: 'GitVersion.yml'
+          - pwsh: |
+              dotnet tool install --global GitVersion.Tool
+              $gitVersionObject = dotnet-gitversion | ConvertFrom-Json
+              $gitVersionObject.PSObject.Properties.ForEach{
+                  Write-Host -Object "Setting Task Variable '$($_.Name)' with value '$($_.Value)'."
+                  Write-Host -Object "##vso[task.setvariable variable=$($_.Name);]$($_.Value)"
+              }
+              Write-Host -Object "##vso[build.updatebuildnumber]$($gitVersionObject.FullSemVer)"
+            displayName: Calculate ModuleVersion (GitVersion)
           - task: PowerShell@2
             name: package
             displayName: 'Build & Package Module'
@@ -38,7 +41,7 @@ stages:
               arguments: '-ResolveDependency -tasks pack'
               pwsh: true
             env:
-              ModuleVersion: $(gitVersion.InformationalVersion)
+              ModuleVersion: $(NuGetVersionV2)
           - task: PublishBuildArtifacts@1
             displayName: 'Publish Build Artifact'
             inputs:
diff --git a/source/Modules/ConfigMgrCBDsc.ReverseDsc/ConfigMgrCBDsc.ReverseDsc.psm1 b/source/Modules/ConfigMgrCBDsc.ReverseDsc/ConfigMgrCBDsc.ReverseDsc.psm1
index 5c8e480..34a6b79 100644
--- a/source/Modules/ConfigMgrCBDsc.ReverseDsc/ConfigMgrCBDsc.ReverseDsc.psm1
+++ b/source/Modules/ConfigMgrCBDsc.ReverseDsc/ConfigMgrCBDsc.ReverseDsc.psm1
@@ -314,7 +314,7 @@ function Set-OutFile
         {
             $tester += "`t`t`t@{`r`n"
             $tester += "`t`t`t`tRuleName        = '$($item.RuleName)'`r`n"
-            $tester += "`t`t`t`tQueryExpression = '$($item.QueryExpression)'`r`n"
+            $tester += "`t`t`t`tQueryExpression = '$($item.QueryExpression.Replace("'","''"))'`r`n"
             $tester += "`t`t`t}`r`n"
         }
         $tester += "`t`t)`r`n"