diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5be84d87..0b14fae9f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,15 @@
 docker-build:
+  image: docker:latest
   stage: build
+  services:
+    - docker:dind
   before_script:
+    - apk add make go
     - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" registry.baalajimaestro.me --password-stdin
   script:
-    - make build-image
-    - docker tag traefik/traefik registry.baalajimaestro.me/baalajimaestro/traefik:latest
+    - make clean-webui generate-webui
+    - go generate
+    - go build ./cmd/traefik
+    - cp ~/go/src/github.com/traefik/traefik .
+    - docker build . -t registry.baalajimaestro.me/baalajimaestro/traefik:latest
     - docker push registry.baalajimaestro.me/baalajimaestro/traefik:latest
\ No newline at end of file