diff --git a/docker/build.sh b/docker/build.sh
index 58aa769b..6a53d919 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -17,8 +17,8 @@ while getopts ":e:h-:" opt; do
   case $opt in
     e)
       ENVIRONMENT="$OPTARG"
-      if [ "$ENVIRONMENT" != "qa" ] && [ "$ENVIRONMENT" != "thunder" ]; then
-        echo "Invalid Environment '$ENVIRONMENT'. Only 'qa' and 'thunder' envrionments are allowed at the moment"
+      if [ "$ENVIRONMENT" != "qa" ] && [ "$ENVIRONMENT" != "thunder" ] && [ "$ENVIRONMENT" != "mainnet" ]; then
+        echo "Invalid Environment '$ENVIRONMENT'. Only 'qa', 'thunder' and 'mainnet' envrionments are allowed at the moment"
         exit 1
       fi
       ;;
diff --git a/docker/firechain_builder.Dockerfile b/docker/firechain_builder.Dockerfile
index 4468ddc9..ae4662ae 100644
--- a/docker/firechain_builder.Dockerfile
+++ b/docker/firechain_builder.Dockerfile
@@ -22,12 +22,6 @@ COPY --from=builder /5ire/target/release/firechain-node /5ire/firechain-node
 
 COPY --from=builder /5ire/specs/5ire-${environment}-specRaw.json /5ire/specs/5ire-${environment}-specRaw.json
 
-RUN set -eux; \
-    apt-get update; \
-    apt-get install -y --no-install-recommends curl git openssh-client; \
-    apt-get clean; \
-    rm -rf /var/lib/apt/lists/*
-
 RUN ldd /5ire/firechain-node
 RUN /5ire/firechain-node --version
 
diff --git a/docker/run.sh b/docker/run.sh
index c6e0aa96..1d0d090c 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -52,8 +52,8 @@ while [[ $# -gt 0 ]]; do
       ;;
     -e)
       environment="$2"
-      if [ "$environment" != "qa" ] && [ "$environment" != "thunder" ]; then
-        echo "Invalid Environment '$environment'. Only 'qa' and 'thunder' envrionments are allowed at the moment"
+      if [ "$environment" != "qa" ] && [ "$environment" != "thunder" ] && [ "$environment" != "mainnet" ]; then
+        echo "Invalid Environment '$environment'. Only 'qa', 'thunder' and 'mainnet' envrionments are allowed at the moment"
         exit 1
       fi
       shift 2
diff --git a/docker/upload.sh b/docker/upload.sh
index 2ce67a28..9e53f506 100755
--- a/docker/upload.sh
+++ b/docker/upload.sh
@@ -23,8 +23,8 @@ while [[ $# -gt 0 ]]; do
   case $1 in
     -e)
       environment="$2"
-      if [ "$environment" != "qa" ] && [ "$environment" != "thunder" ]; then
-        echo "Invalid Environment '$environment'. Only 'qa' and 'thunder' envrionments are allowed at the moment"
+      if [ "$environment" != "qa" ] && [ "$environment" != "thunder" ] && [ "$environment" != "mainnet" ]; then
+        echo "Invalid Environment '$environment'. Only 'qa', 'thunder' and 'mainnet' envrionments are allowed at the moment"
         exit 1
       fi
       shift 2