diff --git a/.circleci/config.yml b/.circleci/config.yml
index f72df74fb..88100ba74 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,11 +8,11 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - vendor-cache-{{ .Branch }}-{{ checksum "glide.lock" }}
+            - vendor-cache-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
             - vendor-cache-{{ .Branch }}
             - vendor-cache
 
-      - run: 
+      - run:
           name: "fix node-sass"
           command: |
             yarn remove node-sass
@@ -20,7 +20,7 @@ jobs:
 
       - run: make deps
       - save_cache:
-          key: vendor-cache-{{ .Branch }}-{{ checksum "glide.lock" }}
+          key: vendor-cache-{{ .Branch }}-{{ checksum "Gopkg.lock" }}
           paths:
             - vendor
       - save_cache:
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 000000000..0f19b3811
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,347 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/VividCortex/mysqlerr"
+  packages = ["."]
+  revision = "6c6b55f8796f578c870b7e19bafb16103bc40095"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/WatchBeam/clock"
+  packages = ["."]
+  revision = "b08e6b4da7ea8c03e0f0c47fd549d801f52a3019"
+
+[[projects]]
+  name = "github.com/beevik/etree"
+  packages = ["."]
+  revision = "15a30b44cfd6c5a16a7ddfe271bf146aaf2d3195"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/beorn7/perks"
+  packages = ["quantile"]
+  revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
+
+[[projects]]
+  name = "github.com/davecgh/go-spew"
+  packages = ["spew"]
+  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "d2709f9f1f31ebcda9651b03077758c1f3a0018c"
+  version = "v3.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/e-dard/netbug"
+  packages = ["."]
+  revision = "e64d308a0b205c901264e88a10e70d64acb1810d"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/elazarl/go-bindata-assetfs"
+  packages = ["."]
+  revision = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
+
+[[projects]]
+  name = "github.com/fsnotify/fsnotify"
+  packages = ["."]
+  revision = "629574ca2a5df945712d3079857300b5e4da0236"
+  version = "v1.4.2"
+
+[[projects]]
+  name = "github.com/garyburd/redigo"
+  packages = ["internal","redis"]
+  revision = "433969511232c397de61b1442f9fd49ec06ae9ba"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/go-kit/kit"
+  packages = ["endpoint","log","metrics","metrics/internal/lv","metrics/prometheus","transport/http"]
+  revision = "4dc7be5d2d12881735283bcab7352178e190fc71"
+  version = "v0.6.0"
+
+[[projects]]
+  name = "github.com/go-logfmt/logfmt"
+  packages = ["."]
+  revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
+  version = "v0.3.0"
+
+[[projects]]
+  name = "github.com/go-sql-driver/mysql"
+  packages = ["."]
+  revision = "a0583e0143b1624142adab07e0e97fe106d99561"
+  version = "v1.3"
+
+[[projects]]
+  name = "github.com/go-stack/stack"
+  packages = ["."]
+  revision = "817915b46b97fd7bb80e8ab6b69f01a53ac3eebf"
+  version = "v1.6.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/golang/protobuf"
+  packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"]
+  revision = "130e6b02ab059e7b717a096f397c5b60111cae74"
+
+[[projects]]
+  name = "github.com/gorilla/context"
+  packages = ["."]
+  revision = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"
+  version = "v1.1"
+
+[[projects]]
+  name = "github.com/gorilla/mux"
+  packages = ["."]
+  revision = "24fca303ac6da784b9e8269f724ddeb0b2eea5e7"
+  version = "v1.5.0"
+
+[[projects]]
+  name = "github.com/gorilla/websocket"
+  packages = ["."]
+  revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b"
+  version = "v1.2.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/hcl"
+  packages = [".","hcl/ast","hcl/parser","hcl/scanner","hcl/strconv","hcl/token","json/parser","json/scanner","json/token"]
+  revision = "42e33e2d55a0ff1d6263f738896ea8c13571a8d0"
+
+[[projects]]
+  name = "github.com/igm/sockjs-go"
+  packages = ["sockjs"]
+  revision = "d276e9ffe5cc5c271b81198cc77a2adf6c4482d2"
+  version = "v2.0.0"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/jmoiron/sqlx"
+  packages = [".","reflectx"]
+  revision = "d9bd385d68c068f1fabb5057e3dedcbcbb039d0f"
+
+[[projects]]
+  name = "github.com/jonboulle/clockwork"
+  packages = ["."]
+  revision = "2eee05ed794112d45db504eb05aa693efd2b8b09"
+  version = "v0.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kolide/agent-api"
+  packages = ["."]
+  revision = "f81f25bd36a2e73a762d4a5192d698bae06a7161"
+  source = "git@github.com:kolide/agent-api.git"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kolide/goose"
+  packages = ["."]
+  revision = "4a7848793d4402d338de853019ad72b9a4b3e68e"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kolide/kit"
+  packages = ["version"]
+  revision = "19dfff12e00e1d46d30636b9150ca5b9f9f05325"
+  source = "git@github.com:kolide/kit.git"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/kr/logfmt"
+  packages = ["."]
+  revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
+
+[[projects]]
+  name = "github.com/magiconair/properties"
+  packages = ["."]
+  revision = "be5ece7dd465ab0765a9682137865547526d1dfb"
+  version = "v1.7.3"
+
+[[projects]]
+  name = "github.com/matttproud/golang_protobuf_extensions"
+  packages = ["pbutil"]
+  revision = "3247c84500bff8d9fb6d579d800f20b3e091582c"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/mitchellh/mapstructure"
+  packages = ["."]
+  revision = "d0303fe809921458f417bcf828397a65db30a7e4"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/patrickmn/sortutil"
+  packages = ["."]
+  revision = "abeda66eb583fac2d8d98d3d2e6fbd5c67af7947"
+
+[[projects]]
+  name = "github.com/pelletier/go-toml"
+  packages = ["."]
+  revision = "16398bac157da96aa88f98a2df640c7f32af1da2"
+  version = "v1.0.1"
+
+[[projects]]
+  name = "github.com/pkg/errors"
+  packages = ["."]
+  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
+  version = "v0.8.0"
+
+[[projects]]
+  name = "github.com/pmezard/go-difflib"
+  packages = ["difflib"]
+  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/prometheus/client_golang"
+  packages = ["prometheus","prometheus/promhttp"]
+  revision = "c5b7fccd204277076155f10851dad72b76a49317"
+  version = "v0.8.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/client_model"
+  packages = ["go"]
+  revision = "6f3806018612930941127f2a7c6c453ba2c527d2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/common"
+  packages = ["expfmt","internal/bitbucket.org/ww/goautoneg","model"]
+  revision = "1bab55dd05dbff384524a6a1c99006d9eb5f139b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/prometheus/procfs"
+  packages = [".","xfs"]
+  revision = "e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/russellhaering/gosaml2"
+  packages = ["types"]
+  revision = "24fc04268654e4581f98de45f69b7f9aa6e4da1a"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/russellhaering/goxmldsig"
+  packages = [".","etreeutils","types"]
+  revision = "b7efc6231e45b10bfd779852831c8bb59b350ec5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/spf13/afero"
+  packages = [".","mem"]
+  revision = "e67d870304c4bca21331b02f414f970df13aa694"
+
+[[projects]]
+  name = "github.com/spf13/cast"
+  packages = ["."]
+  revision = "ce135a4ebeee6cfe9a26c93ee0d37825f26113c7"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/spf13/cobra"
+  packages = ["."]
+  revision = "7cd9cc6d44d35f623b0893afc3adc7b4513eeaf8"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/spf13/jwalterweatherman"
+  packages = ["."]
+  revision = "12bd96e66386c1960ab0f74ced1362f66f552f7b"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+  version = "v1.0.0"
+
+[[projects]]
+  name = "github.com/spf13/viper"
+  packages = ["."]
+  revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/stretchr/objx"
+  packages = ["."]
+  revision = "1a9d0bb9f541897e62256577b352fdbc1fb4fd94"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/stretchr/testify"
+  packages = ["assert","mock","require"]
+  revision = "890a5c3458b43e6104ff5da8dfa139d013d77544"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/crypto"
+  packages = ["bcrypt","blowfish"]
+  revision = "9419663f5a44be8b34ca85f08abc5fe1be11f8a3"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["context","http2","http2/hpack","idna","internal/timeseries","lex/httplex","trace"]
+  revision = "a04bdaca5b32abe1c069418fb7088ae607de5bd0"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/sys"
+  packages = ["unix"]
+  revision = "43eea11bc92608addb41b8a406b0407495c106f6"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/text"
+  packages = ["collate","collate/build","internal/colltab","internal/gen","internal/tag","internal/triegen","internal/ucd","language","secure/bidirule","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable"]
+  revision = "825fc78a2fd6fa0a5447e300189e3219e05e1f25"
+
+[[projects]]
+  branch = "master"
+  name = "google.golang.org/genproto"
+  packages = ["googleapis/rpc/status"]
+  revision = "f676e0f3ac6395ff1a529ae59a6670878a8371a6"
+
+[[projects]]
+  name = "google.golang.org/grpc"
+  packages = [".","balancer","codes","connectivity","credentials","grpclb/grpc_lb_v1/messages","grpclog","internal","keepalive","metadata","naming","peer","resolver","stats","status","tap","transport"]
+  revision = "f7bf885db0b7479a537ec317c6e48ce53145f3db"
+  version = "v1.7.0"
+
+[[projects]]
+  name = "gopkg.in/natefinch/lumberjack.v2"
+  packages = ["."]
+  revision = "a96e63847dc3c67d17befa69c303767e2f84e54f"
+  version = "v2.1"
+
+[[projects]]
+  branch = "v2"
+  name = "gopkg.in/yaml.v2"
+  packages = ["."]
+  revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "1517eca23ced1d92beb3d6ce40f2233c64fce1e8ac7f8c661e59ce0a9e614bf8"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 000000000..7576cc5b3
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,101 @@
+[[constraint]]
+  branch = "master"
+  name = "github.com/VividCortex/mysqlerr"
+
+[[constraint]]
+  name = "github.com/WatchBeam/clock"
+
+[[constraint]]
+  name = "github.com/beevik/etree"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+
+[[constraint]]
+  name = "github.com/e-dard/netbug"
+
+[[constraint]]
+  name = "github.com/elazarl/go-bindata-assetfs"
+
+[[constraint]]
+  name = "github.com/garyburd/redigo"
+  version = "1.0.0"
+
+[[constraint]]
+  name = "github.com/go-kit/kit"
+  version = "0.6.0"
+
+[[constraint]]
+  name = "github.com/go-sql-driver/mysql"
+
+[[constraint]]
+  name = "github.com/gorilla/mux"
+
+[[constraint]]
+  name = "github.com/gorilla/websocket"
+
+[[constraint]]
+  name = "github.com/igm/sockjs-go"
+
+[[constraint]]
+  name = "github.com/jmoiron/sqlx"
+
+[[constraint]]
+  name = "github.com/kolide/agent-api"
+  source = "git@github.com:kolide/agent-api.git"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/kolide/goose"
+  branch = "master"
+
+[[constraint]]
+  name = "github.com/kolide/kit"
+  source = "git@github.com:kolide/kit.git"
+
+[[constraint]]
+  name = "github.com/patrickmn/sortutil"
+
+[[constraint]]
+  name = "github.com/pkg/errors"
+
+[[constraint]]
+  name = "github.com/prometheus/client_golang"
+  version = "0.8.0"
+
+[[constraint]]
+  name = "github.com/russellhaering/gosaml2"
+
+[[constraint]]
+  name = "github.com/russellhaering/goxmldsig"
+
+[[constraint]]
+  name = "github.com/spf13/cast"
+  version = "~1.0.0"
+
+[[constraint]]
+  name = "github.com/spf13/cobra"
+
+[[constraint]]
+  name = "github.com/spf13/viper"
+
+[[constraint]]
+  name = "github.com/stretchr/testify"
+  branch = "master"
+
+[[constraint]]
+  name = "golang.org/x/crypto"
+
+[[constraint]]
+  name = "golang.org/x/net"
+
+[[constraint]]
+  name = "google.golang.org/grpc"
+  version = "1.5.1"
+
+[[constraint]]
+  name = "gopkg.in/natefinch/lumberjack.v2"
+  version = "2.0.0"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
diff --git a/Makefile b/Makefile
index 1f76f80a0..ce5db8946 100644
--- a/Makefile
+++ b/Makefile
@@ -105,15 +105,15 @@ lint-scss:
 	sass-lint --verbose
 
 lint-go:
