diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..b05e9a26eb4d50e41cbbda7ba61eef99c7d3ec64
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,41 @@
+image: ruby:2.3
+stages:
+  - deploy
+
+before_script:
+  # setup locales
+  - echo "en_US UTF-8" > /etc/locale.gen
+  - which locale-gen || ( apt-get update -y && apt-get install locales )
+  - export LANG=en_US.UTF-8
+  - export LANGUAGE=en_US:en
+  - export LC_ALL=en_US.UTF-8
+
+  # install ssh-agent, unless already there
+  - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+  # install rsync, unless already there
+  - 'which rsync || ( apt-get update -y && apt-get install rsync -y )'
+  
+  # install bundler, unless already there
+  - 'which bundle || ( gem install bundler )'
+  
+  # and install the bundle
+  - bundle install
+
+  # setup ssh agent with the private key
+  - eval $(ssh-agent -s)
+  - ssh-add <(echo "$SSH_PRIVATE_KEY")
+  - mkdir -p ~/.ssh
+  - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+
+  
+
+deploy_staging:
+  stage: deploy
+  script:
+    # build the website
+    - bundle exec jekyll build -d _site
+    # copy over all the files into the deployment folder
+    - cd _site && rsync -rv -e ssh ./ deploy@magma.informatik.uni-erlangen.de:/var/www/kwarc.info --delete
+  only:
+    - master
\ No newline at end of file
diff --git a/CNAME b/CNAME
deleted file mode 100644
index 6a9b60514527d55970563df50c636d877980baea..0000000000000000000000000000000000000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-new.kwarc.info
diff --git a/_config.yml b/_config.yml
index 2ff21a02f2d270e372f85df019e4828c93c31874..17b92ab57db35b9575d611914756a4c9f0b7a591 100644
--- a/_config.yml
+++ b/_config.yml
@@ -10,7 +10,8 @@ paginate:            10
 paginate_path:       "/news/page:num/"
 blog_path:           "/news/"
 future:              True
-gems:
+encoding: utf-8
+plugins:
   - jekyll-paginate
   - jekyll-github-metadata
   - jekyll-redirect-from