diff --git a/atom-extensions/atom-spring-boot/build.sh b/atom-extensions/atom-spring-boot/build.sh
index 9cedded75..c649a4e77 100755
--- a/atom-extensions/atom-spring-boot/build.sh
+++ b/atom-extensions/atom-spring-boot/build.sh
@@ -10,7 +10,7 @@ mkdir server
 # Build fat jar and copy it over into
 cd ../../headless-services/spring-boot-language-server
 ./build.sh
-cp -f target/spring-boot-language-server-*.jar $workdir/server/spring-boot-language-server.jar
+cp -f target/spring-boot-language-server-*-exec.jar $workdir/server/spring-boot-language-server.jar
 
 # Installs atom-commons from source rather than npm registry
 # cd ../atom-commons
diff --git a/concourse/tasks/atom-language-servers-test.sh b/concourse/tasks/atom-language-servers-test.sh
index 2833bd99f..b9f669505 100755
--- a/concourse/tasks/atom-language-servers-test.sh
+++ b/concourse/tasks/atom-language-servers-test.sh
@@ -19,7 +19,7 @@ xvfb-run ./mvnw clean install -DargLine="-Dlsp.completions.indentation.enable=tr
 
 # Copy fatjars to `out` directory
 timestamp=`date -u +%Y%m%d%H%M`
-for i in `ls *-language-server/target/*.jar`; do
+for i in `ls *-language-server/target/*-exec.jar`; do
     basename=$(basename $i)
     cp $i $output/${basename/SNAPSHOT/$timestamp}
 done
diff --git a/concourse/tasks/build-vsix.sh b/concourse/tasks/build-vsix.sh
index 25dad265b..a3a9b03c7 100755
--- a/concourse/tasks/build-vsix.sh
+++ b/concourse/tasks/build-vsix.sh
@@ -49,7 +49,7 @@ if [ "$dist_type" == release ]; then
 fi
 
 cp *.vsix $workdir/out
