diff --git a/README.md b/README.md
index 1e0b57d..73fbc85 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,10 @@
 # Personal Linux Setup
 
-My current setup is [Debian Bullseye](https://www.debian.org/releases/bullseye/) with the [i3 window manager](https://i3wm.org/).
+My current setup is [Debian Bookworm](https://www.debian.org/releases/bookworm/) with the [i3 window manager](https://i3wm.org/).
 
 ## Before installing
 
+- `rm /usr/lib/python*/EXTERNALLY-MANAGED`
 - `sudo apt-get install curl git python3-distutils`
 - `export PATH=$PATH:~/.local/bin`
 - [Install Ansible](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html)
@@ -12,7 +13,6 @@ My current setup is [Debian Bullseye](https://www.debian.org/releases/bullseye/)
 
 - thunderbird config (pretty hard to do, should just capture steps taken somewhere)
 - firefox config? extensions? host own synchronizer?
-- Daemon to restore wallpaper?
 
 #### Neovim
 
diff --git a/playbooks/os3.yml b/playbooks/os3.yml
deleted file mode 100644
index 8af1f93..0000000
--- a/playbooks/os3.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-- name: Setup system
-  hosts: self
-  roles:
-    - role: system
-      tags: [system]
-    - role: i3
-      tags: [i3]
-    - role: bash
-      tags: [bash]
-    - role: alacritty
-      tags: [alacritty]
-    - role: neovim
-      tags: [neovim]
-    - role: keepassxc
-      tags: [keepassxc]
-    - role: signal
-      tags: [signal]
-    - role: vscodium
-      tags: [vscodium]
diff --git a/roles/common/sources.list b/roles/common/sources.list
new file mode 100644
index 0000000..f09b035
--- /dev/null
+++ b/roles/common/sources.list
@@ -0,0 +1,12 @@
+deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware
+
+deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
+deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware
+
+deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware
+deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware
+
+
+# llvm
+deb http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-15 main
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index f6f1eb4..40cef00 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,9 +1,8 @@
-- name: Enable non-free packages
+- name: Set APT sources
   become: true
-  replace:
-    path: "/etc/apt/sources.list"
-    regexp: "^(.*main.*?)( contrib non-free)?$"
-    replace: '\1 contrib non-free'
+  copy:
+    src: sources.list
+    dest: /etc/apt/sources.list
 - name: APT upgrade
   become: true
   apt:
diff --git a/playbooks/laptop.yml b/setup.yml
similarity index 99%
rename from playbooks/laptop.yml
rename to setup.yml
index 66bd993..f4047fa 100644
--- a/playbooks/laptop.yml
+++ b/setup.yml
@@ -1,5 +1,6 @@
 - name: Setup system
   hosts: self
+
   roles:
     - role: system
       tags: [system]