diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2844df24f..6f0fdde79 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ jobs:
             sudo rm -rf /var/lib/apt/lists/lock
             sudo apt-get update
             sudo rm -rf /var/lib/apt/lists/lock
-            sudo apt-get install -yq build-essential git unzip ncurses-dev libz-dev libssl-dev python subversion gettext gawk wget curl rsync perl libelf-dev swig
+            sudo apt-get install -yq build-essential git unzip ncurses-dev libz-dev libssl-dev python subversion gettext gawk wget curl rsync perl libelf-dev
 
   build_x86_64:
     machine: true
@@ -343,7 +343,9 @@ jobs:
       - run:
           name: Build
           no_output_timeout: 30m
-          command: make IGNORE_ERRORS=m -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/compile -j2 package/compile -j2 target/install -j2
+          command: |
+            sudo apt-get -yq install swig swig2.0
+            make IGNORE_ERRORS=m -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/compile -j2 package/compile -j2 target/install -j2
 
       - run:
           name: Deploy
@@ -508,6 +510,9 @@ workflows:
       - build_x86:
           requires:
             - prepare
+      - build_rpi4:
+          requires:
+            - prepare
       - build_rpi3:
           requires:
             - prepare