diff --git a/.drone.yml b/.drone.yml
index 20d65aa..296b0e2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,18 +19,11 @@ steps:
     source: https://schlomp.space/tastytea/mastodonpp/releases/download/0.5.7/libmastodonpp_0.5.7-0_amd64_buster.deb
     destination: mastodonpp_buster.deb
 
-# - name: download mastodonpp for bionic
-#   image: plugins/download
-#   settings:
-#     source: https://schlomp.space/tastytea/mastodonpp/releases/download/0.4.0/libmastodonpp_0.4.0-0_amd64_bionic.deb
-#     destination: mastodonpp_bionic.deb
-
-# Workaround until the debian packages are fixed.
-- name: download restclient-cpp source
+- name: download mastodonpp for bionic
   image: plugins/download
   settings:
-    source: https://github.com/mrtazz/restclient-cpp/archive/0.5.1.tar.gz
-    destination: restclient-cpp.tar.gz
+    source: https://schlomp.space/tastytea/mastodonpp/releases/download/0.5.7/libmastodonpp_0.5.7-0_amd64_bionic.deb
+    destination: mastodonpp_bionic.deb
 
 - name: GCC 8 on Debian buster
   image: debian:buster-slim
@@ -44,19 +37,9 @@ steps:
   - rm /etc/apt/apt.conf.d/docker-clean
   - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
   - apt-get update -q
-  - echo "deb https://packagecloud.io/mrtazz/restclient-cpp/debian/ buster main" > /etc/apt/sources.list.d/restclient-cpp.list
-  - apt-get install -qq debian-archive-keyring curl gnupg apt-transport-https
-  - curl -L https://packagecloud.io/mrtazz/restclient-cpp/gpgkey | apt-key add -
-  - apt-get update -q
   - apt-get install -qq build-essential cmake pkg-config asciidoc
-  - apt-get install -qq libboost-filesystem-dev libboost-log-dev libboost-regex-dev libjsoncpp-dev catch libcurl4-openssl-dev restclient-cpp
+  - apt-get install -qq libboost-filesystem-dev libboost-log-dev libboost-regex-dev libjsoncpp-dev catch libcurl4-openssl-dev
   - apt-get -qq install ./mastodonpp_buster.deb
-  - tar -xf restclient-cpp.tar.gz
-  - cd restclient-cpp-*
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  - cmake --build .
-  - make install
-  - cd ..
   - rm -rf build && mkdir -p build && cd build
   - cmake ..
   - make VERBOSE=1
@@ -65,32 +48,28 @@ steps:
   - name: debian-package-cache
     path: /var/cache/apt/archives
 
-# - name: GCC 7 on Ubuntu bionic
-#   image: ubuntu:bionic
-#   pull: always
-#   environment:
-#     CXX: g++-7
-#     CXXFLAGS: -pipe -O2
-#     DEBIAN_FRONTEND: noninteractive
-#     LANG: C.utf8
-#   commands:
-#   - rm /etc/apt/apt.conf.d/docker-clean
-#   - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
-#   - apt-get update -q
-#   - echo "deb https://packagecloud.io/mrtazz/restclient-cpp/ubuntu/ bionic main" > /etc/apt/sources.list.d/restclient-cpp.list
-#   - apt-get install -qq curl gnupg apt-transport-https
-#   - curl -L https://packagecloud.io/mrtazz/restclient-cpp/gpgkey | apt-key add -
-#   - apt-get update -q
-#   - apt-get install -qq build-essential cmake pkg-config asciidoc
-#   - apt-get install -qq libboost-filesystem-dev libboost-log-dev libboost-regex-dev libjsoncpp-dev catch libcurl4-openssl-dev restclient-cpp
-#   - apt-get -qq install ./mastodonpp_bionic.deb
-#   - rm -rf build && mkdir -p build && cd build
-#   - cmake ..
-#   - make VERBOSE=1
-#   - make install DESTDIR=install
-#   volumes:
-#   - name: debian-package-cache
-#     path: /var/cache/apt/archives
+- name: GCC 7 on Ubuntu bionic
+  image: ubuntu:bionic
+  pull: always
+  environment:
+    CXX: g++-7
+    CXXFLAGS: -pipe -O2
+    DEBIAN_FRONTEND: noninteractive
+    LANG: C.utf8
+  commands:
+  - rm /etc/apt/apt.conf.d/docker-clean
+  - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get'
+  - apt-get update -q
+  - apt-get install -qq build-essential cmake pkg-config asciidoc
+  - apt-get install -qq libboost-filesystem-dev libboost-log-dev libboost-regex-dev libjsoncpp-dev catch libcurl4-openssl-dev
+  - apt-get -qq install ./mastodonpp_bionic.deb
+  - rm -rf build && mkdir -p build && cd build
+  - cmake ..
+  - make VERBOSE=1
+  - make install DESTDIR=install
+  volumes:
+  - name: debian-package-cache
+    path: /var/cache/apt/archives
 
 - name: notify
   image: drillster/drone-email