diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 39229be..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-sudo: false
-
-language: go
-go:
-- '1.12'
-
-env:
-- GO111MODULE=on
-- DOCKER_USERNAME="opensource@postfinance.ch"
-- secure: jJUR0jG9XLSdw2JQGq1+oIkvi30ST3Epc31h+Gwf3DvBwKoCE3xZu54DG3HXHMV6dlz9fRNQVWm7AF9rGWBO6hk+u17R5AIdjYJMNYEU9eybgLAAljq8vricH6+uIC77It9FFCwyv2l1zv2fGNummMbqBnJhfIxf+39n+gEBUyrXivoVp8e9ZTwQ8mNuwCd0M1fq6qQKYhYOf5+z0OeRigvv/ZaHF3iRKntllwlUUWrO3DifYuJrt/6ieO41TkEfZD7awEeSHxxQ9gKsTczZ+vwJsY+XcVpM8TuZXXgL56ZmtLow2f5+MQjj+TcmF6etnUVUh2bUjDXUPgZD/TCcS1tXxYm4sQJPIWChF1YpbE0mwQ2e/KcZAD/lcUkp56IyzuaChoNPmiiYL+vk9HSSV/jgxALwwk3DdvX8h0s2i6UkTkjrOj8/ls1i/x83WIqZHOZUmCbfPQaH8ntXTAASijh7YDl/PKMxTLEDWRJbTmEL7AG3JXAPFzj3wt/9UOeRDxOtTMoQYU3UfBzkHHALji/eCHEgtWZMsijp8sJd/kAwdEzVwtwpsQ19+HG/NSxzrdB+ToBlXJ/Oh8vTPe5B64Qc0aQff5Q0x4VuNliywCHbLhCcJmnPDGcuRELV6iNLfkV3RzbMun+gP+G5q4c2jorirZfWGcJYiTTaImbqJzg=
-- DOCKER_TAG="latest"
-
-
-services:
-- docker
-
-stages:
-- build
-
-before_script:
-- echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-- TAG=$(git describe --tags --abbrev=0)
-- COUNT=$(git rev-list --count ${TAG}...HEAD)
-- test ${COUNT} -eq 0 && export DOCKER_TAG=$(echo ${TAG} | sed 's/^v//')
-
-jobs:
-  include:
-  - stage: build
-    name: "build and deploy authenticator"
-    env:
-    - BINARY=dist/vault-kubernetes-authenticator
-    - IMAGE=postfinance/vault-kubernetes-authenticator:${DOCKER_TAG}
-    script:
-    - go build -o ${BINARY} ./cmd/authenticator/main.go
-    - docker build --build-arg BINARY=${BINARY} -t  -f packaging/docker/authenticator/Dockerfile
-    - docker push ${IMAGE}
-  - stage: build
-    name: "build and deploy synchronizer"
-    env:
-    - BINARY=dist/vault-kubernetes-synchronizer
-    - IMAGE=postfinance/vault-kubernetes-synchronizer:${DOCKER_TAG}
-    script:
-    - go build -o ${BINARY} ./cmd/synchronizer/main.go
-    - docker build --build-arg BINARY=${BINARY} -t  -f packaging/docker/synchronizer/Dockerfile
-    - docker push ${IMAGE}
-  - stage: build
-    name: "build and deploy token-renewer"
-    env:
-    - BINARY=dist/vault-kubernetes-token-renewer
-    - IMAGE=postfinance/vault-kubernetes-token-renewer:${DOCKER_TAG}
-    script:
-    - go build -o ${BINARY} ./cmd/token-renewer/main.go
-    - docker build --build-arg BINARY=${BINARY} -t  -f packaging/docker/token-renewer/Dockerfile
-
-branches:
-  only:
-  - master
-
-matrix:
-  fast_finish: true
diff --git a/README.md b/README.md
index c0139ff..eb16d6d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 [![Go Report Card](https://goreportcard.com/badge/github.com/postfinance/vault-kubernetes)](https://goreportcard.com/report/github.com/postfinance/vault-kubernetes)
-[![Build Status](https://travis-ci.org/postfinance/vault-kubernetes.svg?branch=master)](https://travis-ci.org/postfinance/vault-kubernetes)
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
diff --git a/packaging/docker/authenticator/Dockerfile b/packaging/docker/authenticator/Dockerfile
index b7d2753..acb4fe6 100644
--- a/packaging/docker/authenticator/Dockerfile
+++ b/packaging/docker/authenticator/Dockerfile
@@ -1,9 +1,23 @@
-FROM alpine:3.8
+FROM golang:1.12-alpine as builder
+RUN apk --no-cache add git
 
-LABEL authors="marc.sauter@postfinance.ch"
+ENV GO111MODULE=on
+ENV CGO_ENABLED=0
 
-ARG BINARY
-COPY $BINARY /authenticator
+WORKDIR /vgo/
+COPY . .
 
-ENTRYPOINT ["/authenticator"]
+RUN ls -al
+RUN go build -o /authenticator ./cmd/authenticator/main.go
+
+# Build runtime
+FROM alpine:3.8 as runtime
+MAINTAINER OpenSource PF <opensource@postfinance.ch>
+
+COPY --from=builder /authenticator /authenticator
+
+# Run as nobody:x:65534:65534:nobody:/:/sbin/nologin
+USER 65534
+
+CMD ["/authenticator"]
 
diff --git a/packaging/docker/synchronizer/Dockerfile b/packaging/docker/synchronizer/Dockerfile
index 770ac47..b8b573c 100644
--- a/packaging/docker/synchronizer/Dockerfile
+++ b/packaging/docker/synchronizer/Dockerfile
@@ -1,9 +1,23 @@
-FROM alpine:3.8
+FROM golang:1.12-alpine as builder
+RUN apk --no-cache add git
 
-LABEL authors="marc.sauter@postfinance.ch"
+ENV GO111MODULE=on
+ENV CGO_ENABLED=0
 
-ARG BINARY
-ADD $BINARY /synchronizer
+WORKDIR /vgo/
+COPY . .
 
-ENTRYPOINT ["/synchronizer"]
+RUN ls -al
+RUN go build -o /synchronizer ./cmd/synchronizer/main.go
+
+# Build runtime
+FROM alpine:3.8 as runtime
+MAINTAINER OpenSource PF <opensource@postfinance.ch>
+
+COPY --from=builder /synchronizer /synchronizer
+
+# Run as nobody:x:65534:65534:nobody:/:/sbin/nologin
+USER 65534
+
+CMD ["/synchronizer"]
 
diff --git a/packaging/docker/token-renewer/Dockerfile b/packaging/docker/token-renewer/Dockerfile
index 48b81f7..f581201 100644
--- a/packaging/docker/token-renewer/Dockerfile
+++ b/packaging/docker/token-renewer/Dockerfile
@@ -1,9 +1,23 @@
-FROM alpine:3.8
+FROM golang:1.12-alpine as builder
+RUN apk --no-cache add git
 
-LABEL authors="marc.sauter@postfinance.ch"
+ENV GO111MODULE=on
+ENV CGO_ENABLED=0
 
-ARG BINARY
-ADD $BINARY /token-renewer
+WORKDIR /vgo/
+COPY . .
 
-ENTRYPOINT ["/token-renewer"]
+RUN ls -al
+RUN go build -o /token-renewer ./cmd/token-renewer/main.go
+
+# Build runtime
+FROM alpine:3.8 as runtime
+MAINTAINER OpenSource PF <opensource@postfinance.ch>
+
+COPY --from=builder /token-renewer /token-renewer
+
+# Run as nobody:x:65534:65534:nobody:/:/sbin/nologin
+USER 65534
+
+CMD ["/token-renewer"]