diff --git a/ci/install-build-deps.sh b/ci/install-build-deps.sh
index bac9bb42..f470e6d4 100755
--- a/ci/install-build-deps.sh
+++ b/ci/install-build-deps.sh
@@ -22,14 +22,14 @@ if [ $(id -u) -ne 0 ]; then
 fi
 
 case "$ID-$VERSION_ID" in
-  ubuntu-16.04)
+  ubuntu-16.04|ubuntu-18.04)
     # Curl must be available to get the repo key below.
     $SUDO_CMD apt-get update
     $SUDO_CMD apt-get install -y curl
 
     # Make Verilator repository available
-    curl -Ls https://download.opensuse.org/repositories/home:phiwag:edatools/xUbuntu_16.04/Release.key | $SUDO_CMD apt-key add -
-    $SUDO_CMD sh -c "echo 'deb http://download.opensuse.org/repositories/home:/phiwag:/edatools/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/edatools.list"
+    curl -Ls https://download.opensuse.org/repositories/home:phiwag:edatools/xUbuntu_$VERSION_ID/Release.key | $SUDO_CMD apt-key add -
+    $SUDO_CMD sh -c "echo 'deb http://download.opensuse.org/repositories/home:/phiwag:/edatools/xUbuntu_$VERSION_ID/ /' > /etc/apt/sources.list.d/edatools.list"
     $SUDO_CMD apt-get update
 
     # Uninstall distribution-provided version to get a newer version through pip
@@ -78,7 +78,7 @@ case "$ID-$VERSION_ID" in
       # Install Verible
       mkdir -p build/verible
       cd build/verible
-      curl -Ls -o verible.tar.gz "https://github.com/google/verible/releases/download/$VERIBLE_VERSION/verible-$VERIBLE_VERSION-Ubuntu-16.04-xenial-x86_64.tar.gz"
+      curl -Ls -o verible.tar.gz "https://github.com/google/verible/releases/download/$VERIBLE_VERSION/verible-$VERIBLE_VERSION-Ubuntu-$VERSION_ID-$VERSION_CODENAME-x86_64.tar.gz"
       $SUDO_CMD mkdir -p /tools/verible && $SUDO_CMD chmod 777 /tools/verible
       tar -C /tools/verible -xf verible.tar.gz --strip-components=1
       echo "##vso[task.prependpath]/tools/verible/bin"