diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4d4f17688..fa7ca5f1b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
 # Changelog
 
+## 1.6.0 (2022-05-10)
+
+### Features
+
+* superadmin settings ([7a51f84](https://www.github.com/windmill-labs/windmill/commit/7a51f842f01e17c4d230c060fa0de558553ad3ed))
+* user settings is now at workspace level ([a130806](https://www.github.com/windmill-labs/windmill/commit/a130806e1929267ee40ca443e3dac6e1a5d80da3))
+
+
+### Bug Fixes
+
+* display more than default 30 workspaces as superadmin ([55b5695](https://www.github.com/windmill-labs/windmill/commit/55b5695673912ffe040d3011c020b1002b4e3268))
+
 ## [1.5.0](https://www.github.com/windmill-labs/windmill/v1.5.0) (2022-05-02)
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index c10e25a952..5ae8d2147e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -4011,7 +4011,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.5.0"
+version = "1.6.0"
 dependencies = [
  "anyhow",
  "argon2",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index d5d21cc89f..7e387e8d10 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.5.0"
+version = "1.6.0"
 authors = ["Ruben Fiszel <ruben@rubenfiszel.com>"]
 edition = "2021"
 
diff --git a/backend/openapi.yaml b/backend/openapi.yaml
index cdd2821b13..c8db4e2aef 100644
--- a/backend/openapi.yaml
+++ b/backend/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.5.0
+  version: 1.6.0
   title: Windmill server API
   contact:
     name: Windmill contact
diff --git a/frontend/package.json b/frontend/package.json
index efd83e13c4..af190d8aa7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill",
-	"version": "1.5.0",
+	"version": "1.6.0",
 	"scripts": {
 		"dev": "svelte-kit dev",
 		"build": "svelte-kit build",
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index ddc24003d3..79cf4b47d6 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.5.0"
+version = "1.6.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
@@ -16,7 +16,7 @@ include = ["wmill/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-windmill-api = "^1.5.0"
+windmill-api = "^1.6.0"
 
 [build-system]
 requires = ["poetry>=1.0.2", "poetry-dynamic-versioning"]
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 68ba0db9e5..6175769a70 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.5.0"
+version = "1.6.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
@@ -16,7 +16,7 @@ include = ["wmill_pg/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.7"
-wmill = "^1.5.0"
+wmill = "^1.6.0"
 psycopg2-binary = "*"
 
 [build-system]
diff --git a/version.txt b/version.txt
index bc80560fad..dc1e644a10 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.5.0
+1.6.0