-	go vet $(shell glide nv)
+	go vet ./...
 
 lint: lint-go lint-js lint-scss lint-ts
 
 test-go:
-	go test $(shell glide nv)
+	go test ./...
 
 analyze-go:
-	go test -race -cover $(shell glide nv)
+	go test -race -cover ./...
 
 
 test-js: export NODE_PATH = ./frontend
@@ -149,9 +149,9 @@ deps:
 	yarn
 	go get -u \
 		github.com/jteeuwen/go-bindata/... \
-		github.com/Masterminds/glide \
+		github.com/golang/dep/cmd/dep \
 		github.com/groob/mockimpl
-	glide install --strip-vendor
+	dep ensure -vendor-only
 
 distclean:
 ifeq ($(OS), Windows_NT)
diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index eecb2bbe7..000000000
--- a/glide.lock
+++ /dev/null
@@ -1,238 +0,0 @@
-hash: 50aef4de2679ec2dab8998862af276111be16e0e53d73018fae85cc896f9da8f
-updated: 2017-10-06T17:42:16.1040243-06:00
-imports:
-- name: github.com/alecthomas/template
-  version: a0175ee3bccc567396460bf5acd36800cb10c49c
-  subpackages:
-  - parse
-- name: github.com/alecthomas/units
-  version: 2efee857e7cfd4f3d0138cc3cbb1b4966962b93a
-- name: github.com/beevik/etree
-  version: 15a30b44cfd6c5a16a7ddfe271bf146aaf2d3195
-- name: github.com/beorn7/perks
-  version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-  subpackages:
-  - quantile
-- name: github.com/davecgh/go-spew
-  version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9
-  subpackages:
-  - spew
-- name: github.com/dgrijalva/jwt-go
-  version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20
-- name: github.com/e-dard/netbug
-  version: e64d308a0b205c901264e88a10e70d64acb1810d
-- name: github.com/elazarl/go-bindata-assetfs
-  version: 30f82fa23fd844bd5bb1e5f216db87fd77b5eb43
-- name: github.com/fsnotify/fsnotify
-  version: 4da3e2cfbabc9f751898f250b49f2439785783a1
-- name: github.com/garyburd/redigo
-  version: 433969511232c397de61b1442f9fd49ec06ae9ba
-  subpackages:
-  - internal
-  - redis
-- name: github.com/go-kit/kit
-  version: fadad6fffe0466b19df9efd9acde5c9a52df5fa4
-  subpackages:
-  - endpoint
-  - log
-  - metrics
-  - metrics/internal/lv
-  - metrics/prometheus
-  - transport/http
-- name: github.com/go-logfmt/logfmt
-  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-- name: github.com/go-sql-driver/mysql
-  version: 3654d25ec346ee8ce71a68431025458d52a38ac0
-- name: github.com/go-stack/stack
-  version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf
-- name: github.com/go-yaml/yaml
-  version: 25c4ec802a7d637f88d584ab26798e94ad14c13b
-- name: github.com/golang/mock
-  version: 13f360950a79f5864a972c786a10a50e44b69541
-- name: github.com/golang/protobuf
-  version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
-  subpackages:
-  - proto
-  - ptypes
-  - ptypes/any
-  - ptypes/duration
-  - ptypes/timestamp
-- name: github.com/gorilla/context
-  version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
-- name: github.com/gorilla/mux
-  version: ac112f7d75a0714af1bd86ab17749b31f7809640
-- name: github.com/gorilla/websocket
-  version: a69d9f6de432e2c6b296a947d8a5ee88f68522cf
-- name: github.com/hashicorp/hcl
-  version: 392dba7d905ed5d04a5794ba89f558b27e2ba1ca
-  subpackages:
-  - hcl/ast
-  - hcl/parser
-  - hcl/scanner
-  - hcl/strconv
-  - hcl/token
-  - json/parser
-  - json/scanner
-  - json/token
-- name: github.com/igm/sockjs-go
-  version: 1f275fbd3bcc9a21ec90217b80f40db44404410b
-  subpackages:
-  - sockjs
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/jmoiron/sqlx
-  version: d9bd385d68c068f1fabb5057e3dedcbcbb039d0f
-  subpackages:
-  - reflectx
-- name: github.com/jonboulle/clockwork
-  version: bcac9884e7502bb2b474c0339d889cb981a2f27f
-- name: github.com/jordan-wright/email
-  version: fd703108daeb23d77c124d12978e9b6c4f28f034
-- name: github.com/kolide/agent-api
-  version: 7fa34da2e8903787c7a5a3a14fb91892680add1b
-  repo: git@github.com:kolide/agent-api.git
-- name: github.com/kolide/goose
-  version: 4a7848793d4402d338de853019ad72b9a4b3e68e
-- name: github.com/kolide/kit
-  version: a2a44361a9498eabc6814e96c5a6f378305b771e
-  repo: git@github.com:kolide/kit.git
-  subpackages:
-  - version
-- name: github.com/kolide/osquery-go
-  version: 5419715d060ff8c2e1b7f6ff5a8127ac2ce3fbdc
-  subpackages:
-  - plugin/distributed
-  - plugin/logger
-- name: github.com/kr/logfmt
-  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/magiconair/properties
-  version: be5ece7dd465ab0765a9682137865547526d1dfb
-- name: github.com/matttproud/golang_protobuf_extensions
-  version: c12348ce28de40eed0136aa2b644d0ee0650e56c
-  subpackages:
-  - pbutil
-- name: github.com/mitchellh/mapstructure
-  version: d0303fe809921458f417bcf828397a65db30a7e4
-- name: github.com/patrickmn/sortutil
-  version: abeda66eb583fac2d8d98d3d2e6fbd5c67af7947
-- name: github.com/pelletier/go-toml
-  version: 69d355db5304c0f7f809a2edc054553e7142f016
-- name: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/pmezard/go-difflib
-  version: 792786c7400a136282c1664665ae0a8db921c6c2
-  subpackages:
-  - difflib
-- name: github.com/prometheus/client_golang
-  version: c5b7fccd204277076155f10851dad72b76a49317
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
-- name: github.com/prometheus/client_model
-  version: 6f3806018612930941127f2a7c6c453ba2c527d2
-  subpackages:
-  - go
-- name: github.com/prometheus/common
-  version: 61f87aac8082fa8c3c5655c7608d7478d46ac2ad
-  subpackages:
-  - expfmt
-  - internal/bitbucket.org/ww/goautoneg
-  - model
-- name: github.com/prometheus/procfs
-  version: e645f4e5aaa8506fc71d6edbc5c4ff02c04c46f2
-  subpackages:
-  - xfs
-- name: github.com/russellhaering/gosaml2
-  version: 24fc04268654e4581f98de45f69b7f9aa6e4da1a
-  subpackages:
-  - types
-- name: github.com/russellhaering/goxmldsig
-  version: 605161228693b2efadce55323c9c661a40c5fbaa
-  subpackages:
-  - etreeutils
-  - types
-- name: github.com/ryanuber/go-license
-  version: 9c9d2aca2d1a36bd73b496ebd2fd14fea6aca9a2
-- name: github.com/spf13/afero
-  version: 9be650865eab0c12963d8753212f4f9c66cdcf12
-  subpackages:
-  - mem
-- name: github.com/spf13/cast
-  version: ce135a4ebeee6cfe9a26c93ee0d37825f26113c7
-- name: github.com/spf13/cobra
-  version: b26b538f693051ac6518e65672de3144ce3fbedc
-- name: github.com/spf13/jwalterweatherman
-  version: 0efa5202c04663c757d84f90f5219c1250baf94f
-- name: github.com/spf13/pflag
-  version: e57e3eeb33f795204c1ca35f56c44f83227c6e66
-- name: github.com/spf13/viper
-  version: 25b30aa063fc18e48662b86996252eabdcf2f0c7
-- name: github.com/stretchr/objx
-  version: cbeaeb16a013161a98496fad62933b1d21786672
-- name: github.com/stretchr/testify
-  version: 05e8a0eda380579888eb53c394909df027f06991
-  subpackages:
-  - assert
-  - mock
-  - require
-- name: github.com/VividCortex/mysqlerr
-  version: 6c6b55f8796f578c870b7e19bafb16103bc40095
-- name: github.com/WatchBeam/clock
-  version: ac3776ffbf764bc40bda24e84184146865d0a46d
-- name: golang.org/x/crypto
-  version: bc89c496413265e715159bdc8478ee9a92fdc265
-  subpackages:
-  - bcrypt
-  - blowfish
-- name: golang.org/x/net
-  version: f5079bd7f6f74e23c4d65efa0f4ce14cbd6a3c0f
-  subpackages:
-  - context
-  - context/ctxhttp
-  - http2
-  - http2/hpack
-  - idna
-  - internal/timeseries
-  - lex/httplex
-  - trace
-- name: golang.org/x/sys
-  version: a646d33e2ee3172a661fc09bca23bb4889a41bc8
-  subpackages:
-  - unix
-- name: golang.org/x/text
-  version: 3bd178b88a8180be2df394a1fbb81313916f0e7b
-  subpackages:
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- name: google.golang.org/genproto
-  version: 09f6ed296fc66555a25fe4ce95173148778dfa85
-  subpackages:
-  - googleapis/rpc/status
-- name: google.golang.org/grpc
-  version: f92cdcd7dcdc69e81b2d7b338479a19a8723cfa3
-  subpackages:
-  - codes
-  - connectivity
-  - credentials
-  - grpclb/grpc_lb_v1/messages
-  - grpclog
-  - internal
-  - keepalive
-  - metadata
-  - naming
-  - peer
-  - stats
-  - status
-  - tap
-  - transport
-- name: gopkg.in/alecthomas/kingpin.v2
-  version: 1087e65c9441605df944fb12c33f0fe7072d18ca
-- name: gopkg.in/go-playground/validator.v8
-  version: 5f1438d3fca68893a817e4a66806cea46a9e4ebf
-- name: gopkg.in/natefinch/lumberjack.v2
-  version: dd45e6a67c53f673bb49ca8a001fd3a63ceb640e
-- name: gopkg.in/yaml.v2
-  version: e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
-testImports: []
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index 3ded6fa37..000000000
--- a/glide.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-package: github.com/kolide/fleet
-import:
-- package: github.com/kolide/kit
-  repo: git@github.com:kolide/kit.git
-  subpackages:
-  - version
-- package: github.com/alecthomas/template
-  version: a0175ee3bccc567396460bf5acd36800cb10c49c
-  subpackages:
-  - parse
-- package: github.com/alecthomas/units
-  version: 2efee857e7cfd4f3d0138cc3cbb1b4966962b93a
-- package: github.com/dgrijalva/jwt-go
-  version: 01aeca54ebda6e0fbfafd0a524d234159c05ec20
-- package: github.com/go-sql-driver/mysql
-  version: 3654d25ec346ee8ce71a68431025458d52a38ac0
-- package: github.com/golang/protobuf
-  version: c3cefd437628a0b7d31b34fe44b3a7a540e98527
-  subpackages:
-  - proto
-- package: github.com/pmezard/go-difflib
-  version: ~1.0.0
-  subpackages:
-  - difflib
-- package: golang.org/x/crypto
-  version: bc89c496413265e715159bdc8478ee9a92fdc265
-  subpackages:
-  - bcrypt
-  - blowfish
-- package: golang.org/x/sys
-  version: a646d33e2ee3172a661fc09bca23bb4889a41bc8
-  subpackages:
-  - unix
-- package: gopkg.in/alecthomas/kingpin.v2
-  version: ~2.2.0
-- package: gopkg.in/go-playground/validator.v8
-  version: ~8.18.1
-- package: gopkg.in/yaml.v2
-  version: e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
-- package: github.com/elazarl/go-bindata-assetfs
-- package: github.com/jordan-wright/email
-  version: fd703108daeb23d77c124d12978e9b6c4f28f034
-- package: github.com/spf13/cobra
-- package: github.com/spf13/viper
-- package: gopkg.in/natefinch/lumberjack.v2
-  version: v2.0
-- package: github.com/golang/mock
-- package: github.com/WatchBeam/clock
-- package: github.com/prometheus/client_golang
-  version: ~0.8.0
-  subpackages:
-  - prometheus
-- package: github.com/patrickmn/sortutil
-- package: github.com/stretchr/testify
-  version: 05e8a0eda380579888eb53c394909df027f06991
-  subpackages:
-  - mock
-- package: github.com/garyburd/redigo
-  version: ^1.0.0
-  subpackages:
-  - redis
-- package: github.com/jmoiron/sqlx
-- package: github.com/kolide/goose
-  version: 4a7848793d4402d338de853019ad72b9a4b3e68e
-- package: github.com/VividCortex/mysqlerr
-  version: master
-- package: github.com/go-kit/kit
-  version: ~0.4.0
-- package: github.com/go-yaml/yaml
-- package: github.com/ryanuber/go-license
-- package: github.com/igm/sockjs-go
-- package: github.com/e-dard/netbug
-- package: github.com/spf13/cast
-  version: ~1.0.0
-- package: github.com/russellhaering/gosaml2
-- package: google.golang.org/grpc
-  version: ^1.5.1
-- package: github.com/kolide/agent-api
-  repo: git@github.com:kolide/agent-api.git
-- package: github.com/kolide/osquery-go
-  subpackages:
-  - plugin/distributed
-  - plugin/logger
-- package: google.golang.org/genproto
-  subpackages:
-  - googleapis/rpc/status
-- package: github.com/stretchr/objx
diff --git a/server/launcher/auth_middleware.go b/server/launcher/auth_middleware.go
index c046587e8..d9238350b 100644
--- a/server/launcher/auth_middleware.go
+++ b/server/launcher/auth_middleware.go
@@ -69,15 +69,9 @@ func (s authMiddleware) PublishResults(ctx context.Context, req *pb.ResultCollec
 	return s.next.PublishResults(authCtx, req)
 }
 
