diff --git a/contrib/teamcity/build-configurations.json b/contrib/teamcity/build-configurations.json
--- a/contrib/teamcity/build-configurations.json
+++ b/contrib/teamcity/build-configurations.json
@@ -80,6 +80,7 @@
         },
         "build-ibd-no-assumevalid-checkpoint": {
             "script": "builds/build-ibd-no-assumevalid-checkpoint.sh",
+            "template": "common_unix_artifacts",
             "timeout": 21600,
             "artifacts": {
                 "ibd/debug.log": "log/debug.log"
diff --git a/contrib/teamcity/build-configurations.py b/contrib/teamcity/build-configurations.py
--- a/contrib/teamcity/build-configurations.py
+++ b/contrib/teamcity/build-configurations.py
@@ -81,10 +81,11 @@
                     )
                 )
 
-            # The template exists, apply the build configuration on top of the
-            # template
-            self.config = always_merger.merge(
-                templates.get(template_name, {}), build)
+        # If the template exists, apply the build configuration on top of the
+        # template. Otherwise it is equivalent to the build configuration
+        # alone.
+        self.config = always_merger.merge(
+            templates.get(template_name, {}), build)
 
         # Make sure there is a script file associated with the build...
         script = build.get("script", None)