diff --git a/gitlab-runner/gitlab-runner-docker-configmap.yml b/gitlab-runner/gitlab-runner-docker-configmap.yml
index 40b7220..40e4140 100644
--- a/gitlab-runner/gitlab-runner-docker-configmap.yml
+++ b/gitlab-runner/gitlab-runner-docker-configmap.yml
@@ -4,24 +4,16 @@ metadata:
   name: gitlab-runner-docker
   namespace: gitlab
 data:
+  entrypoint: |
+    #!/bin/bash
+
+    # Register the runner
+    /entrypoint register --non-interactive -u http://gitlab.gitlab/ci -r '49uf3mzs1qdz5vgo' --docker-image 'ruby:2.3' --executor kubernetes
+
+
+    cat /etc/gitlab-runner/config.toml
+    # Start the runner
+    /entrypoint run --user=gitlab-runner --working-directory=/home/gitlab-runner
   config.toml: |
-    concurrent = 4
+    concurrent = 10
     check_interval = 1
-
-    [[runners]]
-      name = "gitlab-docker-runner"
-      url = "http://gitlab.gitlab/ci"
-      token = ""
-      executor = "docker"
-      [runners.docker]
-        tls_verify = false
-        image = "python:3.5"
-        privileged = true
-        disable_cache = false
-        volumes = ["/cache"]
-      [runners.cache]
-        Type = "s3"
-        ServerAddress = "http://minio.gitlab/"
-        AccessKey = ""
-        SecretKey = ""
-        BucketName = "runner"
diff --git a/gitlab-runner/gitlab-runner-docker-deployment.yml b/gitlab-runner/gitlab-runner-docker-deployment.yml
index ca8a348..6a4cb7d 100644
--- a/gitlab-runner/gitlab-runner-docker-deployment.yml
+++ b/gitlab-runner/gitlab-runner-docker-deployment.yml
@@ -13,7 +13,11 @@ spec:
     spec:
       containers:
       - name: gitlab-runner-docker
-        image: gitlab/gitlab-runner:v1.8.0
+        image: gitlab/gitlab-runner:alpine-v1.9.2
+        command: [ "/bin/sh", "-c", "chmod +x /etc/gitlab-runner/entrypoint; /etc/gitlab-runner/entrypoint" ]
+        env:
+        - name: KUBERNETES_NAMESPACE
+          value: gitlab
         imagePullPolicy: Always
         resources:
           limits:
@@ -34,4 +38,3 @@ spec:
       - name: config
         configMap:
           name: gitlab-runner-docker
-
diff --git a/gitlab/gitlab-deployment.yml b/gitlab/gitlab-deployment.yml
index d373bde..8ee4781 100644
--- a/gitlab/gitlab-deployment.yml
+++ b/gitlab/gitlab-deployment.yml
@@ -13,12 +13,13 @@ spec:
     spec:
       containers:
       - name: gitlab
-        image: gitlab/gitlab-ce:8.15.4-ce.1
+        image: twk3/gitlab-ce:i2p
         imagePullPolicy: Always
         env:
         - name: GITLAB_OMNIBUS_CONFIG
           value: |
             external_url "http://gitlab.example.com"
+            gitlab_rails['initial_shared_runners_registration_token'] = '49uf3mzs1qdz5vgo'
             postgresql['enable']=false
             gitlab_rails['db_host'] = 'gitlab-postgresql'
             gitlab_rails['db_password']='+BP52QIxpT/flVCMpL3KXA=='