diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0726138..bfc3a0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,18 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.0...HEAD)
+## [Unreleased](https://github.com/passbolt/passbolt_docker/compare/v2.0.1...HEAD)
+
+## [2.0.2](https://github.com/passbolt/passbolt_docker/compare/v2.0.1...v2.0.2) - 2018-04-17
+
+## Fixed
+
+- Unable to load a jpeg image as avatar. [#100](https://github.com/passbolt/passbolt_docker/issues/100)
+- docker-entrypoint.sh adds email-sending-job everytime you restart the container. [#98](https://github.com/passbolt/passbolt_docker/issues/98)
+
+## Changed
+
+- Removed composer binary after dependency installation.
 
 ## [2.0.1](https://github.com/passbolt/passbolt_docker/compare/v2.0.0...v2.0.1) - 2018-04-09
 
diff --git a/Dockerfile b/Dockerfile
index bc47cc5..4acbd6b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM php:7-fpm
 
 LABEL maintainer="diego@passbolt.com"
 
-ARG PASSBOLT_VERSION="2.0.1"
+ARG PASSBOLT_VERSION="2.0.2"
 ARG PASSBOLT_URL="https://github.com/passbolt/passbolt_api/archive/v${PASSBOLT_VERSION}.tar.gz"
 
 ARG PHP_EXTENSIONS="gd \
@@ -74,7 +74,8 @@ RUN apt-get update \
     && chmod 664 $(find /var/www/passbolt/webroot/img/public -type f) \
     && rm /etc/nginx/sites-enabled/default \
     && apt-get purge -y --auto-remove $PASSBOLT_DEV_PACKAGES \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && rm /usr/local/bin/composer
 
 COPY conf/passbolt.conf /etc/nginx/conf.d/default.conf
 COPY conf/supervisord.conf /etc/supervisor/supervisord.conf
diff --git a/docker-compose-pro.yml b/docker-compose-pro.yml
index 43558d8..9992ef3 100644
--- a/docker-compose-pro.yml
+++ b/docker-compose-pro.yml
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.1-pro-debian
+    image: passbolt/passbolt:2.0.2-pro-debian
     tty: true
     depends_on:
       - db
diff --git a/docker-compose.yml b/docker-compose.yml
index 5c01302..096cfeb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - 3306
 
   passbolt:
-    image: passbolt/passbolt:2.0.1-debian
+    image: passbolt/passbolt:2.0.2-debian
     tty: true
     depends_on:
       - db
diff --git a/spec/docker_image/image_spec.rb b/spec/docker_image/image_spec.rb
index 81288ef..7964b14 100644
--- a/spec/docker_image/image_spec.rb
+++ b/spec/docker_image/image_spec.rb
@@ -38,8 +38,8 @@ describe 'Dockerfile' do
   end
 
   describe 'php composer' do
-    it 'is installed' do
-      expect(file(composer)).to be_executable
+    it 'is not installed' do
+      expect(file(composer)).to_not exist
     end
   end