diff --git a/packer/build.pkr.hcl b/packer/build.pkr.hcl
index e9b6482..6b3be55 100644
--- a/packer/build.pkr.hcl
+++ b/packer/build.pkr.hcl
@@ -41,20 +41,14 @@ build {
           fail2ban \
           htop \
           iperf3 \
-          linux-generic \
           nano \
           openresolv \
           qrencode \
           ssh-import-id \
           ufw \
           unattended-upgrades \
-          unbound
-      EOF
-      ,
-      <<EOF
-        printf "deb http://ppa.launchpad.net/wireguard/wireguard/ubuntu/ $(lsb_release -cs) main\n" > /etc/apt/sources.list.d/wireguard.list
-        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E1B39B6EF6DDB96564797591AE33835F504A1A25
-        apt-get update && apt-get install -yo DPkg::options::=--force-confold wireguard
+          unbound \
+          wireguard
       EOF
       ,
       <<EOF
diff --git a/packer/sources.pkr.hcl b/packer/sources.pkr.hcl
index 22b7ce4..8ba8c1c 100644
--- a/packer/sources.pkr.hcl
+++ b/packer/sources.pkr.hcl
@@ -1,5 +1,5 @@
 source "hcloud" "main" {
-  image = "ubuntu-18.04"
+  image = "ubuntu-20.04"
   server_name = "wireguard-{{timestamp}}"
   server_type = "cx11"
   location = "fsn1"
@@ -17,8 +17,8 @@ source "hcloud" "main" {
 }
 
 source "qemu" "main" {
-  iso_url = "https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img"
-  iso_checksum_url = "https://cloud-images.ubuntu.com/bionic/current/SHA256SUMS"
+  iso_url = "https://cloud-images.ubuntu.com/daily/server/focal/current/focal-server-cloudimg-amd64.img"
+  iso_checksum_url = "https://cloud-images.ubuntu.com/daily/server/focal/current/SHA256SUMS"
   iso_checksum_type = "sha256"
   disk_image = true