diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68d33dd2802d1dc3b7ffa8242ebbed1697481719..f956c572f4fc7f8bd16d8810b9d332e282294f19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# [18.5.0](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/compare/v18.4.0...v18.5.0) (2024-05-15)
+
+
+### Features
+
+* 🎸 filtering of assigned resource groups in entitlements ([7f1cf4c](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/commit/7f1cf4c531fe5b7dd5069bcb4645f35dbc8662f4))
+* 🎸 filtering of groups in access control filter ([76ce690](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/commit/76ce690363dbe25097836f609ab6f6aca2197b5b))
+
 # [18.4.0](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/OpenID-Connect-Java-Spring-Server/compare/v18.3.1...v18.4.0) (2024-04-23)
 
 
diff --git a/perun-oidc-server-webapp/pom.xml b/perun-oidc-server-webapp/pom.xml
index bf90f41293bd679dd862a2c08eea72758fcc6542..3905045e04846a96401a8c1e9d2355377b7abf31 100644
--- a/perun-oidc-server-webapp/pom.xml
+++ b/perun-oidc-server-webapp/pom.xml
@@ -21,7 +21,7 @@
 	<parent>
 		<groupId>cz.muni.ics</groupId>
 		<artifactId>perun-oidc-parent</artifactId>
-		<version>18.4.0</version>
+		<version>18.5.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/perun-oidc-server/pom.xml b/perun-oidc-server/pom.xml
index 7aaedc6e6c92a2da5c249ecca27747db47bd9bb3..dcb1fff8ecd33611af581a9a4bfffebea79db3af 100644
--- a/perun-oidc-server/pom.xml
+++ b/perun-oidc-server/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>cz.muni.ics</groupId>
 		<artifactId>perun-oidc-parent</artifactId>
-		<version>18.4.0</version>
+		<version>18.5.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index 19bbbcfcb16ce54006bdfb97e7d7a5de7d9226ef..e3934bea965a1fb3b5082e4615f211d1680b93c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cz.muni.ics</groupId>
 	<artifactId>perun-oidc-parent</artifactId>
-	<version>18.4.0</version>
+	<version>18.5.0</version>
 	<packaging>pom</packaging>
 
 	<modules>