diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 011e4362f387d6b1db052aaa13965c447843adc5..3f30dbdf7d6e17d0a849980511103b7c93cfd5f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,4 @@
-image: docker:latest
-
-services:
-  - docker:dind
-
-before_script:
-  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
-
-build-master:
-  stage: build
-  script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
-    - docker push "$CI_REGISTRY_IMAGE"
-  only:
-    - master
-
-build:
-  stage: build
-  script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
-    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
-  only:
-    - tags
+include:
+  - project: 'histhub/node-kafka-docker-base'
+    ref: 'master'
+    file: '.gitlab-ci.yml'
diff --git a/Dockerfile b/Dockerfile
index ad6b6cfdbfd15781967b83efb3ad840a9f082195..c0c056ddf69c1db64a6e2daf19f2dee6d4a40a61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,4 @@
-FROM node:10-slim
-
-# add basic libs
-RUN apt-get update && apt-get install -y  \
-      bash \
-      g++ \
-      gcc \
-      ca-certificates \
-      make \
-      python \
-      bash \
-      git
-
-# Create app directory
-RUN mkdir -p /usr/local/app
-
-# Move to the app directory
-WORKDIR /usr/local/app
+FROM source.dodis.ch:4577/histhub/node-kafka-docker-base:latest
 
 # copy app to the container
 COPY package.json package-lock.json config.json tsconfig.json /usr/local/app/