diff --git a/.idea/runConfigurations/integration_test.xml b/.idea/runConfigurations/integration_test.xml
index f62e6121a82..957ff7e062d 100644
--- a/.idea/runConfigurations/integration_test.xml
+++ b/.idea/runConfigurations/integration_test.xml
@@ -8,7 +8,7 @@
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="package" />
-    <option name="VM_PARAMETERS" value="-ea -Dio.netty.leakDetection.level=PARANOID -Dio.netty.leakDetection.maxRecords=32" />
+    <option name="VM_PARAMETERS" value="-ea -Dio.netty.leakDetection.level=PARANOID -Dio.netty.leakDetection.maxRecords=32 -Xmx350M -XX:MaxDirectMemorySize=10M" />
     <option name="PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
     <option name="ENV_VARIABLES" />
diff --git a/cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml b/cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml
index 6a8dca784dc..a57018c8839 100644
--- a/cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml
+++ b/cloudfoundry-client-reactor/cloudfoundry-client-reactor.iml
@@ -30,17 +30,17 @@
     <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.6.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.13.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.13.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.17.Final-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.2.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
diff --git a/cloudfoundry-client-reactor/pom.xml b/cloudfoundry-client-reactor/pom.xml
index f16a483e8ec..94c39e215d2 100644
--- a/cloudfoundry-client-reactor/pom.xml
+++ b/cloudfoundry-client-reactor/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>2.21.0.BUILD-SNAPSHOT</version>
+        <version>2.21.0.RELEASE</version>
     </parent>
 
     <artifactId>cloudfoundry-client-reactor</artifactId>
diff --git a/cloudfoundry-client/pom.xml b/cloudfoundry-client/pom.xml
index 92f1c2abccf..9e5de1e2d3b 100644
--- a/cloudfoundry-client/pom.xml
+++ b/cloudfoundry-client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>2.21.0.BUILD-SNAPSHOT</version>
+        <version>2.21.0.RELEASE</version>
     </parent>
 
     <artifactId>cloudfoundry-client</artifactId>
diff --git a/cloudfoundry-operations/pom.xml b/cloudfoundry-operations/pom.xml
index afccc860ca3..f0a43063fa5 100644
--- a/cloudfoundry-operations/pom.xml
+++ b/cloudfoundry-operations/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>2.21.0.BUILD-SNAPSHOT</version>
+        <version>2.21.0.RELEASE</version>
     </parent>
 
     <artifactId>cloudfoundry-operations</artifactId>
diff --git a/cloudfoundry-util/pom.xml b/cloudfoundry-util/pom.xml
index 4863d32b694..01cf8d152ac 100644
--- a/cloudfoundry-util/pom.xml
+++ b/cloudfoundry-util/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>2.21.0.BUILD-SNAPSHOT</version>
+        <version>2.21.0.RELEASE</version>
     </parent>
 
     <artifactId>cloudfoundry-util</artifactId>
diff --git a/integration-test/integration-test.iml b/integration-test/integration-test.iml
index 5d77ceb35ce..6152c308345 100644
--- a/integration-test/integration-test.iml
+++ b/integration-test/integration-test.iml
@@ -31,17 +31,17 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.10" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.jsonwebtoken:jjwt:0.9.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-netty:0.6.6.RELEASE" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.13.Final" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.13.Final" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-http:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-buffer:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-resolver:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-handler-proxy:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-codec-socks:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-epoll:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-common:4.1.17.Final-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: io.netty:netty-transport-native-unix-common:4.1.17.Final-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: io.projectreactor.ipc:reactor-ipc:0.6.2.RELEASE" level="project" />
     <orderEntry type="module" module-name="cloudfoundry-client" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="Maven: com.squareup.wire:wire-runtime:2.2.0" level="project" />
diff --git a/integration-test/pom.xml b/integration-test/pom.xml
index 6b7cc1ffcd7..414013e61ed 100644
--- a/integration-test/pom.xml
+++ b/integration-test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>2.21.0.BUILD-SNAPSHOT</version>
+        <version>2.21.0.RELEASE</version>
     </parent>
 
     <artifactId>integration-test</artifactId>
diff --git a/pom.xml b/pom.xml
index 30042475d7f..b69e0ab049a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     <groupId>org.cloudfoundry</groupId>
     <artifactId>cloudfoundry-java-client</artifactId>
     <name>Cloud Foundry Java Client Parent</name>
-    <version>2.21.0.BUILD-SNAPSHOT</version>
+    <version>2.21.0.RELEASE</version>
     <packaging>pom</packaging>
     <url>https://github.com/cloudfoundry/cf-java-client</url>
 
@@ -49,6 +49,7 @@
         <immutables.version>2.5.6</immutables.version>
         <java-semver.version>0.9.0</java-semver.version>
         <jjwt.version>0.9.0</jjwt.version>
+        <netty.version>4.1.17.Final-SNAPSHOT</netty.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <reactor-addons.version>3.0.7.RELEASE</reactor-addons.version>
         <reactor-core.version>3.0.7.RELEASE</reactor-core.version>
@@ -58,6 +59,62 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-buffer</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-socks</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-common</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler-proxy</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-resolver</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-epoll</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-transport-native-unix-common</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.github.zafarkhaja</groupId>
                 <artifactId>java-semver</artifactId>
diff --git a/test-service-broker/pom.xml b/test-service-broker/pom.xml
index 73bf2a2f63b..9663b87d733 100644
--- a/test-service-broker/pom.xml
+++ b/test-service-broker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>2.21.0.BUILD-SNAPSHOT</version>
+        <version>2.21.0.RELEASE</version>
     </parent>
 
     <artifactId>test-service-broker</artifactId>