diff --git a/.goreleaser.yml b/.goreleaser.yml
index 6b3103e1..e63dee16 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -24,7 +24,9 @@ changelog:
 dockers:
   -
     image_templates:
-    - quay.io/mittwald/kubernetes-secret-generator
+    - quay.io/mittwald/kubernetes-secret-generator:stable
+    - quay.io/mittwald/kubernetes-secret-generator:{{ .Tag }}
+    - quay.io/mittwald/kubernetes-secret-generator:{{ .Tag }}-{{ .Env.GO_VERSION }}
     extra_files:
     - util/copy_secret.go
     - main.go
diff --git a/.travis.yml b/.travis.yml
index 202532fa..93eb5cde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,15 @@ script:
 
 before_deploy:
   - if [[ "${TRAVIS_BRANCH}" == "master" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then docker login -u "${DOCKER_LOGIN_NAME}" -p "${DOCKER_LOGIN_PASSWORD}" "${DOCKER_LOGIN_URL}"; fi
+  - export FULL_IMAGE="${DOCKER_LOGIN_URL}/mittwald/kubernetes-secret-generator"
 deploy:
+  - provider: script
+    skip_cleanup: true
+    script: docker build -t "${FULL_IMAGE}:latest" && docker push "${FULL_IMAGE}:latest"
+    on:
+      tags: false
+      branch: master
+      condition: $TRAVIS_OS_NAME = linux
   - provider: script
     skip_cleanup: true
     script: curl -sL https://git.io/goreleaser | bash -s -- --rm-dist