diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0e308265..09b05e7a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
       - restore_cache:
           keys:
             - go-mod-v1-{{ checksum "go.sum" }}
-      - run: test/goreleaser.sh --skip-validate --skip-publish
+      - run: test/goreleaser.sh
 
   e2e-istio-testing:
     machine: true
@@ -111,21 +111,12 @@ jobs:
 
 workflows:
   version: 2
-  build-and-test:
+  test-build-push:
     jobs:
       - build-binary:
           filters:
             branches:
               ignore: gh-pages
-      - push-binary:
-          requires:
-            - build-binary
-          filters:
-            branches:
-              ignore:
-                - /gh-pages.*/
-                - /docs-.*/
-                - /release-.*/
       - e2e-istio-testing:
           requires:
             - build-binary
@@ -185,3 +176,11 @@ workflows:
                 - /gh-pages.*/
                 - /docs-.*/
                 - /release-.*/
+      - push-binary:
+          requires:
+            - push-container
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /[0-9]+(\.[0-9]+)*(-.*)*/
\ No newline at end of file
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 03d56489..4eaf20a2 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -16,5 +16,3 @@ changelog:
   filters:
     exclude:
       - '^CircleCI'
-snapshot:
-  name_template: SNAPSHOT-{{.Commit}}
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 1dcb376a..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-sudo: required
-language: go
-
-branches:
-  except:
-    - /gh-pages.*/
-    - /docs-.*/
-
-go:
-- 1.12.x
-
-services:
-- docker
-
-addons:
-  apt:
-    packages:
-    - docker-ce
-
-deploy:
-- provider: script
-  skip_cleanup: true
-  script: curl -sL http://git.io/goreleaser | bash
-  on:
-    tags: true