diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index 211f97f7f..6d345686d 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -150,6 +150,7 @@ EXPOSE 9090
 COPY files/start-tmux.sh  /home/start-tmux.sh
 COPY files/entrypoint.sh  /home/entrypoint.sh
 COPY files/init.sh        /home/init.sh
+COPY files/bashrc         /home/penpot/.bashrc
 
 ENTRYPOINT ["/home/entrypoint.sh"]
 CMD ["/home/init.sh"]
diff --git a/docker/devenv/files/bashrc b/docker/devenv/files/bashrc
index 526ef9db5..8b623d902 100644
--- a/docker/devenv/files/bashrc
+++ b/docker/devenv/files/bashrc
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 export PATH=$HOME/.local/bin:/usr/local/nodejs/bin:$PATH
 
 alias l='ls --color -GFlh'
diff --git a/frontend/scripts/build.sh b/frontend/scripts/build.sh
index bfbadbcf3..11fd4341e 100755
--- a/frontend/scripts/build.sh
+++ b/frontend/scripts/build.sh
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
 source ~/.bashrc
+
 set -ex
 
 if [ -z "${TAG}" ]; then
-    export TAG=`git log -n 1 --pretty=format:%H -- ./`
+    export TAG=$(git log -n 1 --pretty=format:%H -- ./);
 fi
 
 yarn install
diff --git a/manage.sh b/manage.sh
index 870a1f39b..c29dcb5f3 100755
--- a/manage.sh
+++ b/manage.sh
@@ -63,10 +63,8 @@ function run-devenv {
 function build {
     pull-devenv-if-not-exists;
     docker volume create $DEVENV_PNAME_user_data;
-
-    echo "Running development image $IMAGE to build frontend."
     docker run -t --rm \
-           --mount source=$DEVENV_PNAME_user_data,type=volume,target=/home/penpot/ \
+           --mount source=${DEVENV_PNAME}_user_data,type=volume,target=/home/penpot/ \
            --mount source=`pwd`,type=bind,target=/home/penpot/penpot \
            -e EXTERNAL_UID=$CURRENT_USER_ID \
            -w /home/penpot/penpot/$1 \
@@ -103,15 +101,19 @@ function build-bundle {
     echo $CURRENT_GIT_TAG > ./bundle/exporter/version.txt
     echo $CURRENT_GIT_TAG > ./bundle/version.txt
 
-    pushd bundle/
-    tar -cvf ../$name.tar *;
-    popd
+    local generate_tar=${PENPOT_BUILD_GENERATE_TAR:-"true"};
 
-    xz -vez1f -T4 $name.tar
+    if [ $generate_tar == "true" ]; then
+        pushd bundle/
+        tar -cvf ../$name.tar *;
+        popd
 
-    echo "##############################################################";
-    echo "# Generated $name.tar.xz";
-    echo "##############################################################";
+        xz -vez1f -T4 $name.tar
+
+        echo "##############################################################";
+        echo "# Generated $name.tar.xz";
+        echo "##############################################################";
+    fi
 }
 
 function build-image {