diff --git a/roles/system/base/tasks/dev_extra.yml b/roles/system/base/tasks/dev_extra.yml
index aede184..c1ce08f 100644
--- a/roles/system/base/tasks/dev_extra.yml
+++ b/roles/system/base/tasks/dev_extra.yml
@@ -17,15 +17,9 @@
   dnf:
     state: present
     name:
-      - ImageMagick
-      - ImageMagick-doc
-      - ImageMagick-libs
       - hyperfine
       - libtree-sitter
       - newsboat
-      - recoll
-      - recoll-gssp
-      - recoll-kio
       - starship
       - yt-dlp
 
diff --git a/roles/system/base/tasks/dev_minimal.yml b/roles/system/base/tasks/dev_minimal.yml
index 0d876f2..e5d9b5a 100644
--- a/roles/system/base/tasks/dev_minimal.yml
+++ b/roles/system/base/tasks/dev_minimal.yml
@@ -24,14 +24,6 @@
       - libtool
       - make
 
-- name: Setup container development tools
-  dnf:
-    state: present
-    name:
-      - podman
-      - toolbox
-      - openssl
-
 - name: Install extra build systems
   dnf:
     state: present
diff --git a/roles/system/flatpak/tasks/main.yml b/roles/system/flatpak/tasks/main.yml
index 1653baf..ae67d7f 100644
--- a/roles/system/flatpak/tasks/main.yml
+++ b/roles/system/flatpak/tasks/main.yml
@@ -1,13 +1,4 @@
 ---
-- name: Install Flatpak development tools
-  package:
-    state: present
-    name: "{{ item }}"
-  loop:
-    - flatpak
-    - flatpak-builder
-    - git
-
 - name: Add Flatpak remotes
   flatpak_remote:
     state: present
@@ -75,3 +66,5 @@
     remote: gnome-nightly
   loop:
     - org.gimp.GIMP
+    - org.gnome.NautilusDevel
+    - org.gnome.Builder