diff --git a/bitlair.yaml b/bitlair.yaml
index b463ff7..950d555 100644
--- a/bitlair.yaml
+++ b/bitlair.yaml
@@ -58,6 +58,7 @@
 
 - hosts: services
   roles:
+    - { role: "deb_forgejo", tags: [ "deb_forgejo" ] }
     - { role: "services", tags: ["services"] }
 
 - hosts: wiki
diff --git a/group_vars/all.yaml b/group_vars/all.yaml
index 39de4c0..0169ce1 100644
--- a/group_vars/all.yaml
+++ b/group_vars/all.yaml
@@ -37,5 +37,7 @@ debian_repourl: "http://deb.debian.org/debian/"
 debian_securityurl: "http://security.debian.org/debian-security"
 
 deb_forgejo_repos:
+  - host: git.bitlair.nl
+    owner: bitlair
   - host: git.polyfloyd.net
     owner: polyfloyd
diff --git a/roles/services/tasks/siahsd.yaml b/roles/services/tasks/siahsd.yaml
index c7c3b0b..fc7fef5 100644
--- a/roles/services/tasks/siahsd.yaml
+++ b/roles/services/tasks/siahsd.yaml
@@ -1,16 +1,15 @@
 ---
-# TODO: Install and build
+- name: Install siahsd
+  apt:
+    name: siahsd
 
 - name: Create directories
   ansible.builtin.file:
-    path: "{{ item }}"
+    path: /var/log/siahsd
     state: directory
     owner: siahsd
     group: nogroup
     mode: "0750"
-  with_items:
-    - /var/log/siahsd
-    - /var/lib/siahsd
 
 - name: Install config file
   ansible.builtin.template:
@@ -21,19 +20,9 @@
     mode: "0644"
   notify: Restart siahsd
 
-- name: Install service file
-  ansible.builtin.template:
-    src: siahsd.service
-    dest: /etc/systemd/system/siahsd.service
-    owner: root
-    group: root
-    mode: "0644"
-  notify: Restart siahsd
-
 - name: Start siahsd
   ansible.builtin.systemd:
     name: siahsd
     state: started
     enabled: true
     daemon_reload: true
-
diff --git a/roles/services/templates/siahsd.conf b/roles/services/templates/siahsd.conf
index 5d8e94f..ee18220 100644
--- a/roles/services/templates/siahsd.conf
+++ b/roles/services/templates/siahsd.conf
@@ -1,3 +1,5 @@
+# {{ ansible_managed }}
+
 [siahsd]
 pid file = /var/lib/siahsd/siahsd.pid
 log file = /var/log/siahsd/siahsd.log
@@ -5,13 +7,6 @@ log level = 3
 foreground = 0
 event handlers = script
 
-#[database]
-#driver = mysql
-#host = localhost
-#name = siahsd
-#username = siahsd
-#password = MysbJxAaawmwKPqD
-
 [siahs]
 port = 4000
 
@@ -19,21 +14,5 @@ port = 4000
 port = 9000
 rsa key file = something.sexp
 
-#[jsonbot]
-#address = 192.168.88.15
-#port = 5500
-#aes key = blablablablablaz
-#password = mekker
-#privmsg to = #bitlair
-
-#[spacestate]
-#driver = mysql
-#host = localhost
-#name = bitwifi
-#username = bitwifi
-#password = aGWERQpLEQPUaXJV
-#open script = /opt/alarm/disarmed.sh
-#close script = /opt/alarm/armed.sh
-
 [script]
 path = /opt/alarm/siahsd_handler.sh
diff --git a/roles/services/templates/siahsd.service b/roles/services/templates/siahsd.service
deleted file mode 100644
index 479324c..0000000
--- a/roles/services/templates/siahsd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-# Managed by Ansible
-
-[Unit]
-Description=Siahsd
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/lib/siahsd/siahsd.pid
-Restart=always
-RestartSec=10s
-ExecStartPre=-/bin/rm /var/lib/siahsd/siahsd.pid
-ExecStart=/usr/local/src/siahsd/build/siahsd
-User=siahsd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/services.yaml b/services.yaml
index e66fc11..52103e0 100644
--- a/services.yaml
+++ b/services.yaml
@@ -3,4 +3,5 @@
 - hosts: services
   roles:
     - { role: "common", tags: [ "common" ] }
+    - { role: "deb_forgejo", tags: [ "deb_forgejo" ] }
     - { role: "services", tags: [ "services" ] }