diff --git a/IMAGES.md b/IMAGES.md
index d844be722..a8a5107cf 100644
Binary files a/IMAGES.md and b/IMAGES.md differ
diff --git a/README.md b/README.md
index a9ae83a37..45bd8d51a 100644
Binary files a/README.md and b/README.md differ
diff --git a/Update-Readme.ps1 b/Update-Documentation.ps1
similarity index 100%
rename from Update-Readme.ps1
rename to Update-Documentation.ps1
diff --git a/sitecore-packages.json b/sitecore-packages.json
index 8e142b8e2..aaf630e0a 100644
--- a/sitecore-packages.json
+++ b/sitecore-packages.json
@@ -190,7 +190,7 @@
   "Sitecore Experience Accelerator XM 1.8.1 rev. 190319 for 9.1.1.scwdp.zip": {
     "description": "Sitecore Experience Accelerator 1.8 Update-1",
     "url": "https://dev.sitecore.net/~/media/F8CFFFD23CD54178B5749B0ECACB5813.ashx"
-  }, 
+  },
   "Sitecore Experience Accelerator XM 1.8.1 rev. 190319 for 9.1.1 CD.scwdp.zip": {
     "description": "Sitecore Experience Accelerator 1.8 Update-1",
     "url": "https://dev.sitecore.net/~/media/768039F8BCB24FB5A78AA99AD4391A20.ashx"
@@ -294,5 +294,21 @@
   "Web Forms for Marketers 9.0 rev. 180503.zip": {
     "description": "Web Forms for Marketers 9.0 Update-2",
     "url": "https://dev.sitecore.net/~/media/3BFEB7C427D040178E619522EA272ECC.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522 CD.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server CD WDP for Sitecore 9.2 XM",
+    "url": "https://dev.sitecore.net/~/media/AEB49B787A534166A6C7D6B377367776.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522 CD.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server CD WDP for Sitecore 9.2 XP",
+    "url": "https://dev.sitecore.net/~/media/187F48001A174051A7B085377838295F.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server WDP for Sitecore 9.2 XM",
+    "url": "https://dev.sitecore.net/~/media/305523FA736948C9855A8B0539FF1680.ashx"
+  },
+  "Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip": {
+    "description": "Sitecore JavaScript Services Server WDP for Sitecore 9.2 XP",
+    "url": "https://dev.sitecore.net/~/media/1D5D53DE1F4B43E8B3D70E0D0EE40A5D.ashx"
   }
 }
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile b/windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile
new file mode 100644
index 000000000..d961bf35b
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/Dockerfile
@@ -0,0 +1,21 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+ARG ASSETS_USE_WDP
+
+ENV INSTALL_PATH='C:\\install\\' `
+    INSTALL_MODULE_PATH='C:\\install-module\\' `
+    DATA_PATH='C:\\data\\' `
+    TEMP_PATH='c:\\temp'
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "${INSTALL_MODULE_PATH}"]
+COPY . ${INSTALL_MODULE_PATH}
+
+RUN & (Join-Path $env:INSTALL_MODULE_PATH "\\Extract-Databases.ps1") -Path $env:INSTALL_MODULE_PATH; `
+    & (Join-Path $env:INSTALL_MODULE_PATH "\\Install-Databases.ps1") -InstallPath $env:INSTALL_PATH -DataPath $env:DATA_PATH -ModulePath $env:INSTALL_MODULE_PATH -DatabasePrefix Sitecore; `
+    Get-ChildItem -Path $env:INSTALL_PATH -Exclude "*.mdf", "*.ldf" | Remove-Item -Force; `
+    Get-ChildItem -Path $env:INSTALL_MODULE_PATH | Remove-Item -Force;
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1 b/windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1
new file mode 100644
index 000000000..9b7b11d7c
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/Extract-Databases.ps1
@@ -0,0 +1,35 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })]
+    [string]$Path
+)
+
+Add-Type -Assembly "System.IO.Compression"
+Add-Type -Assembly "System.IO.Compression.FileSystem"
+
+Get-ChildItem -Path $Path -Filter "*.zip" | ForEach-Object {
+    $zipPath = $_.FullName
+
+    try
+    {
+        $stream = New-Object IO.FileStream($zipPath, [IO.FileMode]::Open)
+        $zip = New-Object IO.Compression.ZipArchive($stream, [IO.Compression.ZipArchiveMode]::Read)
+
+        ($zip.Entries | Where-Object { $_.FullName -like "*.dacpac" }) | Foreach-Object {
+            [IO.Compression.ZipFileExtensions]::ExtractToFile($_, (Join-Path $Path $_.Name), $true)
+        }
+    }
+    finally
+    {
+        if ($zip -ne $null)
+        {
+            $zip.Dispose()
+        }
+
+        if ($stream -ne $null)
+        {
+            $stream.Dispose()
+        }
+    }
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1 b/windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1
new file mode 100644
index 000000000..d9ef08c20
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/Install-Databases.ps1
@@ -0,0 +1,61 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$InstallPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$DataPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$ModulePath,
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()] 
+    [string]$DatabasePrefix
+)
+
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | Out-Null
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $InstallPath
+$server.Properties["DefaultLog"].Value = $InstallPath
+$server.Alter()
+
+$sqlPackageExePath = Get-Item "C:\Program Files\Microsoft SQL Server\*\DAC\bin\SqlPackage.exe" | Select-Object -Last 1 -Property FullName -ExpandProperty FullName
+
+# attach
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+    $mdfPath = $_.FullName
+    $ldfPath = $mdfPath.Replace(".mdf", ".ldf")
+    $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath'), (FILENAME = N'$ldfPath') FOR ATTACH;"
+
+    Write-Host "### Attaching '$databaseName'..."
+
+    Invoke-Sqlcmd -Query $sqlcmd
+}
+
+# do modules
+$TextInfo = (Get-Culture).TextInfo
+Get-ChildItem -Path $ModulePath -Include "core.dacpac", "master.dacpac" -Recurse | ForEach-Object { 
+
+    $dacpacPath = $_.FullName
+    $databaseName = "$DatabasePrefix`." + $TextInfo.ToTitleCase($_.BaseName)
+
+    # Install
+    & $sqlPackageExePath /a:Publish /sf:$dacpacPath /tdn:$databaseName /tsn:$env:COMPUTERNAME /q
+} 
+
+# detach DB
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+
+    Write-Host "### Detach: $databaseName"
+
+    Invoke-Sqlcmd -Query "EXEC MASTER.dbo.sp_detach_db @dbname = N'$databaseName', @keepfulltextindexfile = N'false'"
+}
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $DataPath
+$server.Properties["DefaultLog"].Value = $DataPath
+$server.Alter()
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss-sqldev/build.json b/windows/9.2.x/sitecore-xm-jss-sqldev/build.json
new file mode 100644
index 000000000..127b0407a
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss-sqldev/build.json
@@ -0,0 +1,14 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xm-jss-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=sitecore-xm-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xm-jss/Dockerfile b/windows/9.2.x/sitecore-xm-jss/Dockerfile
new file mode 100644
index 000000000..8f77f4573
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss/Dockerfile
@@ -0,0 +1,29 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG ASSETS_USE_WDP
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"]
+
+# expand selected wdp into installation directory
+RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; `
+    Copy-Item -Path 'C:\\temp\\Content\\Website\\*' -Destination 'C:\\inetpub\\wwwroot' -Recurse -Force;
+
+# copy tools and transforms
+COPY --from=assets ["C:\\install\\tools\\", "C:\\install\\tools\\"]
+
+# find transform files and do transformation
+RUN (Get-ChildItem -Path 'C:\\inetpub\\wwwroot\\*.xdt' -Recurse ) | ForEach-Object { & 'C:\\install\\tools\\scripts\\Invoke-XdtTransform.ps1' -Path 'C:\\inetpub\\wwwroot\\web.config' -XdtPath $_.FullName -XdtDllPath 'C:\\install\\tools\\bin\\Microsoft.Web.XmlTransform.dll'; }; 
+
+FROM $BASE_IMAGE
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+COPY --from=build ["C:\\inetpub\\wwwroot\\", "C:\\inetpub\\wwwroot\\"]
+
diff --git a/windows/9.2.x/sitecore-xm-jss/build.json b/windows/9.2.x/sitecore-xm-jss/build.json
new file mode 100644
index 000000000..9faf6b465
--- /dev/null
+++ b/windows/9.2.x/sitecore-xm-jss/build.json
@@ -0,0 +1,25 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xm-jss-cm:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xm-cm:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cm",
+        "--build-arg SC_ROLE_DEFINE='ContentManagement, Indexing'"
+      ]
+    },
+    {
+      "tag": "sitecore-xm-jss-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xm-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XM 12.0.0 rev. 190522 CD.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=.\\config\\cd",
+        "--build-arg SC_ROLE_DEFINE='ContentDelivery'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile b/windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile
new file mode 100644
index 000000000..80411e619
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/Dockerfile
@@ -0,0 +1,22 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+ARG ASSETS_USE_WDP
+
+ENV INSTALL_PATH='C:\\install\\' `
+    INSTALL_MODULE_PATH='C:\\install-module\\' `
+    DATA_PATH='C:\\data\\' `
+    TEMP_PATH='c:\\temp'
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "${INSTALL_MODULE_PATH}"]
+
+COPY . ${INSTALL_MODULE_PATH}
+
+RUN & (Join-Path $env:INSTALL_MODULE_PATH "\\Extract-Databases.ps1") -Path $env:INSTALL_MODULE_PATH; `
+    & (Join-Path $env:INSTALL_MODULE_PATH "\\Install-Databases.ps1") -InstallPath $env:INSTALL_PATH -DataPath $env:DATA_PATH -ModulePath $env:INSTALL_MODULE_PATH -DatabasePrefix Sitecore; `
+    Get-ChildItem -Path $env:INSTALL_PATH -Exclude "*.mdf", "*.ldf" | Remove-Item -Force; `
+    Get-ChildItem -Path $env:INSTALL_MODULE_PATH | Remove-Item -Force;  
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1 b/windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1
new file mode 100644
index 000000000..9b7b11d7c
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/Extract-Databases.ps1
@@ -0,0 +1,35 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })]
+    [string]$Path
+)
+
+Add-Type -Assembly "System.IO.Compression"
+Add-Type -Assembly "System.IO.Compression.FileSystem"
+
+Get-ChildItem -Path $Path -Filter "*.zip" | ForEach-Object {
+    $zipPath = $_.FullName
+
+    try
+    {
+        $stream = New-Object IO.FileStream($zipPath, [IO.FileMode]::Open)
+        $zip = New-Object IO.Compression.ZipArchive($stream, [IO.Compression.ZipArchiveMode]::Read)
+
+        ($zip.Entries | Where-Object { $_.FullName -like "*.dacpac" }) | Foreach-Object {
+            [IO.Compression.ZipFileExtensions]::ExtractToFile($_, (Join-Path $Path $_.Name), $true)
+        }
+    }
+    finally
+    {
+        if ($zip -ne $null)
+        {
+            $zip.Dispose()
+        }
+
+        if ($stream -ne $null)
+        {
+            $stream.Dispose()
+        }
+    }
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1 b/windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1
new file mode 100644
index 000000000..d9ef08c20
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/Install-Databases.ps1
@@ -0,0 +1,61 @@
+[CmdletBinding()]
+param(
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$InstallPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$DataPath,
+    [Parameter(Mandatory = $true)]
+    [ValidateScript( { Test-Path $_ -PathType 'Container' })] 
+    [string]$ModulePath,
+    [Parameter(Mandatory = $true)]
+    [ValidateNotNullOrEmpty()] 
+    [string]$DatabasePrefix
+)
+
+[System.Reflection.Assembly]::LoadWithPartialName("Microsoft.SqlServer.SMO") | Out-Null
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $InstallPath
+$server.Properties["DefaultLog"].Value = $InstallPath
+$server.Alter()
+
+$sqlPackageExePath = Get-Item "C:\Program Files\Microsoft SQL Server\*\DAC\bin\SqlPackage.exe" | Select-Object -Last 1 -Property FullName -ExpandProperty FullName
+
+# attach
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+    $mdfPath = $_.FullName
+    $ldfPath = $mdfPath.Replace(".mdf", ".ldf")
+    $sqlcmd = "IF EXISTS (SELECT 1 FROM SYS.DATABASES WHERE NAME = '$databaseName') BEGIN EXEC sp_detach_db [$databaseName] END;CREATE DATABASE [$databaseName] ON (FILENAME = N'$mdfPath'), (FILENAME = N'$ldfPath') FOR ATTACH;"
+
+    Write-Host "### Attaching '$databaseName'..."
+
+    Invoke-Sqlcmd -Query $sqlcmd
+}
+
+# do modules
+$TextInfo = (Get-Culture).TextInfo
+Get-ChildItem -Path $ModulePath -Include "core.dacpac", "master.dacpac" -Recurse | ForEach-Object { 
+
+    $dacpacPath = $_.FullName
+    $databaseName = "$DatabasePrefix`." + $TextInfo.ToTitleCase($_.BaseName)
+
+    # Install
+    & $sqlPackageExePath /a:Publish /sf:$dacpacPath /tdn:$databaseName /tsn:$env:COMPUTERNAME /q
+} 
+
+# detach DB
+Get-ChildItem -Path $InstallPath -Filter "*.mdf" | ForEach-Object {
+    $databaseName = $_.BaseName.Replace("_Primary", "")
+
+    Write-Host "### Detach: $databaseName"
+
+    Invoke-Sqlcmd -Query "EXEC MASTER.dbo.sp_detach_db @dbname = N'$databaseName', @keepfulltextindexfile = N'false'"
+}
+
+$server = New-Object Microsoft.SqlServer.Management.Smo.Server($env:COMPUTERNAME)
+$server.Properties["DefaultFile"].Value = $DataPath
+$server.Properties["DefaultLog"].Value = $DataPath
+$server.Alter()
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss-sqldev/build.json b/windows/9.2.x/sitecore-xp-jss-sqldev/build.json
new file mode 100644
index 000000000..a31bff00b
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss-sqldev/build.json
@@ -0,0 +1,14 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xp-jss-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--memory 4GB",
+        "--build-arg BASE_IMAGE=sitecore-xp-sqldev:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss/Dockerfile b/windows/9.2.x/sitecore-xp-jss/Dockerfile
new file mode 100644
index 000000000..a9fcb1599
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss/Dockerfile
@@ -0,0 +1,22 @@
+# escape=`
+ARG BASE_IMAGE
+ARG ASSETS_IMAGE
+
+FROM $ASSETS_IMAGE as assets
+FROM $BASE_IMAGE as build
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ARG ASSETS_USE_WDP
+
+COPY --from=assets ["${ASSETS_USE_WDP}", "C:\\temp\\packages\\"]
+
+# expand selected wdp into installation directory
+RUN Expand-Archive -Path 'C:\\temp\\packages\\*.zip' -DestinationPath 'C:\\temp'; `
+    Copy-Item -Path 'C:\\temp\\Content\\Website\\*' -Destination 'C:\\inetpub\\wwwroot' -Recurse -Force;
+
+FROM $BASE_IMAGE
+
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+COPY --from=build ["C:\\inetpub\\wwwroot\\", "C:\\inetpub\\wwwroot\\"]
\ No newline at end of file
diff --git a/windows/9.2.x/sitecore-xp-jss/build.json b/windows/9.2.x/sitecore-xp-jss/build.json
new file mode 100644
index 000000000..956a19538
--- /dev/null
+++ b/windows/9.2.x/sitecore-xp-jss/build.json
@@ -0,0 +1,25 @@
+{
+  "tags": [
+    {
+      "tag": "sitecore-xp-jss-standalone:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xp-standalone:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cm",
+        "--build-arg SC_ROLE_DEFINE='Standalone'"
+      ]
+    },
+    {
+      "tag": "sitecore-xp-jss-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+      "build-options": [
+        "--build-arg BASE_IMAGE=sitecore-xp-cd:9.2.0-windowsservercore-${windowsservercore_version}",
+        "--build-arg ASSETS_IMAGE=sitecore-assets:9.2.0-nanoserver-${nanoserver_version}",
+        "--build-arg ASSETS_USE_WDP='C:\\packages\\Sitecore JavaScript Services Server for Sitecore 9.2 XP 12.0.0 rev. 190522 CD.scwdp.zip'",
+        "--build-arg SC_ROLE_CONFIG_DIRECTORY=\\config\\cd",
+        "--build-arg SC_ROLE_DEFINE='ContentDelivery'"
+      ]
+    }
+  ],
+  "sources": []
+}
\ No newline at end of file
diff --git a/windows/tests/9.x.x/docker-compose-jss.xp.yml b/windows/tests/9.x.x/docker-compose-jss.xp.yml
new file mode 100644
index 000000000..f942bbf2a
--- /dev/null
+++ b/windows/tests/9.x.x/docker-compose-jss.xp.yml
@@ -0,0 +1,73 @@
+version: '2.4'
+
+services:
+
+  sql:
+    image: ${REGISTRY}sitecore-xp-jss-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - .\data\sql:C:\Data
+    mem_limit: 2GB
+    ports:
+      - "44010:1433"
+
+  solr:
+    image: ${REGISTRY}sitecore-xp-solr:${SITECORE_VERSION}-nanoserver-${NANOSERVER_VERSION}
+    volumes:
+      - .\data\solr:C:\Data
+    mem_limit: 1GB
+    ports:
+      - "44011:8983"
+
+  xconnect:
+    image: ${REGISTRY}sitecore-xp-xconnect:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\xconnect:C:\inetpub\wwwroot\App_Data\logs
+    mem_limit: 1GB
+    links:
+      - sql
+      - solr
+
+  xconnect-automationengine:
+    image: ${REGISTRY}sitecore-xp-xconnect-automationengine:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\xconnect-automationengine:C:\AutomationEngine\App_Data\logs
+    mem_limit: 500MB
+    links:
+      - sql
+      - xconnect
+
+  xconnect-indexworker:
+    image: ${REGISTRY}sitecore-xp-xconnect-indexworker:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\xconnect-indexworker:C:\IndexWorker\App_Data\logs
+    mem_limit: 500MB
+    links:
+      - sql
+      - solr
+
+  cd:
+    image: ${REGISTRY}sitecore-xp-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
+      - xconnect
+
+  cm:
+    image: ${REGISTRY}sitecore-xp-jss-standalone:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44001:80"
+    links:
+      - sql
+      - solr
+      - xconnect
diff --git a/windows/tests/9.x.x/docker-compose.jss.xm.yml b/windows/tests/9.x.x/docker-compose.jss.xm.yml
new file mode 100644
index 000000000..f28ba2722
--- /dev/null
+++ b/windows/tests/9.x.x/docker-compose.jss.xm.yml
@@ -0,0 +1,46 @@
+version: '2.4'
+
+services:
+
+  sql:
+    image: ${REGISTRY}sitecore-xm-jss-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - .\data\sql:C:\Data
+    mem_limit: 2GB
+    ports:
+      - "44010:1433"
+
+  solr:
+    image: ${REGISTRY}sitecore-xm-solr:${SITECORE_VERSION}-nanoserver-${NANOSERVER_VERSION}
+    volumes:
+      - .\data\solr:C:\Data
+    mem_limit: 1GB
+    ports:
+      - "44011:8983"
+
+  cd:
+    image: ${REGISTRY}sitecore-xm-jss-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
+
+  cm:
+    image: ${REGISTRY}sitecore-xm-jss-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44001:80"
+    links:
+      - sql
+      - solr
+
+networks:
+  default:
+    external:
+      name: nat
\ No newline at end of file
diff --git a/windows/tests/9.x.x/docker-compose.spe.xm.yml b/windows/tests/9.x.x/docker-compose.spe.xm.yml
index 4a965ffd6..dcbdf1437 100644
--- a/windows/tests/9.x.x/docker-compose.spe.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.spe.xm.yml
@@ -3,7 +3,7 @@ version: '2.4'
 services:
 
   sql:
-    image: ${REGISTRY}sitecore-spe-xm-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    image: ${REGISTRY}sitecore-xm-spe-sqldev:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
       - .\data\sql:C:\Data
     mem_limit: 2GB
@@ -18,21 +18,21 @@ services:
     ports:
       - "44011:8983"
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
+  cd:
+    image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
 
   cm:
-    image: ${REGISTRY}sitecore-spe-xm-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    image: ${REGISTRY}sitecore-xm-spe-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44001:80"
diff --git a/windows/tests/9.x.x/docker-compose.sxa.xm.yml b/windows/tests/9.x.x/docker-compose.sxa.xm.yml
index e4d178665..a4ff0862b 100644
--- a/windows/tests/9.x.x/docker-compose.sxa.xm.yml
+++ b/windows/tests/9.x.x/docker-compose.sxa.xm.yml
@@ -18,21 +18,21 @@ services:
     ports:
       - "44011:8983"
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xm-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
+  cd:
+    image: ${REGISTRY}sitecore-xm-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
 
   cm:
     image: ${REGISTRY}sitecore-xm-sxa-cm:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
       - .\data\src:C:\src
     ports:
diff --git a/windows/tests/9.x.x/docker-compose.sxa.xp.yml b/windows/tests/9.x.x/docker-compose.sxa.xp.yml
index 2681fb3ec..70d4c4e96 100644
--- a/windows/tests/9.x.x/docker-compose.sxa.xp.yml
+++ b/windows/tests/9.x.x/docker-compose.sxa.xp.yml
@@ -48,22 +48,22 @@ services:
       - sql
       - solr
 
-  # cd:
-  #   image: ${REGISTRY}sitecore-xp-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
-  #   volumes:
-  #     - C:\license:C:\license
-  #     - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
-  #   ports:
-  #     - "44002:80"
-  #   links:
-  #     - sql
-  #     - solr
-  #     - xconnect
+  cd:
+    image: ${REGISTRY}sitecore-xp-sxa-cd:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
+    volumes:
+      - ${LICENSE_PATH}:C:\license
+      - .\data\cd:C:\inetpub\wwwroot\App_Data\logs
+    ports:
+      - "44002:80"
+    links:
+      - sql
+      - solr
+      - xconnect
 
   cm:
     image: ${REGISTRY}sitecore-xp-sxa-standalone:${SITECORE_VERSION}-windowsservercore-${WINDOWSSERVERCORE_VERSION}
     volumes:
-      - C:\license:C:\license
+      - ${LICENSE_PATH}:C:\license
       - .\data\cm:C:\inetpub\wwwroot\App_Data\logs
     ports:
       - "44001:80"