diff --git a/manage.sh b/manage.sh
index 916be8098..eae0538fd 100755
--- a/manage.sh
+++ b/manage.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -ex
 
 export ORGANIZATION="penpotapp";
 export DEVENV_IMGNAME="$ORGANIZATION/devenv";
@@ -11,6 +10,8 @@ export CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
 export CURRENT_HASH=$(git rev-parse --short HEAD);
 export CURRENT_COMMITS=$(git rev-list --count HEAD)
 
+set -ex
+
 function print-current-version {
     echo -n "$CURRENT_VERSION-$CURRENT_COMMITS-g$CURRENT_HASH"
 }
@@ -179,8 +180,8 @@ function build-docker-images {
 
     pushd ./docker/images;
 
-    docker build -t penpotapp/backend:$CURRENT_BRANCH -f Dockerfile.backend .;
     docker build -t penpotapp/frontend:$CURRENT_BRANCH -f Dockerfile.frontend .;
+    docker build -t penpotapp/backend:$CURRENT_BRANCH -f Dockerfile.backend .;
     docker build -t penpotapp/exporter:$CURRENT_BRANCH -f Dockerfile.exporter .;
 
     popd;