diff --git a/samples/manage/windows-containers/mssql-server-2014-express-windows/start.ps1 b/samples/manage/windows-containers/mssql-server-2014-express-windows/start.ps1
index 16d23c35f8..1e6360f09d 100644
--- a/samples/manage/windows-containers/mssql-server-2014-express-windows/start.ps1
+++ b/samples/manage/windows-containers/mssql-server-2014-express-windows/start.ps1
@@ -35,7 +35,7 @@ if ($null -ne $dbs -And $dbs.Length -gt 0){
 		}
 		
 		$files = $files -join ","
-		$sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"
+		$sqlcmd = "sp_detach_db ""$($db.dbName)"";CREATE DATABASE ""$($db.dbName)"" ON $($files) FOR ATTACH ;" 
 
 		Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"
 		Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"
diff --git a/samples/manage/windows-containers/mssql-server-2016-express-sp1-windows/start.ps1 b/samples/manage/windows-containers/mssql-server-2016-express-sp1-windows/start.ps1
index 8d52d04b87..0779dcce5e 100644
--- a/samples/manage/windows-containers/mssql-server-2016-express-sp1-windows/start.ps1
+++ b/samples/manage/windows-containers/mssql-server-2016-express-sp1-windows/start.ps1
@@ -46,6 +46,7 @@ if ($null -ne $dbs -And $dbs.Length -gt 0){
 		}
 		
 		$files = $files -join ","
+
 		$sqlcmd = "sp_detach_db ""$($db.dbName)"";CREATE DATABASE ""$($db.dbName)"" ON $($files) FOR ATTACH ;"
 
 		Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"
diff --git a/samples/manage/windows-containers/mssql-server-2016-express-windows/start.ps1 b/samples/manage/windows-containers/mssql-server-2016-express-windows/start.ps1
index 912150c846..d44ee089d7 100644
--- a/samples/manage/windows-containers/mssql-server-2016-express-windows/start.ps1
+++ b/samples/manage/windows-containers/mssql-server-2016-express-windows/start.ps1
@@ -35,8 +35,8 @@ if ($null -ne $dbs -And $dbs.Length -gt 0){
 		}
 		
 		$files = $files -join ","
-		$sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"
-
+		$sqlcmd = "sp_detach_db ""$($db.dbName)"";CREATE DATABASE ""$($db.dbName)"" ON $($files) FOR ATTACH ;"
+		
 		Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQLEXPRESS'"
 		Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQLEXPRESS"
 	}
diff --git a/samples/manage/windows-containers/mssql-server-windows/start.ps1 b/samples/manage/windows-containers/mssql-server-windows/start.ps1
index dba31ec87a..392480b68c 100644
--- a/samples/manage/windows-containers/mssql-server-windows/start.ps1
+++ b/samples/manage/windows-containers/mssql-server-windows/start.ps1
@@ -46,7 +46,7 @@ if ($null -ne $dbs -And $dbs.Length -gt 0){
 		}
 
 		$files = $files -join ","
-		$sqlcmd = "sp_detach_db $($db.dbName);CREATE DATABASE $($db.dbName) ON $($files) FOR ATTACH ;"
+		$sqlcmd = "sp_detach_db ""$($db.dbName)"";CREATE DATABASE ""$($db.dbName)"" ON $($files) FOR ATTACH ;" 
 
 		Write-Verbose "Invoke-Sqlcmd -Query $($sqlcmd) -ServerInstance '.\SQL'"
 		Invoke-Sqlcmd -Query $sqlcmd -ServerInstance ".\SQL"