diff --git a/controllers.yaml b/controllers.yaml
index 183001f..7c63fb7 100644
--- a/controllers.yaml
+++ b/controllers.yaml
@@ -8,12 +8,3 @@
     #- role: netbox
     #- role: alerta
     - role: buildbot
-  tasks:
-    - name: create ssh keys for project users
-      user:
-        name: "{{ project }}"
-        generate_ssh_key: yes
-        ssh_key_type: ed25519
-      loop: "{{ projects.keys() }}"
-      loop_control:
-        loop_var: project
diff --git a/group_vars/controllers/buildbot.yaml b/group_vars/controllers/buildbot.yaml
index ea4e842..95f9793 100644
--- a/group_vars/controllers/buildbot.yaml
+++ b/group_vars/controllers/buildbot.yaml
@@ -1,23 +1,4 @@
 buildbot_server_name: buildbot.testing.thengo.net
-buildbot_workers: |-
-  {
-    {% for project_name in projects.keys() %}
-      {{ project_name | to_json }}: {},
-    {% endfor %}
-  }
-buildbot_builders: |-
-  {
-    {% for project_name in projects.keys() %}
-      {% set project = projects[project_name] %}
-      {% if project.builders is defined %}
-        {% for builder_name in project.builders.keys() %}
-        {% set builder = project.builders[builder_name] %}
-          {{ ( project_name + '-' + builder_name ) | to_json }}:
-            {{ builder | combine({'worker_names':[project_name]}) | to_json }},
-        {% endfor %}
-      {% endif %}
-    {% endfor %}
-  }
 
 buildbot_gitea_webhook_secret: theow0po5faChaeM5ki2chie
 buildbot_gitea_change_hook: true
diff --git a/group_vars/controllers/project.yaml b/group_vars/controllers/project.yaml
new file mode 100644
index 0000000..3d844ab
--- /dev/null
+++ b/group_vars/controllers/project.yaml
@@ -0,0 +1,11 @@
+---
+project_name: testing
+project_buildbot_builders:
+  infrastructure:
+    repo:
+      type: gitea
+      branch: master
+      url: ssh://git@git.testing.thengo.net/thengo-testing/testing.git
+    shell_commands:
+      - name: ansible
+        command: echo Hello World!
diff --git a/group_vars/controllers/projects.yaml b/group_vars/controllers/projects.yaml
deleted file mode 100644
index c7d0394..0000000
--- a/group_vars/controllers/projects.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-
-projects:
-  testing:
-    builders:
-      infrastructure:
-        repos:
-          - name: testing repo
-            type: gitea
-            workdir: testing
-            repourl: ssh://git@git.testing.thengo.net/thengo-testing/testing.git
-        shell_commands:
-          - name: ansible
-            command: echo Hello World!
-            workdir: testing
-        force_scheduler: true
diff --git a/project.yaml b/project.yaml
new file mode 100644
index 0000000..7a48ec4
--- /dev/null
+++ b/project.yaml
@@ -0,0 +1,6 @@
+---
+
+- hosts: controllers
+  remote_user: root
+  roles:
+    - role: project