-func (s authMiddleware) HotConfigure(req *pb.AgentApiRequest, svr pb.Api_HotConfigureServer) (err error) {
-	if _, _, err := s.authenticateHost(context.Background(), req.NodeKey); err != nil {
-		return err
-	}
-	return s.next.HotConfigure(req, svr)
-}
-
-func (s authMiddleware) HotlineBling(svr pb.Api_HotlineBlingServer) (err error) {
-	return s.next.HotlineBling(svr)
+func (s authMiddleware) CheckHealth(ctx context.Context, coll *pb.AgentApiRequest) (*pb.HealthCheckResponse, error) {
+	// there should not be any auth
+	return s.next.CheckHealth(ctx, coll)
 }
 
 type auth struct {
diff --git a/server/launcher/binding.go b/server/launcher/binding.go
index 8f699bc40..b8bcd291c 100644
--- a/server/launcher/binding.go
+++ b/server/launcher/binding.go
@@ -172,12 +172,6 @@ func (b *agentBinding) PublishResults(ctx context.Context, coll *pb.ResultCollec
 	return &pb.AgentApiResponse{}, nil
 }
 
-// HotConfigure pushed configurations
-func (b *agentBinding) HotConfigure(in *pb.AgentApiRequest, svr pb.Api_HotConfigureServer) error {
-	return errNotImplmented
-}
-
-// HotlineBling this would be live query push to agent
-func (b *agentBinding) HotlineBling(svr pb.Api_HotlineBlingServer) error {
-	return errNotImplmented
+func (svc *agentBinding) CheckHealth(ctx context.Context, coll *pb.AgentApiRequest) (*pb.HealthCheckResponse, error) {
+	return nil, errNotImplmented
 }
diff --git a/server/launcher/logging_middleware.go b/server/launcher/logging_middleware.go
index eeb3dc67a..73ec2ef10 100644
--- a/server/launcher/logging_middleware.go
+++ b/server/launcher/logging_middleware.go
@@ -77,24 +77,13 @@ func (s loggingMiddleware) PublishResults(ctx context.Context, req *pb.ResultCol
 	return s.next.PublishResults(ctx, req)
 }
 
-func (s loggingMiddleware) HotConfigure(req *pb.AgentApiRequest, svr pb.Api_HotConfigureServer) (err error) {
+func (s loggingMiddleware) CheckHealth(ctx context.Context, coll *pb.AgentApiRequest) (resp *pb.HealthCheckResponse, err error) {
 	defer func(begin time.Time) {
 		s.logger.Log(
-			"method", "HotConfigure",
+			"method", "CheckHealth",
 			"err", err,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
-	return s.next.HotConfigure(req, svr)
-}
-
-func (s loggingMiddleware) HotlineBling(svr pb.Api_HotlineBlingServer) (err error) {
-	defer func(begin time.Time) {
-		s.logger.Log(
-			"method", "HotlineBling",
-			"err", err,
-			"took", time.Since(begin),
-		)
-	}(time.Now())
-	return s.next.HotlineBling(svr)
+	return s.next.CheckHealth(ctx, coll)
 }
diff --git a/tools/ci/docker/fleet-builder/1.9/Dockerfile b/tools/ci/docker/fleet-builder/1.9/Dockerfile
index b8bcb5fe9..668fcba48 100644
--- a/tools/ci/docker/fleet-builder/1.9/Dockerfile
+++ b/tools/ci/docker/fleet-builder/1.9/Dockerfile
@@ -74,7 +74,7 @@ RUN apk add --update \
 	openssh-client
 
 
-RUN go get -u -v github.com/Masterminds/glide
+RUN go get -u -v github.com/golang/dep/cmd/dep
 
 # git must be explicitly instructed to follow redirects for compatibility with
 # gopkg.in