diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17ee139..50ae95c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 2.2.0
+
+Bug fixes:
+
+* UTF-8 locale is set in the container
+
+New features:
+
+* A challenge can marked as competition (sorting by submitter/team is enforced then)
+
+
 ## 2.1.0
 
 New features:
diff --git a/Dockerfile b/Dockerfile
index a3ca558..5088a92 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,8 @@ WORKDIR /root/
 RUN apt-get -y update && apt-get -y install libfcgi-dev && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN git clone git://gonito.net/geval && cd geval && git reset --hard a49abb560bd5e5f11f291f50176934fef5352c6c
-RUN git clone git://gonito.net/gonito && cd gonito && git reset --hard d44408c1e818de5615625f9c51e3f4f0c5fbedfd
+RUN git clone git://gonito.net/gonito && cd gonito && git reset --hard c23409526d580f51362d8df015a9d1894b47cb42
+
 
 WORKDIR gonito
 
@@ -15,7 +16,12 @@ RUN stack install && rm -rf /root/.stack
 
 FROM ubuntu:16.04 AS gonito-run
 
-RUN apt-get -y update && apt-get -y install git libcairo2 libpq5 && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get -y update && apt-get -y install git libcairo2 libpq5 locales && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
+        locale-gen
+
+ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US \ LC_ALL=en_US.UTF-8
 
 RUN mkdir /gonito
 
diff --git a/gonito.cabal b/gonito.cabal
index 28ee1bc..d5680bf 100644
--- a/gonito.cabal
+++ b/gonito.cabal
@@ -1,5 +1,5 @@
 name:              gonito
-version:           2.1.0
+version:           2.2.0
 cabal-version:     >= 1.8
 build-type:        Simple
 homepage:          http://gonito.net