diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 00000000..885fad99
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,32 @@
+image: frekele/java
+
+stages:
+  - build
+  - deploy
+
+before_script:
+  #  - echo `pwd` # debug
+  #  - echo "$CI_BUILD_NAME, $CI_BUILD_REF_NAME $CI_BUILD_STAGE" # debug
+  - export GRADLE_USER_HOME=`pwd`/.gradle
+  - apt-get update -qq && apt-get install -y -qq git git-core
+
+cache:
+  paths:
+    - .gradle/wrapper
+    - .gradle/caches
+
+build:
+  stage: build
+  script:
+    - sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
+    - git submodule sync
+    - git submodule update --init --recursive
+    - ./gradlew assemble
+  artifacts:
+    paths:
+      - LaunchServer/build/libs/*
+      - ServerWrapper/build/libs/*.jar
+    expire_in: 1 week
+
+after_script:
+  - echo "End CI"
diff --git a/.travis.yml b/.travis.yml
index 778e6078..b195f4ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
-# project is java
 language: java
+dist: trusty
 # Use https (public access) instead of git for git-submodules. This modifies only Travis-CI behavior!
 # disable the default submodule logic
 git:
@@ -17,7 +17,4 @@ cache:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
 script:
-    - ./gradlew assemble build
-# not working artifacts
-addons:
-  artifacts: false
+  - ./gradlew build