diff --git a/build_containers.sh b/build_containers.sh
index acdb9e50c..dca9a4d0d 100755
--- a/build_containers.sh
+++ b/build_containers.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
 
+set -eu -o pipefail
 
-set -euox pipefail
+BUILD_ALL=${BUILD_ALL:=0}
+BUILD_NUMBER=${BUILD_NUMBER:=1}
+TAG=${TAG:-test}
 
 # Get an unique venv folder to using *inside* workspace
-VENV=".venv-$BUILD_NUMBER"
+VENV=".venv-${BUILD_NUMBER}"
 
 # Initialize new venv
-python3 -m venv "$VENV"
+python3 -m venv "${VENV}"
 
 # Update pip
-source "$VENV/bin/activate"
+source "${VENV}/bin/activate"
 
 pip3 install pipenv
 pipenv install --dev --deploy
@@ -19,32 +22,42 @@ AWS_ACCOUNT_ID="$(aws sts get-caller-identity  --output=text --query "Account")"
 
 FULL_VERSION_NUMBER="$(python3 setup.py --version)"
 
-VERSION_NUMBER=$(echo $FULL_VERSION_NUMBER| cut -d '+' -f 1)
+VERSION_NUMBER=$(echo "${FULL_VERSION_NUMBER}" | cut -d '+' -f 1)
 
 eval "$(aws ecr get-login --no-include-email --region us-east-1)"
 
 python3 setup.py build
 
 docker build -t concordia .
-docker tag concordia:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${VERSION_NUMBER}
-docker tag concordia:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${TAG}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${VERSION_NUMBER}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${TAG}
-
-docker build -t concordia/importer --file importer/Dockerfile .
-docker tag concordia/importer:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${VERSION_NUMBER}
-docker tag concordia/importer:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${TAG}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${VERSION_NUMBER}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${TAG}
-
-docker build -t concordia/celerybeat --file celerybeat/Dockerfile .
-docker tag concordia/celerybeat:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${VERSION_NUMBER}
-docker tag concordia/celerybeat:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${TAG}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${VERSION_NUMBER}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${TAG}
-
-docker pull rabbitmq:latest
-docker tag rabbitmq:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${VERSION_NUMBER}
-docker tag rabbitmq:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${TAG}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${VERSION_NUMBER}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${TAG}
\ No newline at end of file
+docker tag concordia:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${VERSION_NUMBER}"
+docker tag concordia:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${TAG}"
+docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${VERSION_NUMBER}"
+docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia:${TAG}"
+
+if [ $BUILD_ALL -eq 1 ]; then
+
+    docker build -t concordia/importer --file importer/Dockerfile .
+    docker tag concordia/importer:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${VERSION_NUMBER}"
+    docker tag concordia/importer:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${TAG}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${VERSION_NUMBER}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/importer:${TAG}"
+
+    docker build -t concordia/celerybeat --file celerybeat/Dockerfile .
+    docker tag concordia/celerybeat:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${VERSION_NUMBER}"
+    docker tag concordia/celerybeat:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${TAG}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${VERSION_NUMBER}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/celerybeat:${TAG}"
+
+    docker pull rabbitmq:latest
+    docker tag rabbitmq:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${VERSION_NUMBER}"
+    docker tag rabbitmq:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${TAG}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${VERSION_NUMBER}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/rabbitmq:${TAG}"
+
+    docker build -t concordia/indexer --file indexer/Dockerfile .
+    docker tag concordia/indexer:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${VERSION_NUMBER}"
+    docker tag concordia/indexer:latest "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${TAG}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${VERSION_NUMBER}"
+    docker push "${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${TAG}"
+
+fi
diff --git a/build_indexer.sh b/build_indexer.sh
deleted file mode 100755
index 46b3c8596..000000000
--- a/build_indexer.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-set -euox pipefail
-
-# Get an unique venv folder to using *inside* workspace
-VENV=".venv-$BUILD_NUMBER"
-
-# Initialize new venv
-python3 -m venv "$VENV"
-
-# Update pip
-source "$VENV/bin/activate"
-
-pip3 install pipenv
-pipenv install --dev --deploy
-
-AWS_ACCOUNT_ID="$(aws sts get-caller-identity  --output=text --query "Account")"
-
-FULL_VERSION_NUMBER="$(python3 setup.py --version)"
-
-VERSION_NUMBER=$(echo $FULL_VERSION_NUMBER| cut -d '+' -f 1)
-
-eval "$(aws ecr get-login --no-include-email --region us-east-1)"
-
-python3 setup.py build
-
-docker build -t concordia/indexer --file indexer/Dockerfile .
-docker tag concordia/indexer:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${VERSION_NUMBER}
-docker tag concordia/indexer:latest ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${TAG}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${VERSION_NUMBER}
-docker push ${AWS_ACCOUNT_ID}.dkr.ecr.us-east-1.amazonaws.com/concordia/indexer:${TAG}