diff --git a/tasks/registration.yml b/tasks/registration.yml
index 0779399..5c0b09b 100644
--- a/tasks/registration.yml
+++ b/tasks/registration.yml
@@ -8,13 +8,14 @@
   ansible.builtin.shell:
     gitlab-runner register
     --non-interactive
+    --name {{ gitlab_runner_name | default(inventory_hostname) }}
     --url {{ gitlab_runner_instance_url }}
     --clone-url {{ gitlab_runner_instance_url }}
     --registration-token {{ gitlab_runner_registration_token }}
     --executor docker
     --description "{{ gitlab_runner_runner_description }}"
     --docker-image "{{ gitlab_runner_docker_default_image }}"
-    --tag-list "{{ gitlab_runner_tags | default('') }}"
+    --tag-list "{{ gitlab_runner_tags | default(inventory_hostname) }}"
   when: gitlab_runner_config.stat.exists == False and gitlab_runner_executor == 'docker'
   become: yes
 
@@ -22,11 +23,12 @@
   ansible.builtin.shell: >
     gitlab-runner register
     --non-interactive
+    --name {{ gitlab_runner_name | default(inventory_hostname) }}
     --url {{ gitlab_runner_instance_url }}
     --clone-url {{ gitlab_runner_instance_url }}
     --registration-token {{ gitlab_runner_registration_token }}
     --executor shell
     --description "{{ gitlab_runner_runner_description }}"
-    --tag-list "{{ runner_tags | default('') }}"
+    --tag-list "{{ gitlab_runner_tags | default(inventory_hostname) }}"
   when: gitlab_runner_config.stat.exists == False and gitlab_runner_executor == 'shell'
   become: yes