diff --git a/client/tasks/configuration.yml b/client/tasks/configuration.yml
index eef6b960a38526ab48b29b127e001a6dd469ecb6..0c93616082f135d740aaa17a7f158d4a265ce530 100644
--- a/client/tasks/configuration.yml
+++ b/client/tasks/configuration.yml
@@ -57,3 +57,9 @@
     group: root
     mode: '0644'
   when: client_provision_mozilla
+
+- name: ensure dynamic wpa_s is stopped and disabled
+  service:
+    name: wpa_supplicant
+    state: stopped
+    enabled: false
diff --git a/client/tasks/software.yml b/client/tasks/software.yml
index 3749400a22ad77c0da7e4da940de997d46036cfa..08ea29cc66d27dd013a34ae268580614b23a634b 100644
--- a/client/tasks/software.yml
+++ b/client/tasks/software.yml
@@ -8,6 +8,7 @@
       - firmware-realtek
       - firmware-iwlwifi
     state: present
+  when: ansible_system_vendor == "Dell Inc."
 
 - name: ensure office applications are installed
   apt:
@@ -234,8 +235,18 @@
     purge: true
     name:
       - network-manager
+      - modemmanager
+      - unattended-upgrades
       - update-manager-core
       - update-manager-gnome
       - popularity-contest
       - konqueror
+      - haveged
       - lirc
+
+- name: ensure cups daemon is uninstalled
+  apt:
+    state: absent
+    purge: true
+    name: cups-daemon
+    autoremove: true