diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..54ed26514c3b4bb598fface0ab5e093ab639e89b
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,16 @@
+stages:
+  - build
+
+build_image:
+  stage: build
+  image: docker:18.09.7
+  only:
+    - master
+  services:
+    - 'docker:18.09.7-dind'
+  script:
+    - docker build -t clarinpl/tag-converter  .
+    - echo $DOCKER_PASSWORD > pass.txt
+    - cat pass.txt | docker login --username $DOCKER_USERNAME --password-stdin
+    - rm pass.txt
+    - docker push clarinpl/tag-converter
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ceb9d8a482ff1619d11253a2e42dea78e76cb6a..0279b6d2b1628e4db2b77081c7ec226d6b975a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,9 +15,6 @@ find_package(Boost COMPONENTS program_options system thread filesystem chrono at
 link_directories(${Boost_LIBRARY_DIRS})
 set(LIBS ${LIBS} ${Boost_LIBRARIES})
 
-find_package(amqpcpp REQUIRED)
-set(LIBS ${LIBS} amqpcpp)
-
 find_package(Threads)
 set(LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
 
diff --git a/Dockerfile b/Dockerfile
index ad080eaee8f0fcf4fa3b07ee9f7b9d9e56a8c3a6..66948ad65330c94d7fd983a7ad49eca1ff42cc2c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM clarinpl/cpp
+FROM clarinpl/cpp:16.04
+RUN apt update && apt install wsnlp-16-04
 
 WORKDIR /home/install
 COPY CMakeScripts/ CMakeScripts/