diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 6aa1423c6..7d44d22d9 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -209,6 +209,7 @@
                 "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Bazel.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 515caba9d..d519c0039 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -200,6 +200,7 @@
                 "{{ template_dir }}/scripts/Installers/Install-AzureCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzureDevOpsCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-AzCopy.ps1",
+                "{{ template_dir }}/scripts/Installers/Install-AzureDevSpacesCli.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-NodeLts.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-7zip.ps1",
                 "{{ template_dir }}/scripts/Installers/Install-Packer.ps1",
diff --git a/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1 b/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1
new file mode 100644
index 000000000..5f37fc581
--- /dev/null
+++ b/images/win/scripts/Installers/Install-AzureDevSpacesCLI.ps1
@@ -0,0 +1,10 @@
+################################################################################
+##  File:  Install-AzureDevSpacesCLI.ps1
+##  Desc:  Install Azure Dev Spaces CLI
+################################################################################
+
+# Install Azure Dev Spaces CLI
+Install-Binary -Url "https://aka.ms/get-azds-windows" -Name "Azure Dev Spaces CLI.exe" -ArgumentList ("/quiet")
+Add-MachinePathItem -PathItem "C:\Program Files\Microsoft SDKs\Azure\Azure Dev Spaces CLI"
+
+Invoke-PesterTests -TestFile "CLI.Tools" -TestName "Azure Dev Spaces CLI"
\ No newline at end of file
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index cc6130260..1aad21f29 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -112,6 +112,7 @@ $markdown += New-MDHeader "CLI Tools" -Level 3
 $markdown += New-MDList -Style Unordered -Lines @(
     (Get-AzureCLIVersion),
     (Get-AzureDevopsExtVersion),
+    (Get-AZDSVersion),
     (Get-AWSCLIVersion),
     (Get-AWSSAMVersion),
     (Get-AWSSessionManagerVersion),
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index e7235408f..760b03d3c 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -246,4 +246,9 @@ function Get-VisualCPPComponents {
             }
         }
     }
-}
\ No newline at end of file
+}
+
+function Get-AZDSVersion {
+    $azdsVersion = $(azds --version) | Select-String "(\d+\.\d+\.\d+.\d+)"
+    return "Azure Dev Spaces CLI $azdsVersion"
+}
diff --git a/images/win/scripts/Tests/CLI.Tools.Tests.ps1 b/images/win/scripts/Tests/CLI.Tools.Tests.ps1
index d230fcfcd..807914056 100644
--- a/images/win/scripts/Tests/CLI.Tools.Tests.ps1
+++ b/images/win/scripts/Tests/CLI.Tools.Tests.ps1
@@ -53,4 +53,10 @@ Describe "Hub CLI" {
     It "hub is installed" {
         "hub --version" | Should -ReturnZeroExitCode
     }
+}
+
+Describe "Azure Dev Spaces CLI" {
+    It "Azure Dev Spaces CLI" {
+        "azds --version" | Should -ReturnZeroExitCode
+    }
 }
\ No newline at end of file