diff --git a/.drone.yml b/.drone.yml
index 106763f..6218d59 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,24 +9,48 @@ clone:
     tags: true
 
 pipeline:
-  test:
+  lint:
     image: appleboy/golang-testing
     pull: true
+    group: golang
     environment:
       TAGS: netgo
       GOPATH: /srv/app
-    secrets: [ codecov_token ]
     commands:
-      - make ssh-server
       - make vet
       - make lint
-      # - make test
       - make test-vendor
-      - coverage all
-      - make coverage
+
+  build:
+    image: appleboy/golang-testing
+    pull: true
+    group: golang
+    environment:
+      TAGS: netgo
+      GOPATH: /srv/app
+    commands:
       - make build
+
+  test:
+    image: appleboy/golang-testing
+    pull: true
+    group: golang
+    environment:
+      TAGS: netgo
+      GOPATH: /srv/app
+    commands:
+      - make ssh-server
+      - make test
+      - make coverage
+
+  codecov:
+    image: robertstettner/drone-codecov
+    secrets: [ codecov_token ]
+    files:
+      - .cover/coverage.txt
     when:
-      event: [ push, tag, pull_request ]
+      event: [ push, pull_request ]
+      status: [ success ]
 
   publish_latest:
     image: plugins/docker
diff --git a/Makefile b/Makefile
index ac3fc90..69cb35e 100644
--- a/Makefile
+++ b/Makefile
@@ -125,10 +125,7 @@ endif
 	docker push $(DEPLOY_ACCOUNT)/$(DEPLOY_IMAGE):$(tag)
 
 coverage:
-	sed -i '/main.go/d' .cover/coverage.txt
-	curl -s https://codecov.io/bash > .codecov && \
-	chmod +x .codecov && \
-	./.codecov -f .cover/coverage.txt
+	sed -i '/main.go/d' coverage.txt
 
 clean:
 	$(GO) clean -x -i ./...