diff --git a/.circleci/config.yml b/.circleci/config.yml
index cfccb532..91d9e651 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -119,6 +119,19 @@ jobs:
           name: Build
           command: RELEASE=$CIRCLE_TAG bin/build-docker.sh
 
+  build_old:
+    docker:
+      - image: 'cimg/base:stable'
+    steps:
+      - checkout
+      - node/install:
+          install-yarn: true
+          node-version: '16.13'
+      - run: node --version
+      - setup_remote_docker
+      - run:
+          name: Build
+          command: RELEASE=$CIRCLE_TAG bin/build-docker-old.sh
 
 workflows:
   version: 2
@@ -177,4 +190,14 @@ workflows:
               only: master
             tags:
               only: /^v.*/
-
+      - build_old:
+          context: traduora
+          requires:
+            - check_lint
+            - test_unit
+            - test_e2e
+          filters:
+            branches:
+              only: master
+            tags:
+              only: /^v.*/
diff --git a/bin/build-docker-old.sh b/bin/build-docker-old.sh
new file mode 100644
index 00000000..9c410a14
--- /dev/null
+++ b/bin/build-docker-old.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+DOCKER_REPO=traduora/traduora
+
+docker build -t "$DOCKER_REPO:latest" .
+
+if [[ $RELEASE != "" ]]; then
+    echo $DOCKER_PASSWORD | docker login -u $DOCKER_USER --password-stdin
+    
+    echo "Releasing docker image: $DOCKER_REPO with latest tag"
+    docker push "$DOCKER_REPO:latest"
+    
+    echo "Releasing docker image: $DOCKER_REPO with tag: $RELEASE"
+    docker tag "$DOCKER_REPO:latest" $DOCKER_REPO:$RELEASE
+    docker push "$DOCKER_REPO:$RELEASE"
+fi