-server_jar=$workdir/sts4/headless-services/${server_id}-language-server/target/*.jar
+server_jar=$workdir/sts4/headless-services/${server_id}-language-server/target/*-exec.jar
 if [ -f $server_jar ]; then
     cp $server_jar $workdir/out/${server_id}-language-server-${base_version}-${timestamp}.jar
 fi
diff --git a/headless-services/bosh-language-server/pom.xml b/headless-services/bosh-language-server/pom.xml
index 470910bbe..3bd732878 100644
--- a/headless-services/bosh-language-server/pom.xml
+++ b/headless-services/bosh-language-server/pom.xml
@@ -56,6 +56,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<classifier>exec</classifier>
+				</configuration>
 				<executions>
 					<execution>
 						<goals>
diff --git a/headless-services/concourse-language-server/pom.xml b/headless-services/concourse-language-server/pom.xml
index cc305e92a..0562aea68 100644
--- a/headless-services/concourse-language-server/pom.xml
+++ b/headless-services/concourse-language-server/pom.xml
@@ -79,6 +79,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<classifier>exec</classifier>
+				</configuration>
 				<executions>
 					<execution>
 						<goals>
@@ -87,7 +90,6 @@
 					</execution>
 				</executions>
 			</plugin>
-
 			<!-- generate and package license information for included dependencies -->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
diff --git a/headless-services/manifest-yaml-language-server/pom.xml b/headless-services/manifest-yaml-language-server/pom.xml
index f6ea2a9a8..281e91d1f 100644
--- a/headless-services/manifest-yaml-language-server/pom.xml
+++ b/headless-services/manifest-yaml-language-server/pom.xml
@@ -99,6 +99,9 @@
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
+				<configuration>
+					<classifier>exec</classifier>
+				</configuration>
 				<executions>
 					<execution>
 						<goals>
diff --git a/headless-services/spring-boot-language-server/pom.xml b/headless-services/spring-boot-language-server/pom.xml
index f75169d40..99340990e 100644
--- a/headless-services/spring-boot-language-server/pom.xml
+++ b/headless-services/spring-boot-language-server/pom.xml
@@ -147,6 +147,7 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 				<configuration>
 					<layout>ZIP</layout>
+					<classifier>exec</classifier>
 				</configuration>
 				<executions>
 					<execution>
diff --git a/theia-extensions/theia-bosh/build.sh b/theia-extensions/theia-bosh/build.sh
index dc6ed5b94..b038fa82a 100755
--- a/theia-extensions/theia-bosh/build.sh
+++ b/theia-extensions/theia-bosh/build.sh
@@ -11,7 +11,7 @@ cd ../../../headless-services/bosh-language-server
 
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
 
 cd ${workdir}/..
 yarn
diff --git a/theia-extensions/theia-cf-manifest-yaml/build.sh b/theia-extensions/theia-cf-manifest-yaml/build.sh
index ec66bd123..2e3eab7e6 100755
--- a/theia-extensions/theia-cf-manifest-yaml/build.sh
+++ b/theia-extensions/theia-cf-manifest-yaml/build.sh
@@ -11,7 +11,7 @@ cd ../../../headless-services/manifest-yaml-language-server
 
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
 
 cd ${workdir}/..
 yarn
diff --git a/theia-extensions/theia-concourse/build.sh b/theia-extensions/theia-concourse/build.sh
index 0bc1ba9b6..368edf66d 100755
--- a/theia-extensions/theia-concourse/build.sh
+++ b/theia-extensions/theia-concourse/build.sh
@@ -11,7 +11,7 @@ cd ../../../headless-services/concourse-language-server
 
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
 
 cd ${workdir}/..
 yarn
diff --git a/theia-extensions/theia-spring-boot/build.sh b/theia-extensions/theia-spring-boot/build.sh
index d2adb1d5f..ee537e740 100755
--- a/theia-extensions/theia-spring-boot/build.sh
+++ b/theia-extensions/theia-spring-boot/build.sh
@@ -13,7 +13,7 @@ mkdir -p ${workdir}/jars
 # Use maven to build fat jar of the language server
 cd ${workdir}/../../../headless-services/spring-boot-language-server
 ./build.sh
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
 
 cd ${workdir}/../../../headless-services/jdt-ls-extension
 cp org.springframework.tooling.jdt.ls.extension/target/*.jar ${workdir}/jars/jdt-ls-extension.jar
diff --git a/vscode-extensions/vscode-bosh/scripts/preinstall.sh b/vscode-extensions/vscode-bosh/scripts/preinstall.sh
index 00be2da49..37843a0a2 100755
--- a/vscode-extensions/vscode-bosh/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-bosh/scripts/preinstall.sh
@@ -16,4 +16,4 @@ cd ../../headless-services/bosh-language-server
 
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
diff --git a/vscode-extensions/vscode-concourse/scripts/preinstall.sh b/vscode-extensions/vscode-concourse/scripts/preinstall.sh
index 454df2adb..7d2341ba8 100755
--- a/vscode-extensions/vscode-concourse/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-concourse/scripts/preinstall.sh
@@ -16,4 +16,4 @@ cd ../../headless-services/concourse-language-server
 
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
diff --git a/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh b/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh
index 7118b38a3..7287196dd 100755
--- a/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-manifest-yaml/scripts/preinstall.sh
@@ -16,4 +16,4 @@ cd ../../headless-services/manifest-yaml-language-server
 
 rm -fr ${workdir}/jars
 mkdir -p ${workdir}/jars
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
diff --git a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
index 152392f38..c98f4b51a 100755
--- a/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
+++ b/vscode-extensions/vscode-spring-boot/scripts/preinstall.sh
@@ -21,7 +21,7 @@ mkdir -p ${workdir}/jars
 # Use maven to build fat jar of the language server
 cd ${workdir}/../../headless-services/spring-boot-language-server
 ./build.sh
-cp target/*.jar ${workdir}/jars
+cp target/*-exec.jar ${workdir}/jars
 
 cd ${workdir}/../../headless-services/jdt-ls-extension
 cp org.springframework.tooling.jdt.ls.extension/target/*.jar ${workdir}/jars/jdt-ls-extension.jar