diff --git a/.circleci/config.yml b/.circleci/config.yml
index 258d2167d..f81660d45 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -70,9 +70,9 @@ commands:
           name: Copy deb to artifacts directory
           command: cp bin/clementine_*.deb /tmp/artifacts/<< parameters.build >>/
       - persist_to_workspace:
-          root: /tmp/artifacts/<< parameters.build >>
+          root: /tmp/artifacts
           paths:
-            - "*"
+            - << parameters.build >>/*
       - store_artifacts:
           path: /tmp/artifacts/<< parameters.build >>
   copy_rpm_artifacts:
@@ -89,9 +89,9 @@ commands:
           name: Copy RPM to artifacts directory
           command: cp ~/rpmbuild/RPMS/*/clementine-*.rpm /tmp/artifacts/<< parameters.build >>
       - persist_to_workspace:
-          root: /tmp/artifacts/<< parameters.build >>
+          root: /tmp/artifacts
           paths:
-            - "*"
+            - << parameters.build >>/*
       - store_artifacts:
           path: /tmp/artifacts/<< parameters.build >>
   install_xenial_dependencies:
@@ -256,6 +256,44 @@ commands:
             taglib-devel
             tar
 
+  install_debian_dependencies:
+    description: Install Debian dependencies
+    steps:
+      - run:
+          name: Install Dependencies
+          command: >
+            apt-get update && apt-get install -y
+            build-essential
+            cmake
+            gettext
+            git
+            libasound2-dev
+            libboost-dev
+            libcdio-dev
+            libchromaprint-dev
+            libcrypto++-dev
+            libdbus-1-dev
+            libfftw3-dev
+            libglew1.5-dev
+            libglib2.0-dev
+            libgpod-dev
+            libgstreamer-plugins-base1.0-dev
+            libgstreamer1.0-dev
+            liblastfm-dev
+            libmtp-dev
+            libmygpo-qt-dev
+            libprotobuf-dev
+            libpulse-dev
+            libqjson-dev
+            libqt4-dev
+            libsparsehash-dev
+            libsqlite3-dev
+            libtag1-dev
+            pkg-config
+            protobuf-compiler
+            qt4-dev-tools
+            ssh
+
 jobs:
   build_disco_64:
     docker:
@@ -341,6 +379,32 @@ jobs:
       - copy_artifacts:
           build: ubuntu-xenial
 
+  build_buster_64:
+    docker:
+      - image: debian:buster
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake_debian:
+          distribution: buster
+          arch: amd64
+      - make_deb
+      - copy_artifacts:
+          build: debian-buster
+
+  build_stretch_64:
+    docker:
+      - image: debian:stretch
+    steps:
+      - install_debian_dependencies
+      - checkout
+      - cmake_debian:
+          distribution: stretch
+          arch: amd64
+      - make_deb
+      - copy_artifacts:
+          build: debian-stretch
+
   build_fedora_29_64:
     docker:
       - image: fedora:29
@@ -441,9 +505,9 @@ jobs:
           name: Copy dmg to artifacts directory
           command: cp bin/clementine*.dmg /tmp/artifacts/mac
       - persist_to_workspace:
-          root: /tmp/artifacts/mac
+          root: /tmp/artifacts
           paths:
-            - "*"
+            - mac/*
       - store_artifacts:
           path: /tmp/artifacts/mac
 
@@ -470,6 +534,7 @@ workflows:
       # - build_xenial_64
       # - build_bionic_32
       - build_bionic_64
+      - build_mac
       # - build_disco_32
       # - build_disco_64
       # - build_fedora_29_64