diff --git a/.gitignore b/.gitignore
index 24a5d35..6fcc8d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ ssh-keys
 saml-keys
 .keys
 .ssh-keys
+
+# Go Dependency Management
+vendor
diff --git a/.travis.yml b/.travis.yml
index 6db4b1b..c0d3544 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,19 +12,13 @@ before_install:
   - git config --global url."git@github.com:".insteadOf "https://github.com/"
   - go get -u github.com/axw/gocov/gocov
   - go get -u github.com/AlekSi/gocov-xml
-  - go get -u gopkg.in/h2non/gock.v1
-  - go get -u github.com/JormungandrK/microservice-tools
-  - go get -u github.com/JormungandrK/microservice-security/...
-  - go get -u github.com/goadesign/goa/...
-  - go get -u gopkg.in/mgo.v2
-  - go get -u github.com/afex/hystrix-go/hystrix
-  - go get -u github.com/satori/go.uuid
-  - go get -u github.com/dgrijalva/jwt-go
+  - go get -u -v github.com/golang/dep/cmd/dep
+  - dep ensure -v
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
 
 script:
-  - gocov test github.com/JormungandrK/jwt-issuer/... | gocov-xml > coverage.xml && ./cc-test-reporter format-coverage -t cobertura -o coverage.json coverage.xml
+  - gocov test $(go list ./... | grep -v vendor) | gocov-xml > coverage.xml && ./cc-test-reporter format-coverage -t cobertura -o coverage.json coverage.xml
   - if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter upload-coverage -i coverage.json; fi
diff --git a/Dockerfile b/Dockerfile
index 7d3ed82..95dcea9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,14 @@
 ### Multi-stage build
-FROM jormungandrk/goa-build as build
+FROM golang:1.8.3-alpine3.6 as build
+
+RUN apk add --no-cache git
 
 COPY . /go/src/github.com/JormungandrK/jwt-issuer
+
+WORKDIR /go/src/github.com/JormungandrK/jwt-issuer
+
+RUN go get -u -v github.com/golang/dep/cmd/dep
+RUN dep ensure -v
 RUN go install github.com/JormungandrK/jwt-issuer
 
 
diff --git a/Gopkg.lock b/Gopkg.lock
new file mode 100644
index 0000000..fe13c00
--- /dev/null
+++ b/Gopkg.lock
@@ -0,0 +1,123 @@
+# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
+
+
+[[projects]]
+  branch = "master"
+  name = "github.com/JormungandrK/microservice-security"
+  packages = ["auth","chain","jwt"]
+  revision = "f8001122d4891c84abf8cadd780c071d2a409b3b"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/JormungandrK/microservice-tools"
+  packages = ["gateway"]
+  revision = "de2be3865cac4263bf5fc1f19000ae23a49feba2"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/afex/hystrix-go"
+  packages = ["hystrix","hystrix/metric_collector","hystrix/rolling"]
+  revision = "f118cd938f786d24f46cc307981d8f63b7951020"
+
+[[projects]]
+  name = "github.com/ajg/form"
+  packages = ["."]
+  revision = "cc2954064ec9ea8d93917f0f87456e11d7b881ad"
+  version = "v1.5"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/armon/go-metrics"
+  packages = ["."]
+  revision = "9a4b6e10bed6220a1665955aa2b75afc91eb10b3"
+
+[[projects]]
+  name = "github.com/dgrijalva/jwt-go"
+  packages = ["."]
+  revision = "dbeaa9332f19a944acb5736b4456cfcc02140e29"
+  version = "v3.1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/dimfeld/httppath"
+  packages = ["."]
+  revision = "ee938bf735983d53694d79138ad9820efff94c92"
+
+[[projects]]
+  name = "github.com/dimfeld/httptreemux"
+  packages = ["."]
+  revision = "8cc36ee10f84b82d0742ffcab770815c7d3f9ad7"
+  version = "v5.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/goadesign/goa"
+  packages = [".","client","design","design/apidsl","dslengine","encoding/form","goatest","middleware","middleware/security/jwt","uuid"]
+  revision = "948c35808c713f7557fe2be38f09a628c6398c2d"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/go-immutable-radix"
+  packages = ["."]
+  revision = "8aac2701530899b64bdea735a1de8da899815220"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/hashicorp/golang-lru"
+  packages = ["simplelru"]
+  revision = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"
+
+[[projects]]
+  name = "github.com/inconshreveable/mousetrap"
+  packages = ["."]
+  revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+  version = "v1.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/manveru/faker"
+  packages = ["."]
+  revision = "9fbc68a78c4dbc7914e1a23f88f126bea4383b97"
+
+[[projects]]
+  name = "github.com/satori/go.uuid"
+  packages = ["."]
+  revision = "879c5887cd475cd7864858769793b2ceb0d44feb"
+  version = "v1.1.0"
+
+[[projects]]
+  name = "github.com/spf13/cobra"
+  packages = ["."]
+  revision = "7b2c5ac9fc04fc5efafb60700713d4fa609b777b"
+  version = "v0.0.1"
+
+[[projects]]
+  name = "github.com/spf13/pflag"
+  packages = ["."]
+  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+  version = "v1.0.0"
+
+[[projects]]
+  branch = "master"
+  name = "github.com/zach-klippenstein/goregen"
+  packages = ["."]
+  revision = "795b5e3961ea1912fde60af417ad85e86acc0d6a"
+
+[[projects]]
+  branch = "master"
+  name = "golang.org/x/net"
+  packages = ["context","websocket"]
+  revision = "01c190206fbdffa42f334f4b2bf2220f50e64920"
+
+[[projects]]
+  name = "gopkg.in/h2non/gock.v1"
+  packages = ["."]
+  revision = "84d599244901620fb3eb96473eb9e50619f69b47"
+  version = "v1.0.6"
+
+[solve-meta]
+  analyzer-name = "dep"
+  analyzer-version = 1
+  inputs-digest = "7f16f793b2c2ce4fc7316ada548eb8085d0bfaa76e4ba0e94bee88d14e2ed44e"
+  solver-name = "gps-cdcl"
+  solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
new file mode 100644
index 0000000..e275189
--- /dev/null
+++ b/Gopkg.toml
@@ -0,0 +1,58 @@
+
+# Gopkg.toml example
+#
+# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
+# for detailed Gopkg.toml documentation.
+#
+# required = ["github.com/user/thing/cmd/thing"]
+# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
+#
+# [[constraint]]
+#   name = "github.com/user/project"
+#   version = "1.0.0"
+#
+# [[constraint]]
+#   name = "github.com/user/project2"
+#   branch = "dev"
+#   source = "github.com/myfork/project2"
+#
+# [[override]]
+#  name = "github.com/x/y"
+#  version = "2.4.0"
+
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/JormungandrK/microservice-security"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/JormungandrK/microservice-tools"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/afex/hystrix-go"
+
+[[constraint]]
+  name = "github.com/dgrijalva/jwt-go"
+  version = "3.1.0"
+
+[[constraint]]
+  branch = "master"
+  name = "github.com/goadesign/goa"
+
+[[constraint]]
+  name = "github.com/satori/go.uuid"
+  version = "1.1.0"
+
+[[constraint]]
+  name = "github.com/spf13/cobra"
+  version = "0.0.1"
+
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/net"
+
+[[constraint]]
+  name = "gopkg.in/h2non/gock.v1"
+  version = "1.0.6"