diff --git a/Dockerfile b/Dockerfile
index 88ad007b9bd02e54d3d2669b988ff328b549615e..046dd069a67efe061a44d13b225942242a83cc9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
-FROM clarinpl/cpp
+FROM clarinpl/cpp:16.04
 
+RUN apt update && apt install wsnlp-16-04
 
 WORKDIR /home/install
 COPY src/ src/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f3478b52da5d1b1587051dbb0b22f554ff2b7206..d34564c5f7ecf8b0a11cd26eb92b0dabad5bb462 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 PROJECT(morphodita)
 
 cmake_minimum_required(VERSION 3.5.0)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 14)
 SET(CMAKE_CXX_FLAGS -pthread)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
 
@@ -15,9 +15,6 @@ find_package(Boost COMPONENTS program_options system thread filesystem)
 link_directories(${Boost_LIBRARY_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})
 
-find_package(amqpcpp REQUIRED)
-set(LIBS ${LIBS} amqpcpp)
-
 add_executable(morphodita morphoDita_service.cpp unmerge.cpp)
 target_link_libraries(morphodita ${LIBS})