diff --git a/dockerfiles/cli/images.template b/dockerfiles/cli/images.template
index dee0e7828e..77c4c8c706 100644
--- a/dockerfiles/cli/images.template
+++ b/dockerfiles/cli/images.template
@@ -4,4 +4,4 @@ IMAGE_CHE_MULTIUSER=${BUILD_ORGANIZATION}/${BUILD_PREFIX}-server-multiuser:${BUI
 IMAGE_COMPOSE=docker/compose:1.10.1
 IMAGE_TRAEFIK=traefik:v1.3.0-rc3
 IMAGE_POSTGRES=postgres:9.6
-IMAGE_KEYCLOACK=jboss/keycloak-postgres:3.1.0.Final
+IMAGE_KEYCLOACK=jboss/keycloak-postgres:3.2.1.Final
diff --git a/dockerfiles/cli/version/latest/images b/dockerfiles/cli/version/latest/images
index 042a03c46e..325a9054eb 100644
--- a/dockerfiles/cli/version/latest/images
+++ b/dockerfiles/cli/version/latest/images
@@ -4,4 +4,4 @@ IMAGE_CHE_MULTIUSER=eclipse/che-server-multiuser:latest
 IMAGE_COMPOSE=docker/compose:1.10.1
 IMAGE_TRAEFIK=traefik:v1.3.0-rc3
 IMAGE_POSTGRES=postgres:9.6
-IMAGE_KEYCLOACK=jboss/keycloak-postgres:3.1.0.Final
+IMAGE_KEYCLOACK=jboss/keycloak-postgres:3.2.1.Final
diff --git a/pom.xml b/pom.xml
index e8b8d51f0a..c551d71dce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <che.docs.version>5.16.0-SNAPSHOT</che.docs.version>
         <che.lib.version>5.16.0-SNAPSHOT</che.lib.version>
         <che.version>5.16.0-SNAPSHOT</che.version>
-        <org.keycloak.version>3.2.0.CR1</org.keycloak.version>
+        <org.keycloak.version>3.2.0.Final</org.keycloak.version>
         <specification.version>1.0-beta2</specification.version>
     </properties>
     <dependencyManagement>