diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2970ca309..04691e788 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: "ubuntu:18.04"
+image: "ubuntu:20.04"
 
 variables:
   GIT_STRATEGY: "pull"
@@ -7,6 +7,7 @@ variables:
 
 before_script:
  - |
+    export DEBIAN_FRONTEND=noninteractive
     apt-get update -qq &&
     apt-get install -qq \
         bison \
diff --git a/mk/config.mk b/mk/config.mk
index 45a7cdc6a..642803ca8 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -53,7 +53,7 @@ INSTALLER=\
  	installer/target/release/redox_installer $(INSTALLER_FLAGS)
 
 ## Bootloader variables
-EFI_TARGET=$(ARCH)-efi-pe
+EFI_TARGET=$(ARCH)-unknown-uefi
 
 ## Cross compiler variables
 AR=$(TARGET)-gcc-ar