diff --git a/tasks/workstation/linux/software/packages.yml b/tasks/workstation/linux/software/packages.yml
index 3043b0e..b6364d5 100644
--- a/tasks/workstation/linux/software/packages.yml
+++ b/tasks/workstation/linux/software/packages.yml
@@ -36,9 +36,7 @@
     name:
       - "{{ vlc }}"
       - "{{ vlc_plugins }}"
-      - "{{ appimagelauncher }}"
       - gparted
-      - hugo
       - "{{ firefox }}"
       - "{{ firefox_esr }}"
       - "{{ wireless_tools }}"
@@ -50,10 +48,25 @@
       - "{{ mpv }}"
       - "{{ transmission_gtk }}"
       - "{{ transmission_qt }}"
-      - gimp
       - "{{ libreoffice }}"
     state: present
 
+- name: Workstation | Linux | Software | Packages | Install From Repo [Coding]
+  package:
+    name:
+      - "{{ appimagelauncher }}"
+      - hugo
+      - code
+    state: present
+  when: coding == true
+
+- name: Workstation | Linux | Software | Packages | Install From Repo [Editing]
+  package:
+    name:
+      - gimp
+    state: present
+  when: editing == true
+
 - name: Workstation | Linux | Software | Packages | Install Audio (Looking at you, Artix)
   package:
     name:
@@ -104,10 +117,4 @@
       - "{{ thunderbird }}"
       - "{{ evolution }}"
       - steam
-      - vscode
-      - code
-      - libreoffice
-      - "*libreoffice*"
-      - '*libreoffice*'
-      - gimp
     state: absent