diff --git a/playbooks/fedora.yml b/playbooks/fedora.yml
index b9f816c..915309c 100644
--- a/playbooks/fedora.yml
+++ b/playbooks/fedora.yml
@@ -2,7 +2,7 @@
 - name: Fedora bootstrap
   hosts: all
   roles:
-    - role: set_dnf
+    - role: fedora_packages
       become: yes
       become_method: sudo
     - flatpaks
diff --git a/playbooks/roles/fedora_packages/tasks/main.yml b/playbooks/roles/fedora_packages/tasks/main.yml
new file mode 100644
index 0000000..e697d1c
--- /dev/null
+++ b/playbooks/roles/fedora_packages/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: Upgrade all packages
+  dnf:
+    name: '*'
+    state: latest
+
+- name: Install playerctl and flameshot
+  dnf:
+    name:
+      - playerctl
+      - flameshot
+    state: present
+
+- name: Install all packages for shell
+  dnf:
+    name:
+      - zsh
+      - tmux
+      - neovim
+      - emacs
+    state: present
\ No newline at end of file
diff --git a/playbooks/roles/set_dnf/tasks/main.yml b/playbooks/roles/set_dnf/tasks/main.yml
deleted file mode 100644
index 7eddbbf..0000000
--- a/playbooks/roles/set_dnf/tasks/main.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# TODO: Set up repos
-
-- name: Upgrade all packages
-  dnf:
-    name: '*'
-    state: latest
-
-- name: Install playerctl for spotify
-  dnf:
-    name: playerctl
-    state: present
-
-- name: Install flameshot for screenshots
-  dnf:
-    name: flameshot
-    state: present
diff --git a/playbooks/roles/shell/tasks/main.yml b/playbooks/roles/shell/tasks/main.yml
index 8741d3f..e95abf5 100644
--- a/playbooks/roles/shell/tasks/main.yml
+++ b/playbooks/roles/shell/tasks/main.yml
@@ -1,15 +1,4 @@
 ---
-- name: Install all packages for shell
-  become: yes
-  become_method: sudo
-  dnf:
-    name:
-      - zsh
-      - tmux
-      - neovim
-      - emacs
-    state: present
-
 - name: Set default shell and generate SSH key
   become: yes
   become_method: sudo