diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9b560706a..8842dcf5b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,6 +226,54 @@ commands:
             qttools5-dev
             ssh
 
+  install_eoan_dependencies:
+    description: Install Eoan dependencies
+    steps:
+      - run:
+          name: Setup ENV
+          command: |
+            echo 'export DEBIAN_FRONTEND=noninteractive' >> $BASH_ENV
+            source $BASH_ENV
+      - run:
+          name: Install Dependencies
+          command: >
+            apt-get update && apt-get install -y
+            cmake
+            fakeroot
+            gettext
+            git
+            libasound2-dev
+            libboost-dev
+            libboost-serialization-dev
+            libcdio-cdda2
+            libcdio-dev
+            libchromaprint-dev
+            libcrypto++-dev
+            libdbus-1-dev
+            libfftw3-dev
+            libglew1.5-dev
+            libgpod-dev
+            libgstreamer-plugins-base1.0-dev
+            libgstreamer1.0-dev
+            liblastfm5-dev
+            libmtp-dev
+            libmygpo-qt-dev
+            libplist-dev
+            libprotobuf-dev
+            libpulse-dev
+            libqca-qt5-2-dev
+            libqca-qt5-2-plugins
+            libqt5x11extras5-dev
+            libsparsehash-dev
+            libsqlite3-dev
+            libtag1-dev
+            libusbmuxd-dev
+            protobuf-compiler
+            qtbase5-dev
+            qttools5-dev-tools
+            qttools5-dev
+            ssh
+
   install_fedora_dependencies:
     description: Install Fedora Dependencies
     steps:
@@ -394,6 +442,32 @@ jobs:
       - copy_artifacts:
           build: ubuntu-xenial
 
+  build_eoan_64:
+    docker:
+      - image: ubuntu:eoan
+    steps:
+      - install_eoan_dependencies
+      - checkout
+      - cmake_debian:
+          distribution: eoan
+          arch: amd64
+      - make_deb
+      - copy_artifacts:
+          build: ubuntu-eoan
+
+  build_eoan_32:
+    docker:
+      - image: i386/ubuntu:eoan
+    steps:
+      - install_eoan_dependencies
+      - checkout
+      - cmake_debian:
+          distribution: eoan
+          arch: i386
+      - make_deb
+      - copy_artifacts:
+          build: ubuntu-eoan
+
   build_buster_64:
     docker:
       - image: debian:buster
@@ -548,6 +622,8 @@ workflows:
   version: 2
   build_all:
     jobs:
+      - build_eoan_64
+      - build_eoan_32
       - build_disco_64
       - build_disco_32
       - build_bionic_64
@@ -563,6 +639,8 @@ workflows:
       - upload_artifacts:
           context: gcp
           requires:
+            - build_eoan_64
+            - build_eoan_32
             - build_disco_64
             - build_disco_32
             - build_bionic_64