diff --git a/ubuntu-deb-general/defaults/main.yml b/ubuntu-deb-general/defaults/main.yml
index 4b751a34..355be958 100644
--- a/ubuntu-deb-general/defaults/main.yml
+++ b/ubuntu-deb-general/defaults/main.yml
@@ -3,6 +3,7 @@
 # Use the apt proxy
 #
 use_apt_proxy: False
+dist_upgrade: False
 
 pkg_state: installed
 common_packages:
diff --git a/ubuntu-deb-general/tasks/dist-upgrade.yml b/ubuntu-deb-general/tasks/dist-upgrade.yml
new file mode 100644
index 00000000..2be56a8c
--- /dev/null
+++ b/ubuntu-deb-general/tasks/dist-upgrade.yml
@@ -0,0 +1,6 @@
+---
+- name: Dist upgrade, if requested
+  apt: upgrade=dist update_cache=yes cache_valid_time=1800
+  when: dist_upgrade
+  tags: [ 'packages', 'upgrade', 'dist_upgrade' ]
+
diff --git a/ubuntu-deb-general/tasks/main.yml b/ubuntu-deb-general/tasks/main.yml
index e62194a6..f7cfebf4 100644
--- a/ubuntu-deb-general/tasks/main.yml
+++ b/ubuntu-deb-general/tasks/main.yml
@@ -2,6 +2,8 @@
 - import_tasks: apt-proxy.yml
 - import_tasks: resolvconf.yml
   when: install_resolvconf
+- import_tasks: dist-upgrade.yml
+  when: dist_upgrade
 - import_tasks: packages.yml
 - import_tasks: ntp.yml
 - import_tasks: remove-unneeded-pkgs.yml
diff --git a/ubuntu-deb-general/tasks/packages.yml b/ubuntu-deb-general/tasks/packages.yml
index ef143735..5b6864db 100644
--- a/ubuntu-deb-general/tasks/packages.yml
+++ b/ubuntu-deb-general/tasks/packages.yml
@@ -1,11 +1,11 @@
 ---
 - name: Install the basic packages
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800
   with_items: '{{ default_python_packages }}'
   tags: packages
 
 - name: Install software-properties-common if needed
-  apt: pkg=software-properties-common state=installed
+  apt: pkg=software-properties-common state=installed update_cache=yes cache_valid_time=1800
   when: is_ubuntu
   tags: packages
 
@@ -88,12 +88,12 @@
   tags: packages
 
 - name: install common packages
-  apt: pkg={{ item }} state={{ pkg_state }}
+  apt: pkg={{ item }} state={{ pkg_state }} update_cache=yes cache_valid_time=1800
   with_items: '{{ common_packages }}'
   tags: [ 'packages', 'common_pkgs' ]
 
 - name: Install additional packages, if any
-  apt: pkg={{ item }} state={{ pkg_state }}
+  apt: pkg={{ item }} state={{ pkg_state }} update_cache=yes cache_valid_time=1800
   with_items: '{{ additional_packages | default([]) }}'
   tags: [ 'packages', 'common_pkgs', 'additional_packages' ]