diff --git a/Gopkg.lock b/Gopkg.lock
index 29e6bf5c6b..54a350a671 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -36,6 +36,14 @@
   revision = "aebefd9fcb99f22cd691ef778a12ed68f0e6a1ab"
   version = "v1.3.4"
 
+[[projects]]
+  branch = "master"
+  digest = "1:e49492b4fb01e1a8bdd34c351e481b9df4ffbd7aeda396a2f38b3a6699fe1b0c"
+  name = "github.com/DeveloperJim/gokong"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "64b9604df4c1f65c20aa768b147a421e39baf395"
+
 [[projects]]
   digest = "1:5d24344f711ecb9175a6fefcaac996b2040e34b73a27f61feb1896d50d055065"
   name = "github.com/Microsoft/go-winio"
@@ -1071,14 +1079,6 @@
   revision = "1624edc4454b8682399def8740d46db5e4362ba4"
   version = "v1.1.5"
 
-[[projects]]
-  digest = "1:954991be87f3f51206ea4cd7e72d1562e4250217a0aa56af9d4d3dc41344edc9"
-  name = "github.com/kevholditch/gokong"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "305470f01f9a2e2d049b718796716825369d4469"
-  version = "v6.0.1"
-
 [[projects]]
   digest = "1:26c3d66616e9d7c21fca41358591af1e35a91378c2c888958a3720c0dc1c1afb"
   name = "github.com/klauspost/compress"
