diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01431b15..9faf8de2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 Notable changes to 3scale Istio Mixer Adapter will be tracked in this document.
 
+## 0.6.0 - 2019-05-02
+
+## Added
+
+- The [OpenID Connect](https://github.com/3scale/3scale-istio-adapter/blob/v0.6.0/README.md#openid-connect-pattern) authentication pattern is now supported via Istio's [end user authn](https://istio.io/help/ops/security/end-user-auth/) and the CLI tool to generate templates can now generate an instance template supporting this pattern. The hybrid pattern has been updated to include OIDC as well. (#[89](https://github.com/3scale/3scale-istio-adapter/pull/89))
+
+## Changed
+
+- The CLI tool enables the so-called "fixup" mode when no explicit unique id is
+  specified, so that automatic generation of identifierss from URLs are modified
+  to comply with k8s format and rules. Now calling the tool without the --uid
+  option will autoenable the --fixup one. ([#91](https://github.com/3scale/3scale-istio-adapter/pull/91))
+
 ## 0.5.1 - 2019-04-09
 
 ### Fixed
diff --git a/README.md b/README.md
index a5842bfa..4de2186d 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ An [out of process gRPC Adapter](https://github.com/istio/istio/wiki/Mixer-Out-O
   * [Applying Patterns](#applying-patterns)
     * [API Key Pattern](#api-key-pattern)
     * [Application ID Pattern](#application-id-pattern)
+    * [OpenID Connect Pattern](#openid-connect-pattern)
     * [Hybrid](#hybrid-pattern)
 * [Generating sample CustomResources](#generating-sample-custom-resources)
 * [Adapter metrics](#adapter-metrics)
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
index 6f266705..0074308b 100644
--- a/deploy/deployment.yaml
+++ b/deploy/deployment.yaml
@@ -1,8 +1,8 @@
-# This code was generated as part of the release process using make release for version v0.5.1
+# This code was generated as part of the release process using make release for version v0.6.0
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  creationTimestamp: "2019-04-08T17:48:12Z"
+  creationTimestamp: "2019-05-02T12:50:00Z"
   labels:
     app: 3scale-istio-adapter
   name: 3scale-istio-adapter
@@ -18,7 +18,7 @@ spec:
     type: RollingUpdate
   template:
     metadata:
-      creationTimestamp: "2019-04-08T17:48:12Z"
+      creationTimestamp: "2019-05-02T12:50:00Z"
       labels:
         app: 3scale-istio-adapter
     spec:
@@ -30,7 +30,7 @@ spec:
           value: "true"
         - name: THREESCALE_METRICS_PORT
           value: "8080"
-        image: quay.io/3scale/3scale-istio-adapter:v0.5.1
+        image: quay.io/3scale/3scale-istio-adapter:v0.6.0
         imagePullPolicy: Always
         livenessProbe:
           initialDelaySeconds: 10