diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e8a47563..bc2774dad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### v0.4.0
+
+Some cleanups and changes in preparation for release v0.5.0 that will receive a big refactor (with different breaking changes) needed to bring a lot of new features.
 
 ### v0.3.0
 
diff --git a/examples/kubernetes/README.md b/examples/kubernetes/README.md
index e360475aa..1c4879e20 100644
--- a/examples/kubernetes/README.md
+++ b/examples/kubernetes/README.md
@@ -6,14 +6,13 @@ In this example you'll see how stolon can provide an high available postgreSQL c
 ## Docker image
 Prebuilt images are available on the dockerhub, the images' tags are their release version. Additional images are available:
 
-* `latest`: latest released image (actually v0.3.0).
+* `latest`: latest released image (actually v0.4.0).
 * `master`: automatically built after every commit to the master branch.
 
 
 In the [image](examples/kubernetes/image/docker) directory you'll find the Dockerfile to build the image used in this example. Once the image is built you should push it to the docker registry used by your kubernetes infrastructure.
 
-`sorintlab/stolon:master` is the one used by the kubernetes definitions in this example.
-For a more stable testing you can use `sorintlab/stolon:latest`
+`sorintlab/stolon:v0.4.0` is the one used by the kubernetes definitions in this example.
 
 ### Keepers discovery
 
diff --git a/examples/kubernetes/stolon-keeper.yaml b/examples/kubernetes/stolon-keeper.yaml
index f6ddd2126..278e81bc9 100644
--- a/examples/kubernetes/stolon-keeper.yaml
+++ b/examples/kubernetes/stolon-keeper.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-keeper
-        image: sorintlab/stolon:master
+        image: sorintlab/stolon:v0.4.0
         env:
           - name: KEEPER
             value: "true"
diff --git a/examples/kubernetes/stolon-proxy.yaml b/examples/kubernetes/stolon-proxy.yaml
index d5f44aacb..559a1fe02 100644
--- a/examples/kubernetes/stolon-proxy.yaml
+++ b/examples/kubernetes/stolon-proxy.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-proxy
-        image: sorintlab/stolon:master
+        image: sorintlab/stolon:v0.4.0
         env:
           - name: PROXY
             value: "true"
diff --git a/examples/kubernetes/stolon-sentinel.yaml b/examples/kubernetes/stolon-sentinel.yaml
index 01917e6e4..d951a169b 100644
--- a/examples/kubernetes/stolon-sentinel.yaml
+++ b/examples/kubernetes/stolon-sentinel.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
       - name: stolon-sentinel
-        image: sorintlab/stolon:master
+        image: sorintlab/stolon:v0.4.0
         env:
           - name: SENTINEL
             value: "true"