@@ -2548,6 +2548,7 @@
   analyzer-version = 1
   input-imports = [
     "cloud.google.com/go/compute/metadata",
+    "github.com/DeveloperJim/gokong",
     "github.com/Microsoft/go-winio/archive/tar",
     "github.com/andygrunwald/megos",
     "github.com/asaskevich/govalidator",
@@ -2615,7 +2616,6 @@
     "github.com/jinzhu/gorm/dialects/mysql",
     "github.com/jmespath/go-jmespath",
     "github.com/json-iterator/go",
-    "github.com/kevholditch/gokong",
     "github.com/mattn/go-sqlite3",
     "github.com/mesos/mesos-go/api/v0/upid",
     "github.com/mholt/caddy",
diff --git a/vendor/github.com/DeveloperJim/gokong/routes.go b/vendor/github.com/DeveloperJim/gokong/routes.go
index 5c4c4c2a86..acb4fcfd2f 100644
--- a/vendor/github.com/DeveloperJim/gokong/routes.go
+++ b/vendor/github.com/DeveloperJim/gokong/routes.go
@@ -10,36 +10,40 @@ type RouteClient struct {
 }
 
 type RouteRequest struct {
-	Name          *string   `json:"name" yaml:"name"`
-	Protocols     []*string `json:"protocols" yaml:"protocols"`
-	Methods       []*string `json:"methods" yaml:"methods"`
-	Hosts         []*string `json:"hosts" yaml:"hosts"`
-	Paths         []*string `json:"paths" yaml:"paths"`
-	RegexPriority *int      `json:"regex_priority" yaml:"regex_priority"`
-	StripPath     *bool     `json:"strip_path" yaml:"strip_path"`
-	PreserveHost  *bool     `json:"preserve_host" yaml:"preserve_host"`
-	Snis          []*string `json:"snis" yaml:"snis"`
-	Sources       []*IpPort `json:"sources" yaml:"sources"`
-	Destinations  []*IpPort `json:"destinations" yaml:"destinations"`
-	Service       *Id       `json:"service" yaml:"service"`
+	Name          *string              `json:"name" yaml:"name"`
+	Protocols     []*string            `json:"protocols" yaml:"protocols"`
+	Methods       []*string            `json:"methods" yaml:"methods"`
+	Hosts         []*string            `json:"hosts" yaml:"hosts"`
+	Header        map[string][]*string `json:"headers" yaml:"headers"`
+	Paths         []*string            `json:"paths" yaml:"paths"`
+	RegexPriority *int                 `json:"regex_priority" yaml:"regex_priority"`
+	StripPath     *bool                `json:"strip_path" yaml:"strip_path"`
+	PreserveHost  *bool                `json:"preserve_host" yaml:"preserve_host"`
+	Snis          []*string            `json:"snis" yaml:"snis"`
+	Sources       []*IpPort            `json:"sources" yaml:"sources"`
+	Destinations  []*IpPort            `json:"destinations" yaml:"destinations"`
+	Service       *Id                  `json:"service" yaml:"service"`
+	Tags          []*string            `json:"tags" yaml:"tags"`
 }
 
 type Route struct {
-	Id            *string   `json:"id" yaml:"id"`
-	Name          *string   `json:"name" yaml:"name"`
-	CreatedAt     *int      `json:"created_at" yaml:"created_at"`
-	UpdatedAt     *int      `json:"updated_at" yaml:"updated_at"`
-	Protocols     []*string `json:"protocols" yaml:"protocols"`
-	Methods       []*string `json:"methods" yaml:"methods"`
-	Hosts         []*string `json:"hosts" yaml:"hosts"`
-	Paths         []*string `json:"paths" yaml:"paths"`
-	RegexPriority *int      `json:"regex_priority" yaml:"regex_priority"`
-	StripPath     *bool     `json:"strip_path" yaml:"strip_path"`
-	PreserveHost  *bool     `json:"preserve_host" yaml:"preserve_host"`
-	Snis          []*string `json:"snis" yaml:"snis"`
-	Sources       []*IpPort `json:"sources" yaml:"sources"`
-	Destinations  []*IpPort `json:"destinations" yaml:"destinations"`
-	Service       *Id       `json:"service" yaml:"service"`
+	Id            *string              `json:"id" yaml:"id"`
+	Name          *string              `json:"name" yaml:"name"`
+	CreatedAt     *int                 `json:"created_at" yaml:"created_at"`
+	UpdatedAt     *int                 `json:"updated_at" yaml:"updated_at"`
+	Protocols     []*string            `json:"protocols" yaml:"protocols"`
+	Methods       []*string            `json:"methods" yaml:"methods"`
+	Hosts         []*string            `json:"hosts" yaml:"hosts"`
+	Header        map[string][]*string `json:"headers" yaml:"headers"`
+	Paths         []*string            `json:"paths" yaml:"paths"`
+	RegexPriority *int                 `json:"regex_priority" yaml:"regex_priority"`
+	StripPath     *bool                `json:"strip_path" yaml:"strip_path"`
+	PreserveHost  *bool                `json:"preserve_host" yaml:"preserve_host"`
+	Snis          []*string            `json:"snis" yaml:"snis"`
+	Sources       []*IpPort            `json:"sources" yaml:"sources"`
+	Destinations  []*IpPort            `json:"destinations" yaml:"destinations"`
+	Service       *Id                  `json:"service" yaml:"service"`
+	Tags          []*string            `json:"tags" yaml:"tags"`
 }
 
 type IpPort struct {
diff --git a/vendor/github.com/DeveloperJim/gokong/services.go b/vendor/github.com/DeveloperJim/gokong/services.go
index bb968c7e1a..5d96035cb2 100644
--- a/vendor/github.com/DeveloperJim/gokong/services.go
+++ b/vendor/github.com/DeveloperJim/gokong/services.go
@@ -10,32 +10,34 @@ type ServiceClient struct {
 }
 
 type ServiceRequest struct {
-	Name           *string `json:"name" yaml:"name"`
-	Protocol       *string `json:"protocol" yaml:"protocol"`
-	Host           *string `json:"host" yaml:"host"`
-	Port           *int    `json:"port,omitempty" yaml:"port,omitempty"`
-	Path           *string `json:"path,omitempty" yaml:"path,omitempty"`
-	Retries        *int    `json:"retries,omitempty" yaml:"retries,omitempty"`
-	ConnectTimeout *int    `json:"connect_timeout,omitempty" yaml:"connect_timeout,omitempty"`
-	WriteTimeout   *int    `json:"write_timeout,omitempty" yaml:"write_timeout,omitempty"`
-	ReadTimeout    *int    `json:"read_timeout,omitempty" yaml:"read_timeout,omitempty"`
-	Url            *string `json:"url,omitempty" yaml:"url,omitempty"`
+	Name           *string   `json:"name" yaml:"name"`
+	Protocol       *string   `json:"protocol" yaml:"protocol"`
+	Host           *string   `json:"host" yaml:"host"`
+	Port           *int      `json:"port,omitempty" yaml:"port,omitempty"`
+	Path           *string   `json:"path,omitempty" yaml:"path,omitempty"`
+	Retries        *int      `json:"retries,omitempty" yaml:"retries,omitempty"`
+	ConnectTimeout *int      `json:"connect_timeout,omitempty" yaml:"connect_timeout,omitempty"`
+	WriteTimeout   *int      `json:"write_timeout,omitempty" yaml:"write_timeout,omitempty"`
+	ReadTimeout    *int      `json:"read_timeout,omitempty" yaml:"read_timeout,omitempty"`
+	Url            *string   `json:"url,omitempty" yaml:"url,omitempty"`
+	Tags           []*string `json:"tags" yaml:"tags"`
 }
 
 type Service struct {
-	Id             *string `json:"id" yaml:"id"`
-	CreatedAt      *int    `json:"created_at" yaml:"created_at"`
-	UpdatedAt      *int    `json:"updated_at" yaml:"updated_at"`
-	Protocol       *string `json:"protocol" yaml:"protocol"`
-	Host           *string `json:"host" yaml:"host"`
-	Port           *int    `json:"port" yaml:"port"`
-	Path           *string `json:"path" yaml:"path"`
-	Name           *string `json:"name" yaml:"name"`
-	Retries        *int    `json:"retries" yaml:"retries"`
-	ConnectTimeout *int    `json:"connect_timeout" yaml:"connect_timeout"`
-	WriteTimeout   *int    `json:"write_timeout" yaml:"write_timeout"`
-	ReadTimeout    *int    `json:"read_timeout" yaml:"read_timeout"`
-	Url            *string `json:"url" yaml:"url"`
+	Id             *string   `json:"id" yaml:"id"`
+	CreatedAt      *int      `json:"created_at" yaml:"created_at"`
+	UpdatedAt      *int      `json:"updated_at" yaml:"updated_at"`
+	Protocol       *string   `json:"protocol" yaml:"protocol"`
+	Host           *string   `json:"host" yaml:"host"`
+	Port           *int      `json:"port" yaml:"port"`
+	Path           *string   `json:"path" yaml:"path"`
+	Name           *string   `json:"name" yaml:"name"`
+	Retries        *int      `json:"retries" yaml:"retries"`
+	ConnectTimeout *int      `json:"connect_timeout" yaml:"connect_timeout"`
+	WriteTimeout   *int      `json:"write_timeout" yaml:"write_timeout"`
+	ReadTimeout    *int      `json:"read_timeout" yaml:"read_timeout"`
+	Url            *string   `json:"url" yaml:"url"`
+	Tags           []*string `json:"tags" yaml:"tags"`
 }
 
 type Services struct {
diff --git a/vendor/github.com/DeveloperJim/gokong/upstreams.go b/vendor/github.com/DeveloperJim/gokong/upstreams.go
index 790426b1f4..0cafb649b0 100644
--- a/vendor/github.com/DeveloperJim/gokong/upstreams.go
+++ b/vendor/github.com/DeveloperJim/gokong/upstreams.go
@@ -19,6 +19,7 @@ type UpstreamRequest struct {
 	HashOnCookie       string               `json:"hash_on_cookie,omitempty" yaml:"hash_on_cookie,omitempty"`
 	HashOnCookiePath   string               `json:"hash_on_cookie_path,omitempty" yaml:"hash_on_cookie_path,omitempty"`
 	HealthChecks       *UpstreamHealthCheck `json:"healthchecks,omitempty" yaml:"healthchecks,omitempty"`
+	Tags               []*string            `json:"tags" yaml:"tags"`
 }
 
 type UpstreamHealthCheck struct {