diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4570ba8fc..4a028afa8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -23,6 +23,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: x86_64
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -44,7 +45,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -69,8 +70,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -85,6 +86,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: x86
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -106,7 +108,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -129,8 +131,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -145,6 +147,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: rpi3
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -166,7 +169,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -189,8 +192,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -205,6 +208,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: rpi4
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -226,7 +230,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -249,8 +253,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -265,6 +269,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: rpi2
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -286,7 +291,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -309,8 +314,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -325,6 +330,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: bpi-r2
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -346,7 +352,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -372,8 +378,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -388,6 +394,7 @@ jobs:
     environment:
       - OMR_VERSION: $CIRCLE_TAG
       - OMR_TARGET: wrt3200acm
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -409,7 +416,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -432,8 +439,8 @@ jobs:
       - run:
           name: Deploy
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/$OMR_TARGET
+            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
             rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin
 
       - save_cache:
@@ -447,6 +454,7 @@ jobs:
 
     environment:
       - OMR_VERSION: $CIRCLE_TAG
+      - OMR_DEST: ${CIRCLE_BRANCH:-release}
 
     working_directory: ~/
 
@@ -468,7 +476,7 @@ jobs:
           command: |
             git clone https://github.com/ysurac/openmptcprouter || true
             cd openmptcprouter
-            git checkout ${CIRCLE_BRANCH} || true
+            git checkout ${CIRCLE_BRANCH:-$CIRCLE_TAG} || true
             git pull || true
             export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}"
             export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL"
@@ -492,8 +500,8 @@ jobs:
       - run:
           name: Deploy wrt3200acm
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/wrt3200acm
+            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
             rm -rf ~/openmptcprouter/wrt3200acm/source/bin
 
       - save_cache:
@@ -524,8 +532,8 @@ jobs:
       - run:
           name: Deploy wrt32x
           command: |
-            ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/${CIRCLE_BRANCH}/${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}/${OMR_KERNEL:-4.14}/wrt32x
+            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
 
 workflows:
   version: 2