diff --git a/templates/GitLab-Runner/0/docker-compose.yml b/templates/GitLab-Runner/0/docker-compose.yml
index 5509b7c..6b9cb4a 100644
--- a/templates/GitLab-Runner/0/docker-compose.yml
+++ b/templates/GitLab-Runner/0/docker-compose.yml
@@ -5,25 +5,18 @@ services:
     image: gitlab/gitlab-runner:alpine # Alpine Linux image is designed to use only Docker as the method of spawning runners
     command:
       - register
-      - --non-interactive
-      - \"--url ${GITLAB_URL}\"
-      - --registration-token ${GITLAB_TOKEN}
-      - --executor "docker"
-      {{- if .Values.GITLAB_RUNNER_DESCRIPTION}}
-      - --description ${GITLAB_RUNNER_DESCRIPTION}
-      {{- end}}
-      {{- if .Values.GITLAB_TAGS}}
-      - --tag-list ${GITLAB_TAGS}
-      {{- end}}
-      - --locked=false
-      - --docker-image
-      - docker:latest
-      - --docker-privileged
-      {{- if .Values.GITLAB_IP}}
-      - --docker-extra-hosts "gitlab:${GITLAB_IP}"
-      {{- end}}
-      - --docker-host "tcp://docker:2375/"
-    {{- if .Values.GITLAB_LINK}}
+    environment:
+      REGISTER_NON_INTERACTIVE: true
+      CI_SERVER_URL: http://gitlab/
+      REGISTRATION_TOKEN: ${GITLAB_TOKEN}
+      RUNNER_EXECUTOR: docker
+      RUNNER_NAME: ${GITLAB_RUNNER_DESCRIPTION}
+      RUNNER_TAG_LIST: ${GITLAB_TAGS}
+      REGISTER_LOCKED: false
+      DOCKER_IMAGE: docker:latest
+      DOCKER_PRIVILEGED: true
+      DOCKER_EXTRA_HOSTS: gitlab:${GITLAB_IP}
+      DOCKER_HOST: tcp://docker:2375/
     external_links:
       - ${GITLAB_LINK}:gitlab
     {{- end}}