diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04a921a..ee9337e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,16 +1,17 @@
 ## Release 0.X
 ### Improvement
 * Add an UEFI entry to manage specific partitions (see #16).
+* task-ssh-server is removed (see #18).
 
 ### Fix
-* Leave standart task in peace to be able to have a X session for user's nodes… (see #17).
+* Leave standard task in peace to be able to have a X session for user's nodes… (see #17).
 * Update doc about Debian distribution name and remove useless entries (oldStable).
 * No longer define zsh as default shell for root.
 * Installation of aptitude, puppet, tmux and zsh move to latecommand script (post.sh).
 
 ## Release 0.4.1
 ### Improvement
-* Standard task is no longer install for Debian Stretch with preseed (see #14).
+* Standard task is no longer install for Debian Stretch server with preseed (see #14).
 * Ensure to install `python-apt`|Ansible dependencie (see #14).
 
 ### Fix
diff --git a/scripts/latecommand/post.sh b/scripts/latecommand/post.sh
index 337118a..bc28b9d 100755
--- a/scripts/latecommand/post.sh
+++ b/scripts/latecommand/post.sh
@@ -21,9 +21,17 @@ apt -y install aptitude tmux zsh
 # Remove NFS and rpcbind
 aptitude -y remove nfs-common rpcbind
 
-# Ensure to reinstall openssh-server
+### SSH {{{
+# Remove task-ssh-server
+if [ "$(dpkg -l task-ssh-server)" ]; then
+	aptitude -y remove task-ssh-server
+fi
+
+# Ensure to install openssh-server
 aptitude -y install openssh-server openssh-sftp-server
 
+### }}}
+
 # Ansible dependencies
 aptitude -y install python-apt