diff --git a/payapi/build.gradle b/payapi/build.gradle
index 3e3c2ed..9dcd2e4 100644
--- a/payapi/build.gradle
+++ b/payapi/build.gradle
@@ -17,6 +17,11 @@
 bootJar {
     enabled = true
     mainClassName = payapiStartClass
+    def standalone = ""
+    if (rootProject.hasProperty("no-multi-tenant")) {
+        standalone = "-stangalone-"
+    }
+    archiveFileName = "${project.name}${standalone}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
     manifest {
         attributes("Payapi-Version": buildVersion,
                 "Payapi-Buildtime": buildTime)