diff --git a/gitlab/map.jinja b/gitlab/map.jinja
index 20fcd8e..2564ba1 100644
--- a/gitlab/map.jinja
+++ b/gitlab/map.jinja
@@ -5,6 +5,7 @@
       'username': 'gitlab-runner',
       'home': '/home/gitlab-runner',
       'executor': 'shell',
+      'dockerimage': 'docker',
     }
   },
   'default': {
@@ -13,6 +14,7 @@
       'downloadpath': 'https://packages.gitlab.com/runner/gitlab-runner/packages/linuxmint/sonya/gitlab-runner_10.4.0_amd64.deb/download',
       'home': '/home/gitlab-runner',
       'executor': 'shell',
+      'dockerimage': 'docker',
     }
   },
 }, merge=salt['pillar.get']('gitlab')) %}
diff --git a/gitlab/runner.sls b/gitlab/runner.sls
index 1d47b60..9609ffa 100644
--- a/gitlab/runner.sls
+++ b/gitlab/runner.sls
@@ -41,7 +41,7 @@ gitlab-install_runserver_create_user:
 
 gitlab-install_runserver3:
   cmd.run:
-    - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}' /usr/bin/gitlab-runner  register --non-interactive"
+    - name: "CI_SERVER_URL='{{gitlab.runner.url}}' REGISTRATION_TOKEN='{{gitlab.runner.token}}' RUNNER_EXECUTOR='{{gitlab.runner.executor}}'{% if gitlab.runner.executor == "docker" %} DOCKER_PRIVILEGED='true' DOCKER_IMAGE='{{gitlab.runner.dockerimage}}'{% if gitlab.runner.docker_network_mode is defined %} DOCKER_NETWORK_MODE='{{gitlab.runner.docker_network_mode}}'{% endif %}{% endif %} /usr/bin/gitlab-runner  register --non-interactive"
     - creates: /etc/gitlab-runner/config.toml
     - require:
       - user: gitlab-install_runserver_create_user
diff --git a/pillar.example b/pillar.example
index f33e44d..871a6b3 100644
--- a/pillar.example
+++ b/pillar.example
@@ -62,3 +62,4 @@ gitlab:
     token: "token gitlab-ci" # MANDATORY
     home: /home/gitlab-runner
     executor: shell
+    docker_network_mode: host