diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3041bf34f..92821b9b1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,14 +44,14 @@ jobs:
       - run:
           name: Build
           no_output_timeout: 30m
-          command: make -C ~/openmptcprouter/source/$OMR_TARGET package/{compile,install,index} target/install -j2
+          command: make -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/install -j2
 
       - run:
           name: Deploy
           command: |
             ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
             rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/$OMR_TARGET
-            rm -rf ~/openmptcprouter/source/bin
+            rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
           key: cache-{{ checksum "/tmp/cache-version" }}
@@ -101,14 +101,14 @@ jobs:
       - run:
           name: Build
           no_output_timeout: 30m
-          command: make -C ~/openmptcprouter/source/$OMR_TARGET package/{compile,install,index} target/install -j2
+          command: make -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/install -j2
 
       - run:
           name: Deploy
           command: |
             ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release
             rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/$OMR_TARGET
-            rm -rf ~/openmptcprouter/source/bin
+            rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
           key: cache-{{ checksum "/tmp/cache-version" }}