diff --git a/CHANGELOG.md b/CHANGELOG.md
index 01f7b7546f..cf216cffbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.318.0](https://github.com/windmill-labs/windmill/compare/v1.317.1...v1.318.0) (2024-04-25)
+
+
+### Features
+
+* app select policy ([#3610](https://github.com/windmill-labs/windmill/issues/3610)) ([c09ae3e](https://github.com/windmill-labs/windmill/commit/c09ae3ebc6eab23434e74aadae887536e8f97c4d))
+
+
+### Bug Fixes
+
+* **frontend:** Improve AgGrid Infinite table default codes + deprecat… ([#3609](https://github.com/windmill-labs/windmill/issues/3609)) ([f26d3e6](https://github.com/windmill-labs/windmill/commit/f26d3e62f6d9b8d80c4e4d555c94b9b213e7c362))
+* support all pg types from db studio ([#3613](https://github.com/windmill-labs/windmill/issues/3613)) ([5def8cb](https://github.com/windmill-labs/windmill/commit/5def8cb52c24b5bf877275964aec35c05c91d7b6))
+
 ## [1.317.1](https://github.com/windmill-labs/windmill/compare/v1.317.0...v1.317.1) (2024-04-24)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index f1459da402..1b79daa658 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -7100,11 +7100,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a"
+checksum = "2c85f8e96d1d6857f13768fcbd895fcb06225510022a2774ed8b5150581847b0"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
  "chrono",
  "hex",
  "indexmap 1.9.3",
@@ -7118,9 +7118,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655"
+checksum = "c8b3a576c4eb2924262d5951a3b737ccaf16c931e39a2810c36f9a7e25575557"
 dependencies = [
  "darling 0.20.8",
  "proc-macro2",
@@ -9220,11 +9220,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.9.6"
+version = "2.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f214ce18d8b2cbe84ed3aa6486ed3f5b285cf8d8fbdbce9f3f767a724adc35"
+checksum = "d11a831e3c0b56e438a28308e7c810799e3c118417f342d30ecec080105395cd"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.0",
  "flate2",
  "log",
  "native-tls",
@@ -9594,9 +9594,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134306a13c5647ad6453e8deaec55d3a44d6021970129e6188735e74bf546697"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
  "windows-sys 0.52.0",
 ]
@@ -9609,7 +9609,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -9646,7 +9646,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -9723,7 +9723,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -9741,7 +9741,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "chrono",
  "serde",
@@ -9754,7 +9754,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "aws-config",
@@ -9790,7 +9790,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -9805,7 +9805,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "serde",
  "serde_json",
@@ -9813,7 +9813,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -9824,7 +9824,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -9836,7 +9836,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -9847,7 +9847,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "itertools 0.12.1",
@@ -9858,7 +9858,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -9875,7 +9875,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -9886,7 +9886,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -9904,7 +9904,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.14",
@@ -9922,7 +9922,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -9955,7 +9955,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "serde",
  "wasm-bindgen",
@@ -9966,7 +9966,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.317.1"
+version = "1.318.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10336,9 +10336,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63381fa6624bf92130a6b87c0d07380116f80b565c42cf0d754136f0238359ef"
+checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
 
 [[package]]
 name = "zip"
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 65655e24ca..e1df9ad7b5 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.317.1"
+version = "1.318.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -24,7 +24,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.317.1"
+version = "1.318.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index ac1642b598..501fff13e5 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.317.1
+  version: 1.318.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index b7da7e2821..454d866b69 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.317.1";
+export const VERSION = "v1.318.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 4be8eb9667..bb2f316570 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -31,7 +31,7 @@ addEventListener("error", (event) => {
   }
 });
 
-export const VERSION = "v1.317.1";
+export const VERSION = "v1.318.0";
 
 let command: any = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 83293fc97a..37593396e3 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.317.1",
+	"version": "1.318.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.317.1",
+			"version": "1.318.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index bf4368edf6..7c88ce572a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.317.1",
+	"version": "1.318.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index c34f9269a0..dc161c9c16 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.317.1"
-wmill_pg = ">=1.317.1"
+wmill = ">=1.318.0"
+wmill_pg = ">=1.318.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 009deddd6e..07194f7516 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.317.1
+  version: 1.318.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 6f099a1e55..cb61b0754e 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.317.1'
+ModuleVersion = '1.318.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 243737e1ce..ad9c364fd5 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.317.1"
+version = "1.318.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index df4eea8cc7..f4fcecff75 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.317.1"
+version = "1.318.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 7cb78e19a9..87d502d448 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.317.1",
+  "version": "1.318.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index a6938a3823..c703e19667 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.317.1
+1.318.0