diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6ffce68..78633af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -40,7 +40,8 @@ jobs:
             else
               echo "Not a release! Skip charts publish"
             fi
-
+workflows:
+  version: 2
   release:
     jobs:
       - push-helm-charts:
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 1b1436b..47b5030 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -10,12 +10,7 @@ builds:
       - amd64
     env:
       - CGO_ENABLED=0
-    ignore:
-      - goos: darwin
-        goarch: 386
-      - goos: windows
-        goarch: 386
-archive:
-  name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
-  files:
-  - none*
+archives:
+  - name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
+    files:
+      - none*
diff --git a/Makefile b/Makefile
index 0300063..0cb1548 100644
--- a/Makefile
+++ b/Makefile
@@ -40,3 +40,7 @@ version-set:
 	sed -i '' "s/version: $$current/version: $$next/g" charts/podinfo/Chart.yaml && \
 	sed -i '' "s/podinfo:$$current/podinfo:$$next/g" kustomize/deployment.yaml && \
 	echo "Version $$next set in code, deployment, chart and kustomize"
+
+release:
+	git tag $(VERSION)
+	git push origin $(VERSION)
diff --git a/README.md b/README.md
index 179ecbf..97018f8 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
 # podinfo
 
+[![Build Status](https://travis-ci.org/stefanprodan/podinfo.svg?branch=master)](https://travis-ci.org/stefanprodan/podinfo)
+[![Docker Pulls](https://img.shields.io/docker/pulls/stefanprodan/podinfo)](https://hub.docker.com/r/stefanprodan/podinfo)
+
 Podinfo is a tiny web application made with Go 
 that showcases best practices of running microservices in Kubernetes.
 
diff --git a/charts/podinfo/Chart.yaml b/charts/podinfo/Chart.yaml
index 4565e25..7f5c7d8 100644
--- a/charts/podinfo/Chart.yaml
+++ b/charts/podinfo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
-version: 2.0.0-beta.1
-appVersion: 2.0.0-beta.1
+version: 2.0.0
+appVersion: 2.0.0
 name: podinfo
 engine: gotpl
 description: Podinfo Helm chart for Kubernetes
diff --git a/charts/podinfo/values.yaml b/charts/podinfo/values.yaml
index 321e108..7a146f6 100644
--- a/charts/podinfo/values.yaml
+++ b/charts/podinfo/values.yaml
@@ -12,7 +12,7 @@ faults:
 
 image:
   repository: quay.io/stefanprodan/podinfo
-  tag: 2.0.0-beta.1
+  tag: 2.0.0
   pullPolicy: IfNotPresent
 
 service:
diff --git a/kustomize/deployment.yaml b/kustomize/deployment.yaml
index 8d82ef1..49fd762 100644
--- a/kustomize/deployment.yaml
+++ b/kustomize/deployment.yaml
@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: podinfod
-        image: quay.io/stefanprodan/podinfo:2.0.0-beta.1
+        image: quay.io/stefanprodan/podinfo:2.0.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 9898
diff --git a/pkg/version/version.go b/pkg/version/version.go
index 5cb84c8..b48ef25 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -1,4 +1,4 @@
 package version
 
-var VERSION = "2.0.0-beta.1"
+var VERSION = "2.0.0"
 var REVISION = "unknown"