diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c5be7c65..c26585a23 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,8 @@
 #   gitlab-runner exec docker --timeout=3600 'Linux client_static debian_amd64_strech build'
 #   gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client build'
 #   gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client archlinux build' 
-#   gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client_static fedora_amd64_27 build'
+#   gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client fedora_amd64_27 build'
+#   gitlab-runner exec docker --kubernetes-memory-limit='10g' --timeout=3600 'Linux client ubuntu_amd64_17_10 build'
 
 stages:
 - build
@@ -211,7 +212,6 @@ Linux client debian_amd64_strech build:
       - code/build/bin
     expire_in: 2 week
 
-
 Linux client_static debian_amd64_strech build:
   stage: build
   tags:
@@ -311,7 +311,7 @@ Linux client_static debian_amd64_strech build:
     expire_in: 2 week
 
 # Fedora Client
-Linux client_static fedora_amd64_27 build:
+Linux client fedora_amd64_27 build:
   stage: build
   tags:
     - Docker
@@ -371,6 +371,59 @@ Linux client_static fedora_amd64_27 build:
     expire_in: 2 week
 
 # Ubuntu Client
+Linux client ubuntu_amd64_17_10 build:
+  stage: build
+  tags:
+    - Docker
+  image: amd64/ubuntu:17.10
+  script:
+    # Prepare environment
+    - apt-get update
+    - apt-get dist-upgrade -y
+    - apt-get install -y autoconf
+                         autogen
+                         automake
+                         bison
+                         build-essential
+                         cmake
+                         cpputest
+                         fakeroot
+                         libboost-all-dev
+                         libcurl4-openssl-dev
+                         libfreetype6-dev
+                         libgif-dev
+                         libgl1-mesa-dev
+                         libjpeg62-dev
+                         liblzma-dev
+                         libopenal-dev
+                         libpng-dev
+                         libssh2-1-dev
+                         libssl-dev
+                         libtool
+                         libtool-bin
+                         libx11-dev
+                         libxml2-dev
+                         libxmu-dev
+                         libxrandr-dev
+                         libxrender-dev
+                         libxxf86vm-dev
+                         mercurial
+                         rrdtool
+                         unzip
+                         wget
+                         zlib1g-dev
+    - apt-get install -y liblua5.2-0 liblua5.2-dev libluabind-dev libluabind0.9.1v5 libogg-dev libvorbis-dev
+    # Action
+    - mkdir -p code/build
+    - (cd code; patch -i ../patch/libcrypto.patch)
+    - (cd code/build ; export -p CPPFLAGS="-Wno-deprecated -Wno-deprecated-declarations"; cmake -G "Unix Makefiles" -DWITH_NEL=ON -DWITH_LUA52=ON -DWITH_RYZOM_PATCH=OFF -DWITH_RYZOM_CUSTOM_PATCH_SERVER=OFF -DWITH_NEL_TESTS=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -DWITH_NEL_SAMPLES=OFF -DWITH_SOUND=ON -DWITH_STATIC_CURL=OFF ..)
+    - (cd code/build; make khanat_client)
+    - (cd code/build/bin; ls -lh)
+  artifacts:
+    name: "khanat-client-ubuntu_17_10-$(echo $CI_BUILD_REF | head -c 7 )-$CI_PIPELINE_ID"
+    paths:
+      - code/build/bin
+    expire_in: 2 week
 
 # Archlinux Client
 Linux client archlinux build:
@@ -389,7 +442,6 @@ Linux client archlinux build:
                             boost-libs
                             cmake
                             fakeroot
-                            freetype-devel
                             gcc
                             giflib
                             git