diff --git a/CHANGELOG.md b/CHANGELOG.md
index 760a7ab02..c39c9c420 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+### v0.8.0
+
+#### New features
+
+* Added support for etcd v3 api (using --store-backend etcdv3) ([#393](https://github.com/sorintlab/stolon/pull/393))
+* Now the stolon-proxy has tcp keepalive enabled by default and provides options for tuning its behavior ([#357](https://github.com/sorintlab/stolon/pull/357))
+* Added `removekeeper` command to stolonctl ([#383](https://github.com/sorintlab/stolon/pull/383))
+* Added the ability to choose the authentication method for su and replication user (currently one of md5 or trust) ([#380](https://github.com/sorintlab/stolon/pull/380))
+
+#### BugFixes
+* Fixed and improved db startup logic to handle a different pg_ctl start behavior between postgres 9 and 10 ([#401](https://github.com/sorintlab/stolon/pull/401))
+* Fixed keeper datadir locking ([#405](https://github.com/sorintlab/stolon/pull/405))
+
+and [many other](https://github.com/sorintlab/stolon/milestone/7) bug fixes and documentation improvements.
+
+Thanks to everybody who contributed to this release:
+
+AmberBee, @emded, Pierre Fersing
+
 ### v0.7.0
 
 #### New features
diff --git a/examples/kubernetes/rc/stolon-keeper0.yaml b/examples/kubernetes/rc/stolon-keeper0.yaml
index 94c382a15..7541c4702 100644
--- a/examples/kubernetes/rc/stolon-keeper0.yaml
+++ b/examples/kubernetes/rc/stolon-keeper0.yaml
@@ -18,7 +18,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
       - name: stolon-keeper
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"
diff --git a/examples/kubernetes/rc/stolon-keeper1.yaml b/examples/kubernetes/rc/stolon-keeper1.yaml
index e5e930128..80a8456c5 100644
--- a/examples/kubernetes/rc/stolon-keeper1.yaml
+++ b/examples/kubernetes/rc/stolon-keeper1.yaml
@@ -18,7 +18,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
       - name: stolon-keeper
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"
diff --git a/examples/kubernetes/rc/stolon-proxy.yaml b/examples/kubernetes/rc/stolon-proxy.yaml
index 50199b668..a4e64aff8 100644
--- a/examples/kubernetes/rc/stolon-proxy.yaml
+++ b/examples/kubernetes/rc/stolon-proxy.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-proxy
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"
diff --git a/examples/kubernetes/rc/stolon-sentinel.yaml b/examples/kubernetes/rc/stolon-sentinel.yaml
index 65a606ead..a810c44c0 100644
--- a/examples/kubernetes/rc/stolon-sentinel.yaml
+++ b/examples/kubernetes/rc/stolon-sentinel.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-sentinel
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"
diff --git a/examples/kubernetes/statefulset/stolon-keeper.yaml b/examples/kubernetes/statefulset/stolon-keeper.yaml
index f87b23acc..90fbcaa33 100644
--- a/examples/kubernetes/statefulset/stolon-keeper.yaml
+++ b/examples/kubernetes/statefulset/stolon-keeper.yaml
@@ -18,7 +18,7 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
       - name: stolon-keeper
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"
diff --git a/examples/kubernetes/statefulset/stolon-proxy.yaml b/examples/kubernetes/statefulset/stolon-proxy.yaml
index 50199b668..a4e64aff8 100644
--- a/examples/kubernetes/statefulset/stolon-proxy.yaml
+++ b/examples/kubernetes/statefulset/stolon-proxy.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-proxy
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"
diff --git a/examples/kubernetes/statefulset/stolon-sentinel.yaml b/examples/kubernetes/statefulset/stolon-sentinel.yaml
index 65a606ead..a810c44c0 100644
--- a/examples/kubernetes/statefulset/stolon-sentinel.yaml
+++ b/examples/kubernetes/statefulset/stolon-sentinel.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-sentinel
-        image: sorintlab/stolon:master-pg9.6
+        image: sorintlab/stolon:v0.8.0-pg9.6
         command:
           - "/bin/bash"
           - "-ec"