diff --git a/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/.template.config/template.json b/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/.template.config/template.json
index 28b6905d..32d69d58 100644
--- a/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/.template.config/template.json
+++ b/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/.template.config/template.json
@@ -17,8 +17,15 @@
         "type": "parameter",
         "defaultValue": "Sql150",
         "replaces": "#{SqlServerVersion}",
-        "choices": [ "Sql100", "Sql110", "Sql120", "Sql130", "Sql140", "Sql150", "Sql90", "SqlAzure", "SqlDw" ],
-        "description": "Version of SQL Server being targetted"
+        "choices": [ "Sql100", "Sql110", "Sql120", "Sql130", "Sql140", "Sql150", "Sql160", "Sql90", "SqlAzure", "SqlDw" ],
+        "description": "Version of SQL Server being targeted"
+      },
+      "codeAnalysis": {
+        "type": "parameter",
+        "defaultValue": "True",
+        "replaces": "#{CodeAnalysis}",
+        "choices": [ "True", "False" ],
+        "description": "Enable code analysis"
       }
     }
   }
\ No newline at end of file
diff --git a/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/sqlproj.csproj b/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/sqlproj.csproj
index d881f24b..18b7c0ab 100644
--- a/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/sqlproj.csproj
+++ b/src/MSBuild.Sdk.SqlProj.Templates/templates/sqlproj/sqlproj.csproj
@@ -2,6 +2,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <SqlServerVersion>#{SqlServerVersion}</SqlServerVersion>
+        <RunSqlCodeAnalysis>#{CodeAnalysis}</RunSqlCodeAnalysis>
         <!-- For additional properties that can be set here, please refer to https://github.com/rr-wfm/MSBuild.Sdk.SqlProj#model-properties -->
     </PropertyGroup>