diff --git a/README.md b/README.md
index 73aa9e39..bf4c9397 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,12 @@ on how to do that, including how to develop and test locally and the versioning
 
 _Note: 1.28.0 and later require Gradle 7_
 
+### 2.5.1
+*Released*: 11 March 2024
+(Earliest compatible LabKey version: 24.2)
+* Don't write restartTrigger file if not using local build (e.g., on TeamCity)
+* Avoid errors for missing `distributionDir` property
+
 ### 2.5.0
 *Released*: 10 March 2024
 (Earliest compatible LabKey version: 24.2)
diff --git a/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy b/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
index c7d9b53f..50f7bb55 100644
--- a/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
+++ b/src/main/groovy/org/labkey/gradle/task/ModuleDistribution.groovy
@@ -15,6 +15,8 @@
  */
 package org.labkey.gradle.task
 
+import org.apache.commons.lang3.StringUtils
+
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 import org.gradle.api.Project
@@ -54,8 +56,7 @@ class ModuleDistribution extends DefaultTask
     @Input
     boolean simpleDistribution = false // Set to true to exclude pipeline tools and remote pipeline libraries
 
-    @OutputDirectory
-    File distributionDir
+    private File distributionDir
 
     private final DistributionExtension distExtension
     private Project licensingProject
@@ -77,10 +78,14 @@ class ModuleDistribution extends DefaultTask
     }
 
     @OutputDirectory
-    File getResolvedDistributionDir()
+    File getDistributionDir()
     {
-        if (distributionDir == null && subDirName != null)
-            distributionDir = project.file("${distExtension.dir}/${subDirName}")
+        if (distributionDir == null) {
+            var subDir = StringUtils.trimToNull(subDirName)
+            if (subDir == null)
+                subDir = project.name
+            distributionDir = project.file("${distExtension.dir}/${subDir}")
+        }
         return distributionDir
     }
 
@@ -237,27 +242,27 @@ class ModuleDistribution extends DefaultTask
 
     private String getTarArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
     }
 
     private String getEmbeddedTarArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.TAR_ARCHIVE_EXTENSION}"
     }
 
     private String getZipArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
     }
 
     private String getEmbeddedZipArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
+        return "${getDistributionDir()}/${getArchiveName()}${DistributionExtension.EMBEDDED_SUFFIX}.${DistributionExtension.ZIP_ARCHIVE_EXTENSION}"
     }
 
     private String getWarArchivePath()
     {
-        return "${getResolvedDistributionDir()}/${getArchiveName()}.war"
+        return "${getDistributionDir()}/${getArchiveName()}.war"
     }
 
     private File getWindowsUtilDir()
diff --git a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy
index b30fe32d..625ecfb0 100644
--- a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy
+++ b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy
@@ -918,6 +918,9 @@ class BuildUtils
      */
     static void updateRestartTriggerFile(Project project)
     {
+        if (!project.hasProperty('useLocalBuild') || "false" == project.property("useLocalBuild"))
+            return
+
         OutputStreamWriter writer = null
         try {
             File triggerFile = project.rootProject.layout.buildDirectory.file("deploy/modules/${RESTART_FILE_NAME}").get().getAsFile()