diff --git a/Jenkinsfile b/Jenkinsfile
index 673bc6639..b63dc9e08 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,7 +36,7 @@ pipeline {
             parallel {
                 stage('JDK 1.8 on Linux') {
                     agent {
-                        label 'xenial'
+                        label 'skywalking'
                     }
 
                     tools {
diff --git a/Jenkinsfile-E2E b/Jenkinsfile-E2E
index 227538604..1bb9e89d9 100755
--- a/Jenkinsfile-E2E
+++ b/Jenkinsfile-E2E
@@ -18,7 +18,7 @@
 
 pipeline {
     agent {
-        label 'xenial'
+        label 'skywalking'
     }
 
     tools {
diff --git a/pom.xml b/pom.xml
index 7ae2edb55..641d0a8cc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -322,6 +322,9 @@
                     <groupId>io.fabric8</groupId>
                     <artifactId>docker-maven-plugin</artifactId>
                     <version>${maven-docker-plugin.version}</version>
+                    <configuration>
+                        <containerNamePattern>%a-%t-%i</containerNamePattern>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>