diff --git a/.ansible/ansible.cfg b/.ansible/ansible.cfg
index 23aad46..79212c9 100644
--- a/.ansible/ansible.cfg
+++ b/.ansible/ansible.cfg
@@ -1,3 +1,16 @@
 [defaults]
 roles_path = ./roles
 inventory = inventory.ini
+strategy_plugins = /usr/lib/python3.10/site-packages/ansible_mitogen/plugins/strategy
+strategy = mitogen_linear
+
+# Show timing information
+callbacks_enabled = timer, profile_tasks, profile_roles
+
+# Speed improvements
+host_key_checking = False
+internal_poll_interval = 0.001
+
+[ssh_connection]
+pipelining = True
+ssh_args = -o ControlMaster=auto -o ControlPersist=60s
diff --git a/.ansible/roles/template/tasks/main.yml b/.ansible/roles/template/tasks/main.yml
index 4cb0879..88dd734 100644
--- a/.ansible/roles/template/tasks/main.yml
+++ b/.ansible/roles/template/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 
 - name: generate Dockerfiles
-  template:
+  ansible.builtin.template:
     src:  "{{ item.src }}"
     dest: "{{ item.dst }}"
     force: True
@@ -10,7 +10,7 @@
     - "{{ template_dockerfiles }}"
 
 - name: generate php configuration files
-  template:
+  ansible.builtin.template:
     src:  "{{ item.src }}"
     dest: "{{ item.dst }}"
     force: True
diff --git a/Makefile b/Makefile
index 0697568..e319b7c 100644
--- a/Makefile
+++ b/Makefile
@@ -250,11 +250,10 @@ gen-dockerfiles:
 		-e MY_GID=$$(id -g) \
 		-v ${PWD}:/data \
 		-w /data/.ansible \
-		cytopia/ansible:2.13-tools ansible-playbook generate.yml \
-			-e ANSIBLE_STRATEGY_PLUGINS=/usr/lib/python3.10/site-packages/ansible_mitogen/plugins/strategy \
-			-e ANSIBLE_STRATEGY=mitogen_linear \
+		cytopia/ansible:2.12-tools ansible-playbook generate.yml \
 			-e ansible_python_interpreter=/usr/bin/python3 \
 			-e \"{build_fail_fast: $(FAIL_FAST)}\" \
+			--forks 50 \
 			--diff $(ARGS)