diff --git a/handlers/main.yml b/handlers/main.yml
index 4e44a87..37e2fba 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -49,9 +49,8 @@
   tags: ['docker_gitlab']
 
 - name: 'gitlab-runner-restart'
-  docker_container:
-    name: gitlab-runner
-    restart: yes
-  when:
-  - 'not register_docker_container_gitlab_runner.changed'
+  systemd:
+    name: docker-compose@gitlab-runner
+    state: restarted
+  ignore_errors: '{{ ansible_check_mode }}'
   tags: ['docker_gitlab-runner']
diff --git a/tasks/gitlab-runner.yml b/tasks/gitlab-runner.yml
index 720fc95..20c7990 100644
--- a/tasks/gitlab-runner.yml
+++ b/tasks/gitlab-runner.yml
@@ -35,7 +35,7 @@
 
 - name: 'gitlab-runner | configure config.toml'
   copy:
-    dest: '{{ register_gitlab_runner_etc_gitlab_runner.ansible_facts.docker_volume.Mountpoint }}/config.toml'
+    dest: '/var/lib/docker/volumes/gitlab-runner__etc_gitlab-runner/_data/config.toml'
     mode: '0600'
     content: |
       concurrent = 1