diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0cd6e5c..6b2625a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 ---------
 
+**6.2.0**
+
+- Support Ubuntu 20.04 (Focal Fossa)
+- Introduce `wireguard_ubuntu_update_cache` and `wireguard_ubuntu_cache_valid_time` variables to specifiy individual Ubuntu package cache settings. Default values are the same as before.
+
 **6.1.0**
 
 - Archlinux: Linux kernel >= 5.6 contains `wireguard` module now. No need to install `wireguard-dkms` anymore in this case. Installations with LTS kernel installs `wireguard-lts` package now instead of `wireguard-dkms`. Installations with kernel <= 5.6 will still install `wireguard-dkms` package.
diff --git a/defaults/main.yml b/defaults/main.yml
index 55db08b..966b62b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,8 @@
 ---
+#######################################
+# General settings
+#######################################
+
 # Directory to store WireGuard configuration on the remote hosts
 wireguard_remote_directory: "/etc/wireguard"
 
@@ -7,3 +11,14 @@ wireguard_port: "51820"
 
 # The default interface name that wireguard should use if not specified otherwise.
 wireguard_interface: "wg0"
+
+
+#######################################
+# Settings only relevant for Ubuntu
+#######################################
+
+# Set to "false" if package cache should not be updated
+wireguard_ubuntu_update_cache: "true"
+
+# Set package cache valid time
+wireguard_ubuntu_cache_valid_time: "3600"
diff --git a/tasks/setup-ubuntu.yml b/tasks/setup-ubuntu.yml
index 17ae4f8..4decf64 100644
--- a/tasks/setup-ubuntu.yml
+++ b/tasks/setup-ubuntu.yml
@@ -1,8 +1,8 @@
 ---
 - name: Update APT package cache
   apt:
-    update_cache: true
-    cache_valid_time: 3600
+    update_cache: "{{ wireguard_ubuntu_update_cache }}"
+    cache_valid_time: "{{ wireguard_ubuntu_cache_valid_time }}"
   tags:
     - wg-install
 
diff --git a/vars/packages-archlinux.yml b/vars/packages-archlinux.yml
deleted file mode 100644
index fdc6563..0000000
--- a/vars/packages-archlinux.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-packages:
-  - wireguard-tools
diff --git a/vars/packages.yml b/vars/packages.yml
deleted file mode 100644
index 82c6b3c..0000000
--- a/vars/packages.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-packages:
-  - wireguard-dkms
-  - wireguard-tools