diff --git a/ansible/roles/gitea-runner/molecule/binary/verify.yml b/ansible/roles/gitea-runner/molecule/binary/verify.yml
index 0dc3187..faaa201 100644
--- a/ansible/roles/gitea-runner/molecule/binary/verify.yml
+++ b/ansible/roles/gitea-runner/molecule/binary/verify.yml
@@ -46,7 +46,7 @@
 
     - name: Check config file exists
       ansible.builtin.stat:
-        path: "{{ gitea_runner_config_dir }}/config.toml"
+        path: "{{ gitea_runner_config_dir }}/config.yaml"
       register: config_stat
 
     - name: Assert config file exists
diff --git a/ansible/roles/gitea-runner/molecule/default/verify.yml b/ansible/roles/gitea-runner/molecule/default/verify.yml
index 8d3e49a..e6c0a6d 100644
--- a/ansible/roles/gitea-runner/molecule/default/verify.yml
+++ b/ansible/roles/gitea-runner/molecule/default/verify.yml
@@ -35,7 +35,7 @@
 
     - name: Check config file exists in data directory
       ansible.builtin.stat:
-        path: "{{ gitea_runner_data_dir }}/config.toml"
+        path: "{{ gitea_runner_data_dir }}/config.yaml"
       register: config_stat
 
     - name: Assert config file exists
diff --git a/ansible/roles/gitea-runner/tasks/config.yml b/ansible/roles/gitea-runner/tasks/config.yml
index 0d6087c..1bfa858 100644
--- a/ansible/roles/gitea-runner/tasks/config.yml
+++ b/ansible/roles/gitea-runner/tasks/config.yml
@@ -7,7 +7,7 @@
 
 - name: Create gitea_runner config file
   ansible.builtin.template:
-    src: gitea-runner-config.toml.j2
-    dest: "{{ gitea_runner_config_dir }}/config.toml"
+    src: gitea-runner-config.yaml.j2
+    dest: "{{ gitea_runner_config_dir }}/config.yaml"
     mode: "0644"
   notify: Restart gitea-runner
diff --git a/ansible/roles/gitea-runner/tasks/docker_mode.yml b/ansible/roles/gitea-runner/tasks/docker_mode.yml
index e52a1ee..853e74d 100644
--- a/ansible/roles/gitea-runner/tasks/docker_mode.yml
+++ b/ansible/roles/gitea-runner/tasks/docker_mode.yml
@@ -10,8 +10,8 @@
 
 - name: Create gitea_runner config file in data directory
   ansible.builtin.template:
-    src: gitea-runner-config.toml.j2
-    dest: "{{ gitea_runner_data_dir }}/config.toml"
+    src: gitea-runner-config.yaml.j2
+    dest: "{{ gitea_runner_data_dir }}/config.yaml"
     mode: "0644"
 
 - name: Pull gitea_runner image
@@ -61,7 +61,7 @@
     -w /data
     {{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }}
     daemon
-    --config /data/config.toml
+    --config /data/config.yaml
   when:
     - container_check.rc != 0
     - not skip_runner_registration
diff --git a/ansible/roles/gitea-runner/tasks/docker_update.yml b/ansible/roles/gitea-runner/tasks/docker_update.yml
index a641e4f..a598735 100644
--- a/ansible/roles/gitea-runner/tasks/docker_update.yml
+++ b/ansible/roles/gitea-runner/tasks/docker_update.yml
@@ -18,6 +18,6 @@
     -v /var/run/docker.sock:/var/run/docker.sock
     -v {{ gitea_runner_data_dir }}:/data
     {{ gitea_runner_docker_image }}:{{ gitea_runner_version | regex_replace('^v', '') }} daemon
-    --config /data/config.toml
+    --config /data/config.yaml
   register: docker_run
   changed_when: docker_run.rc == 0
diff --git a/ansible/roles/gitea-runner/templates/gitea-runner-config.toml.j2 b/ansible/roles/gitea-runner/templates/gitea-runner-config.toml.j2
deleted file mode 100644
index c5641a2..0000000
--- a/ansible/roles/gitea-runner/templates/gitea-runner-config.toml.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-log.level = "{{ gitea_runner_log_level }}"
-runner.file = "{{ gitea_runner_file }}"
-container.label = "{{ gitea_runner_container_label }}"
diff --git a/ansible/roles/gitea-runner/templates/gitea-runner-config.yaml.j2 b/ansible/roles/gitea-runner/templates/gitea-runner-config.yaml.j2
new file mode 100644
index 0000000..62a8c96
--- /dev/null
+++ b/ansible/roles/gitea-runner/templates/gitea-runner-config.yaml.j2
@@ -0,0 +1,8 @@
+log:
+  level: "{{ gitea_runner_log_level }}"
+
+runner:
+  file: "{{ gitea_runner_file }}"
+
+container:
+  label: "{{ gitea_runner_container_label }}"
diff --git a/ansible/roles/gitea-runner/templates/gitea-runner.service.j2 b/ansible/roles/gitea-runner/templates/gitea-runner.service.j2
index df463b9..5cb2dcd 100644
--- a/ansible/roles/gitea-runner/templates/gitea-runner.service.j2
+++ b/ansible/roles/gitea-runner/templates/gitea-runner.service.j2
@@ -5,7 +5,7 @@ Requires=docker.service
 
 [Service]
 Type=simple
-ExecStart={{ gitea_runner_binary_path }} daemon --config {{ gitea_runner_config_dir }}/config.toml
+ExecStart={{ gitea_runner_binary_path }} daemon --config {{ gitea_runner_config_dir }}/config.yaml
 WorkingDirectory={{ gitea_runner_data_dir }}
 Restart=always
 RestartSec={{ gitea_runner_service_restart_sec }}