diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a028afa8..b85d927c4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,7 +23,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: x86_64
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -70,8 +69,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -86,7 +85,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: x86
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -131,8 +129,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -147,7 +145,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: rpi3
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -192,8 +189,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -208,7 +205,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: rpi4
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -253,8 +249,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -269,7 +265,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: rpi2
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -314,8 +309,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -330,7 +325,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: bpi-r2
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -378,8 +372,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -394,7 +388,6 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: wrt3200acm
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -439,8 +432,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -454,7 +447,6 @@ jobs:
 
     environment:
       - OMR_VERSION: $CIRCLE_TAG
-      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -500,8 +492,8 @@ jobs:
       - run:
           name: Deploy wrt3200acm
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/wrt3200acm/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/wrt3200acm
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/wrt3200acm/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/wrt3200acm
             rm -rf ~/openmptcprouter/wrt3200acm/source/bin
 
       - save_cache:
@@ -532,8 +524,8 @@ jobs:
       - run:
           name: Deploy wrt32x
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/$OMR_TARGET
-            rsync -av --delete-after ~/openmptcprouter/wrt32x/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${OMR_DEST}/${OMR_KERNEL:-4.14}/wrt32x
+            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            rsync -av --delete-after ~/openmptcprouter/wrt32x/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/${CIRCLE_BRANCH:-release}/${OMR_KERNEL:-4.14}/wrt32x
 
 workflows:
   version: 2