diff --git a/deploy.yml b/deploy.yml
index 44cd63c..28ffb71 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -7,15 +7,11 @@
     - users
     - sshd
     - wifi
+    - lbu_commit
   vars:
     users:
       - rilla
       - ansible
-    use_lbu: true
-  post_tasks:
-    - name: lbu commit
-      lbu:
-        commit: true
 
 - name: caladan deployment
   hosts: caladan
@@ -31,7 +27,6 @@
       - rilla
       - ansible
       - woodpecker
-    use_lbu: false
 
 - name: narwhal deployment
   hosts: narwhal
diff --git a/hosts.yml b/hosts.yml
index a60d97c..3ce77dd 100644
--- a/hosts.yml
+++ b/hosts.yml
@@ -8,6 +8,7 @@ all:
       ansible_port: 22
       ansible_python_interpreter: /usr/bin/python3
       ansible_become_method: doas
+      use_lbu: true
 
     caladan:
       ansible_host: caladan
@@ -15,6 +16,7 @@ all:
       ansible_port: 22
       ansible_python_interpreter: /usr/bin/python3
       ansible_become_method: doas
+      use_lbu: false
 
     narwhal:
       ansible_host: narwhal
diff --git a/roles/lbu_commit/tasks/main.yml b/roles/lbu_commit/tasks/main.yml
new file mode 100644
index 0000000..207e380
--- /dev/null
+++ b/roles/lbu_commit/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- name: lbu commit
+  lbu:
+    commit: true
+  when: ansible_distribution == "Alpine" and use_lbu