diff --git a/dockerbuild.sh b/dockerbuild.sh
index cb62311488..6299846115 100755
--- a/dockerbuild.sh
+++ b/dockerbuild.sh
@@ -108,6 +108,7 @@ docker run \
     --rm \
     -t \
     -e CI \
+    -e TEAMCITY_VERSION \
     -e DOTNET_CLI_TELEMETRY_OPTOUT \
     -e Configuration \
     -v "$DIR:/code/build" \
diff --git a/modules/Templating b/modules/Templating
index f786df9dc9..586c4ff780 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit f786df9dc946f2d6e0362c2c9fc72579014d83d9
+Subproject commit 586c4ff7808db0310957fdaa616857c60b2de395