diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 51e89bb..bd68617 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -1,25 +1,6 @@
 ---
 # File: roles/common/tasks/main.yml
 
-- name: "upgrade existing apt packages"
-  apt:
-    upgrade: "yes"
-    update_cache: "yes"
-    autoclean: "yes"
-    autoremove: "yes"
-    state: "latest"
-
-- name: "add the PIP package manager"
-  apt:
-    name: "{{ packages }}"
-    state: "latest"
-  vars:
-    packages:
-    - "python3-setuptools"
-    - "python3-pip"
-  tags:
-    - "python"
-
 - name: install basic Linux tools
   apt:
     pkg:
diff --git a/roles/setup/tasks/main.yaml b/roles/setup/tasks/main.yaml
new file mode 100644
index 0000000..b5878dd
--- /dev/null
+++ b/roles/setup/tasks/main.yaml
@@ -0,0 +1,32 @@
+---
+
+- name: "upgrade existing apt packages"
+  apt:
+    upgrade: "yes"
+    update_cache: "yes"
+    autoclean: "yes"
+    autoremove: "yes"
+    state: "latest"
+
+- name: "add the PIP package manager"
+  apt:
+    pkg:
+    - "python3-setuptools"
+    - "python3-pip"
+  tags:
+    - "python"
+    - "packaging"
+
+- name: "add the flatpak package manager"
+  apt:
+    pkg:
+    - "flatpak"
+  tags:
+  - "flatpak"
+  - "packaging"
+
+- name: "upgrade existing flatpak applications"
+  command: "flatpak update --noninteractive"
+  tags:
+  - "flatpak"
+  - "packaging"
diff --git a/workstation.yml b/workstation.yml
index af37591..9caa683 100644
--- a/workstation.yml
+++ b/workstation.yml
@@ -17,9 +17,11 @@
     - config.yaml
     - versions.yml
   roles:
+    - "setup"
     - "common"
     - "browser"
     - "communication"
+    - "multimedia"
     - "development"
     # - containerization
     # - networking