diff --git a/build-plugins/build.gradle b/build-plugins/build.gradle
index 737d74ab08..6c3e6d18d3 100644
--- a/build-plugins/build.gradle
+++ b/build-plugins/build.gradle
@@ -59,8 +59,8 @@ gradlePlugin {
       implementationClass = 'com.cloudogu.scm.CorePluginsGradlePlugin'
     }
     serve {
-      id = 'org.scm-manager.serve'
-      implementationClass = 'com.cloudogu.scm.ServePlugin'
+      id = 'org.scm-manager.run'
+      implementationClass = 'com.cloudogu.scm.RunPlugin'
     }
     integrationTest {
       id = 'org.scm-manager.integration-tests'
diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/IntegrationTestPlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/IntegrationTestPlugin.groovy
index 32fcc94986..8c25f5db8f 100644
--- a/build-plugins/src/main/groovy/com/cloudogu/scm/IntegrationTestPlugin.groovy
+++ b/build-plugins/src/main/groovy/com/cloudogu/scm/IntegrationTestPlugin.groovy
@@ -37,7 +37,7 @@ class IntegrationTestPlugin implements Plugin<Project> {
       it.extension = extension
     }
 
-    project.tasks.register("startScmServer", ServeTask) {
+    project.tasks.register("startScmServer", RunTask) {
       it.extension = extension
       it.waitForCompletion = false
       it.frontend = false
diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/ServePlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/RunPlugin.groovy
similarity index 95%
rename from build-plugins/src/main/groovy/com/cloudogu/scm/ServePlugin.groovy
rename to build-plugins/src/main/groovy/com/cloudogu/scm/RunPlugin.groovy
index 01bba209ee..0df333b980 100644
--- a/build-plugins/src/main/groovy/com/cloudogu/scm/ServePlugin.groovy
+++ b/build-plugins/src/main/groovy/com/cloudogu/scm/RunPlugin.groovy
@@ -29,8 +29,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import com.moowork.gradle.node.NodeExtension
 
-
-class ServePlugin implements Plugin<Project> {
+class RunPlugin implements Plugin<Project> {
 
   void apply(Project project) {
     def extension = project.extensions.create("scmServer", ScmServerExtension, project)
@@ -45,7 +44,7 @@ class ServePlugin implements Plugin<Project> {
     project.tasks.register('write-server-config', WriteServerConfigTask) {
       it.extension = extension
     }
-    project.tasks.register("serve", ServeTask) {
+    project.tasks.register("run", RunTask) {
       it.extension = extension
       dependsOn 'write-server-config', 'yarnSetup'
     }
diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/ServeTask.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy
similarity index 99%
rename from build-plugins/src/main/groovy/com/cloudogu/scm/ServeTask.groovy
rename to build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy
index 42263f0bbe..0f6a4f24ce 100644
--- a/build-plugins/src/main/groovy/com/cloudogu/scm/ServeTask.groovy
+++ b/build-plugins/src/main/groovy/com/cloudogu/scm/RunTask.groovy
@@ -34,7 +34,7 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.api.GradleException
 import org.gradle.api.tasks.options.Option
 
-class ServeTask extends DefaultTask {
+class RunTask extends DefaultTask {
 
   @Input
   boolean frontend = true
diff --git a/scm-webapp/build.gradle b/scm-webapp/build.gradle
index 1372d18780..d8fcb86552 100644
--- a/scm-webapp/build.gradle
+++ b/scm-webapp/build.gradle
@@ -25,7 +25,7 @@
 plugins {
   id 'war'
   id 'org.scm-manager.java'
-  id 'org.scm-manager.serve'
+  id 'org.scm-manager.run'
   id 'org.scm-manager.core-plugins'
   id 'io.swagger.core.v3.swagger-gradle-plugin' version '2.1.6'
 }
@@ -160,7 +160,7 @@ scmServer {
   loggingConfiguration = file('src/main/conf/logback.serve.xml')
 }
 
-serve {
+run {
   dependsOn 'dev-war'
 }