diff --git a/roles.yaml b/roles.yaml
index 4be8b3c..3944603 100644
--- a/roles.yaml
+++ b/roles.yaml
@@ -35,7 +35,7 @@
         tasks_from: "{{ tasks_from_file }}"
     - import_role:
         name: "development"
-        tasks_from: "{{ tasks_from_file }}"
+        tasks_from: "{{ tasks_from_file }}-system"
     - import_role:
         name: "containerization"
         tasks_from: "{{ tasks_from_file }}"
@@ -61,6 +61,9 @@
     - import_role:
         name: "setup"
         tasks_from: "{{ tasks_from_file }}-user"
+    - import_role:
+        name: "development"
+        tasks_from: "{{ tasks_from_file }}-user"
     - import_role:
         name: "asdf"
         tasks_from: "{{ tasks_from_file }}"
diff --git a/roles/development/tasks/clean-system.yaml b/roles/development/tasks/clean-system.yaml
new file mode 100644
index 0000000..8cda66d
--- /dev/null
+++ b/roles/development/tasks/clean-system.yaml
@@ -0,0 +1,71 @@
+---
+
+# dbeaver
+
+- name: "Remove dbeaver apt"
+  ansible.builtin.apt:
+    pkg:
+      - "dbeaver-ce"
+    state: "absent"
+  tags:
+      - "dbeaver"
+      - "database"
+      - "development"
+
+- name: "Remove the dbeaver apt repository"
+  ansible.builtin.apt_repository: 
+    repo: "{{ item }}"
+    state: "absent"
+  with_items:
+    - "deb [ signed-by={{ dbeaver_apt_keyring }} ] https://dbeaver.io/debs/dbeaver-ce /"
+    - "deb-src [ signed-by={{ dbeaver_apt_keyring }} ] https://dbeaver.io/debs/dbeaver-ce /"
+  tags:
+    - "dbeaver"
+    - "database"
+    - "development"
+
+- name: "Remove the dbeaver signing key"
+  ansible.builtin.apt_key:
+    url: "https://dbeaver.io/debs/dbeaver.gpg.key"
+    id: "98F5A7CC1ABE72AC3852A007D33A1BD725ED047D"
+    keyring: "{{ dbeaver_apt_keyring }}"
+    state: "absent"
+  tags:
+    - "dbeaver"
+    - "database"
+    - "development"
+
+# Codium
+
+- name: "Remove vscodium"
+  ansible.builtin.apt:
+    pkg:
+      - "codium"
+    state: "absent"
+  tags:
+    - "vscodium"
+    - "ide"
+    - "development"
+
+- name: "Remove the vscodium apt repository"
+  ansible.builtin.apt_repository:
+    repo: "{{ item }}"
+    state: "absent"
+  with_items:
+    - "deb [ signed-by={{ vscodium_apt_keyring }} ] https://download.vscodium.com/debs vscodium main"
+    - "deb-src [ signed-by={{ vscodium_apt_keyring }} ] https://download.vscodium.com/debs vscodium main"
+  tags:
+    - "vscodium"
+    - "ide"
+    - "development"
+
+- name: "Remove the vscodium signing key"
+  ansible.builtin.apt_key:
+    url: "https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg"
+    id: "1302DE60231889FE1EBACADC54678CF75A278D9C"
+    keyring: "{{ vscodium_apt_keyring }}"
+    state: "absent"
+  tags:
+    - "vscodium"
+    - "ide"
+    - "development"
diff --git a/roles/development/tasks/clean.yaml b/roles/development/tasks/clean-user.yaml
similarity index 100%
rename from roles/development/tasks/clean.yaml
rename to roles/development/tasks/clean-user.yaml
diff --git a/roles/development/tasks/main.yml b/roles/development/tasks/main-system.yml
similarity index 75%
rename from roles/development/tasks/main.yml
rename to roles/development/tasks/main-system.yml
index b8d72b5..62225a7 100644
--- a/roles/development/tasks/main.yml
+++ b/roles/development/tasks/main-system.yml
@@ -1,120 +1,25 @@
 ---
 # File: roles/development/tasks/main.yml
 
-- name: "install development tools via apt"
-  apt:
+- name: "Install development tools via apt"
+  ansible.builtin.apt:
     pkg:
-    - "ansible-lint"
+      - "ansible-lint"
   tags:
