diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml
index e146b885..18509ea9 100644
--- a/evolinux-base/tasks/hardware.yml
+++ b/evolinux-base/tasks/hardware.yml
@@ -9,7 +9,7 @@
 - name: Check if Broadcom NetXtreme II device is present
   shell: "lspci | grep -q 'NetXtreme II'"
   check_mode: no
-  
+
   register: broadcom
   failed_when: False
   changed_when: False
@@ -28,7 +28,7 @@
 - name: Detect if RAID is installed
   shell: lspci | grep "RAID bus controller" | grep -v Intel
   check_mode: no
-  
+
   register: raidmodel
   changed_when: "'FAILED' in raidmodel.stdout"
   failed_when: "'FAILED' in raidmodel.stdout"
@@ -54,17 +54,12 @@
 
 - block:
   - name: Install packages for DELL/LSI hardware
-    ## With Ansible 2.0, the apt module can't install unauthenticated packages
-    # apt:
-    #   name: "{{ item }}"
-    #   state: present
-    # with_items:
-    #   - megacli
-    #   - megaclisas-status
-    command: "apt-get install -yq --allow-unauthenticated megacli megaclisas-status"
-    register: install_megacli
-    changed_when: not (install_megacli.stdout | search("0 upgraded") and install_megacli.stdout | search("0 newly installed"))
-
+    apt:
+      name: "{{ item }}"
+      allow_unauthenticated: yes
+    with_items:
+    - megacli
+    - megaclisas-status
 
   - name: Configure packages for DELL/LSI hardware
     template:
diff --git a/evolinux-base/tasks/packages.yml b/evolinux-base/tasks/packages.yml
index 255a5f72..0e476c5b 100644
--- a/evolinux-base/tasks/packages.yml
+++ b/evolinux-base/tasks/packages.yml
@@ -57,9 +57,9 @@
   when: evolinux_packages_common
 
 - name: Install/Update serveur-base meta-package
-  command: "apt-get install -yq --allow-unauthenticated serveur-base"
-  register: install_server_base
-  changed_when: not (install_server_base.stdout | search("0 upgraded") and install_server_base.stdout | search("0 newly installed"))
+  apt:
+    name: serveur-base
+    allow_unauthenticated: yes
   when: evolinux_packages_serveur_base
 
 - name: Customize logcheck recipient
@@ -72,7 +72,7 @@
 - name: is an MTA installed?
   command: "dpkg -S /usr/sbin/sendmail"
   check_mode: no
-  
+
   register: mta_installed
   failed_when: False
   changed_when: False