diff --git a/tasks/apt/cleanup.yaml b/tasks/apt/cleanup.yaml
new file mode 100644
index 0000000..7dfead7
--- /dev/null
+++ b/tasks/apt/cleanup.yaml
@@ -0,0 +1,17 @@
+---
+
+# clean apt cache
+- name: "apt - clean cache"
+  ansible.builtin.apt:
+    clean: true
+  when: 'ansible_os_family == "Debian"'
+  tags: 'apt-cleanup'
+
+# run fstrim if target is a VM
+- name: "fstrim" 
+  ansible.builtin.command: "fstrim /"
+  changed_when: false
+  failed_when: false
+  tags: 'apt-cleanup'
+  when: 
+   - 'type = "vm"'
diff --git a/tasks/main.yaml b/tasks/main.yaml
index c5b0b3b..6a86651 100644
--- a/tasks/main.yaml
+++ b/tasks/main.yaml
@@ -5,6 +5,7 @@
   ansible.builtin.import_tasks: "ossupport.yaml"
   tags:
     - "apt"
+    - "apt-cleanup"
     - "cron"
     - "environment-file"
     - "hostname"
@@ -31,6 +32,7 @@
   when: "os_support"
   tags:
     - "apt"
+    - "apt-cleanup"
     - "cron"
     - "environment-file"
     - "hostname"
@@ -124,6 +126,11 @@
   when: "os_support"
   tags: "apt"
 
+- name: "apt - cleanup"
+  ansible.builtin.import_tasks: "apt/cleanup.yaml"
+  when: "os_support"
+  tags: "apt-cleanup"
+
 # telemetry
 - name: "telemetry"
   ansible.builtin.import_tasks: "telemetry.yaml"