diff --git a/drone/server.go b/drone/server.go
index 315ad732b..06d1a1b66 100644
--- a/drone/server.go
+++ b/drone/server.go
@@ -23,7 +23,7 @@ var serverCmd = cli.Command{
 			Usage:  "start the server in debug mode",
 		},
 		cli.StringFlag{
-			EnvVar: "DRONE_SERVER_HOST",
+			EnvVar: "DRONE_SERVER_HOST,DRONE_HOST",
 			Name:   "server-host",
 			Usage:  "server host",
 		},
diff --git a/vendor/github.com/cncd/pipeline/pipeline/frontend/metadata.go b/vendor/github.com/cncd/pipeline/pipeline/frontend/metadata.go
index 380bb6a53..13d437820 100644
--- a/vendor/github.com/cncd/pipeline/pipeline/frontend/metadata.go
+++ b/vendor/github.com/cncd/pipeline/pipeline/frontend/metadata.go
@@ -165,7 +165,7 @@ func (m *Metadata) EnvironDrone() map[string]string {
 		"DRONE_REPO":                 m.Repo.Name,
 		"DRONE_REPO_SCM":             "git",
 		"DRONE_REPO_OWNER":           strings.Split(m.Repo.Name, "/")[0],
-		"DRONE_REPO_NAME":            strings.Split(m.Repo.Name, "/")[0],
+		"DRONE_REPO_NAME":            strings.Split(m.Repo.Name, "/")[1],
 		"DRONE_REPO_LINK":            m.Repo.Link,
 		"DRONE_REPO_BRANCH":          m.Curr.Commit.Branch,
 		"DRONE_REPO_PRIVATE":         fmt.Sprintf("%v", m.Repo.Private),
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 0618618a8..ea567438b 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -28,68 +28,68 @@
 		{
 			"checksumSHA1": "W3AuK8ocqHwlUajGmQLFvnRhTZE=",
 			"path": "github.com/cncd/pipeline/pipeline",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "Qu2FreqaMr8Yx2bW9O0cxAGgjr0=",
 			"path": "github.com/cncd/pipeline/pipeline/backend",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "0CGXRaYwZhJxGIrGhn8WGpkFqPo=",
 			"path": "github.com/cncd/pipeline/pipeline/backend/docker",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
-			"checksumSHA1": "/8wE+cVb7T4PQZgpLNu0DHzKGuE=",
+			"checksumSHA1": "ceGSLXEBIMOhRkrsO5f8umDkmCg=",
 			"path": "github.com/cncd/pipeline/pipeline/frontend",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "QWs+L3emrt5DDTWvqD6rbMtLKMw=",
 			"path": "github.com/cncd/pipeline/pipeline/frontend/yaml",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "ggOpR/vh0Hs6SnaiuiEO/9dUkcA=",
 			"path": "github.com/cncd/pipeline/pipeline/frontend/yaml/compiler",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "Q0GkNUFamVYIA1Fd8r0A5M6Gx54=",
 			"path": "github.com/cncd/pipeline/pipeline/frontend/yaml/linter",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "kx2sPUIMozPC/g6E4w48h3FfH3k=",
 			"path": "github.com/cncd/pipeline/pipeline/frontend/yaml/matrix",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "2/3f3oNmxXy5kcrRLCFa24Oc9O4=",
 			"path": "github.com/cncd/pipeline/pipeline/interrupt",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "uOjTfke7Qxosrivgz/nVTHeIP5g=",
 			"path": "github.com/cncd/pipeline/pipeline/multipart",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "vWImaniGEUutEvLvNCzTpSRSArg=",
 			"path": "github.com/cncd/pipeline/pipeline/rpc",
-			"revision": "6782e9f66c439f8cf5ece4d7e1e5371c8be58d5f",
-			"revisionTime": "2017-04-11T22:22:03Z"
+			"revision": "f56fb78bd5d412023bad5a37933b3a2506f1e468",
+			"revisionTime": "2017-04-21T13:35:39Z"
 		},
 		{
 			"checksumSHA1": "7Qj1DK0ceAXkYztW0l3+L6sn+V8=",