-  - "development"
-
-# dbeaver
-
-- name: "add the dbeaver signing key"
-  apt_key:
-    url: "https://dbeaver.io/debs/dbeaver.gpg.key"
-    id: "98F5A7CC1ABE72AC3852A007D33A1BD725ED047D"
-    keyring: "{{ dbeaver_apt_keyring }}"
-  tags:
-  - "dbeaver"
-  - "database"
-  - "development"
-
-- name: "add the dbeaver apt repository"
-  apt_repository: 
-    repo: "{{ item }}"
-  with_items:
-  - "deb [ signed-by={{ dbeaver_apt_keyring }} ] https://dbeaver.io/debs/dbeaver-ce /"
-  - "deb-src [ signed-by={{ dbeaver_apt_keyring }} ] https://dbeaver.io/debs/dbeaver-ce /"
-  tags:
-  - "dbeaver"
-  - "database"
-  - "development"
-
-- name: "install dbeaver apt"
-  apt:
-    pkg:
-    - "dbeaver-ce"
-  tags:
-    - "dbeaver"
-    - "database"
-    - "development"
-    
-- name: "add the vscodium signing key"
-  apt_key:
-    url: "https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo/raw/master/pub.gpg"
-    id: "1302DE60231889FE1EBACADC54678CF75A278D9C"
-    keyring: "{{ vscodium_apt_keyring }}"
-  tags:
-  - "vscodium"
-  - "ide"
-  - "development"
-
-- name: "add the vscodium apt repository"
-  apt_repository:
-    repo: "{{ item }}"
-  with_items:
-    - "deb [ signed-by={{ vscodium_apt_keyring }} ] https://download.vscodium.com/debs vscodium main"
-    - "deb-src [ signed-by={{ vscodium_apt_keyring }} ] https://download.vscodium.com/debs vscodium main"
-  tags:
-    - "vscodium"
-    - "ide"
     - "development"
 
-- name: "install vscodium"
-  apt:
-    pkg:
-    - "codium"
-  tags:
-    - "vscodium"
-    - "ide"
-    - "development"
-
-- name: install selected codium extensions
-  command:
-    cmd: "codium --install-extension {{ item }} --user-data-dir /usr/share/code --force"
-  with_items:
-  - asciidoctor.asciidoctor-vscode
-  - golang.go
-  - gruntfuggly.todo-tree
-  - hashicorp.terraform
-  - mkhl.direnv
-  - ms-azuretools.vscode-docker
-  - ms-kubernetes-tools.vscode-kubernetes-tools
-  - mtxr.sqltools
-  - mtxr.sqltools-driver-pg
-  - redhat.ansible
-  - vscodevim.vim
-  - vscjava.vscode-java-pack
-  - vscjava.vscode-maven
-  - zxh404.vscode-proto3
-  register: codium_extension
-  changed_when: "'already installed' not in codium_extension.stdout"
-  tags:
-    - "vscodium"
-    - "ide"
-    - "development"
-
-- name: "update installed codium extensions"
-  command:
-    cmd: "codium --update-extensions --user-data-dir /usr/share/code --force"
-  register: update_codium_extensions_result
-  changed_when: "update_codium_extensions_result.stdout != 'No extension to update'"
-  tags:
-    - "vscodium"
-    - "ide"
-    - "development"
-
-# Install development tools via flatpak
-
 - name: "Install development tools via flatpak"
   community.general.flatpak:
-    name: "rest.insomnia.Insomnia"
+    name: "{{ item }}"
+  with_items:
+    - "com.vscodium.codium"
+    - "rest.insomnia.Insomnia"
   tags:
     - "insomnia"
     - "rest"
     - "development"
 
+
 # #
 # # Editors
 # #
diff --git a/roles/development/tasks/main-user.yaml b/roles/development/tasks/main-user.yaml
new file mode 100644
index 0000000..9ef7ddd
--- /dev/null
+++ b/roles/development/tasks/main-user.yaml
@@ -0,0 +1,37 @@
+---
+
+- name: install selected codium extensions
+  command:
+    # cmd: "codium --install-extension {{ item }} --user-data-dir /usr/share/code --force"
+    cmd: "/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=codium --file-forwarding --session-bus com.vscodium.codium --install-extension {{ item }} --force"
+  with_items:
+  - asciidoctor.asciidoctor-vscode
+  - golang.go
+  - gruntfuggly.todo-tree
+  - hashicorp.terraform
+  - mkhl.direnv
+  - ms-azuretools.vscode-docker
+  - ms-kubernetes-tools.vscode-kubernetes-tools
+  # - mtxr.sqltools
+  # - mtxr.sqltools-driver-pg
+  - redhat.ansible
+  - vscodevim.vim
+  # - vscjava.vscode-java-pack
+  # - vscjava.vscode-maven
+  - zxh404.vscode-proto3
+  register: codium_extension
+  changed_when: "'already installed' not in codium_extension.stdout"
+  tags:
+    - "vscodium"
+    - "ide"
+    - "development"
+
+- name: "update installed codium extensions"
+  command:
+    cmd: "/usr/bin/flatpak run --branch=stable --arch=x86_64 --command=codium --file-forwarding --session-bus com.vscodium.codium --update-extensions --force"
+  register: update_codium_extensions_result
+  changed_when: "update_codium_extensions_result.stdout != 'No extension to update'"
+  tags:
+    - "vscodium"
+    - "ide"
+    - "development"