diff --git a/scripts/.env b/scripts/.env
index 32887ff..b2213c6 100755
--- a/scripts/.env
+++ b/scripts/.env
@@ -1,3 +1,4 @@
 BEE_VERSION="0.5.3"
+BLOCKCHAIN_VERSION="1.0.0"
 BEE_ENV_PREFIX="swarm-test"
 BEE_IMAGE_PREFIX=ethersphere
diff --git a/scripts/bee-cleanup.sh b/scripts/bee-cleanup.sh
index 30d6070..2b865bf 100755
--- a/scripts/bee-cleanup.sh
+++ b/scripts/bee-cleanup.sh
@@ -13,7 +13,7 @@ do
   sudo rm -rf "$BEE_DIR_PATH/statestore"
 done
 
-echo "Removing built Docker images..."
+echo "Removing built Bee Docker images..."
 
 BEE_ENV_PREFIX=$("$MY_PATH/utils/env-variable-value.sh" BEE_ENV_PREFIX)
 BEE_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BEE_VERSION)
@@ -23,4 +23,11 @@ for DOCKER_IMAGE in $DOCKER_IMAGES
 do
   echo "$DOCKER_IMAGE"
   docker image rm "$DOCKER_IMAGE"
-done
\ No newline at end of file
+done
+
+echo "Removing built Blockchain Docker image..."
+BLOCKCHAIN_DOCKER_IMAGE=$(docker image ls -qaf reference="$BEE_IMAGE_PREFIX/$BEE_ENV_PREFIX-blockchain:$BLOCKCHAIN_VERSION")
+
+if [ -n "$BLOCKCHAIN_DOCKER_IMAGE" ] ; then
+  docker image rm "$BLOCKCHAIN_DOCKER_IMAGE"
+fi
diff --git a/scripts/bee-docker-build.sh b/scripts/bee-docker-build.sh
index 645b344..466aadb 100755
--- a/scripts/bee-docker-build.sh
+++ b/scripts/bee-docker-build.sh
@@ -17,7 +17,7 @@ dockerbuild() {
 
 MY_PATH=$(dirname "$0")
 MY_PATH=$( cd "$MY_PATH" && pwd )
-BEE_DIRS=$(ls "$MY_PATH/bee-data-dirs")
+BEE_DIRS=$(ls -d "$MY_PATH"/bee-data-dirs/*/)
 BEE_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BEE_VERSION)
 BEE_IMAGE_PREFIX=$("$MY_PATH/utils/env-variable-value.sh" BEE_IMAGE_PREFIX)
 
@@ -33,7 +33,7 @@ echo "Build Dockerfiles"
 for BEE_DIR in $BEE_DIRS
 do
   echo "$BEE_DIR"
-  dockerbuild "$MY_PATH/bee-data-dirs/$BEE_DIR" "$MY_PATH/bee-data-dirs/Dockerfile" "$BEE_VERSION" "$BEE_IMAGE_PREFIX"
+  dockerbuild "$BEE_DIR" "$MY_PATH/bee-data-dirs/Dockerfile" "$BEE_VERSION" "$BEE_IMAGE_PREFIX"
 done
 
 echo "Docker image builds were successful!"
diff --git a/scripts/blockchain-docker-build.sh b/scripts/blockchain-docker-build.sh
index fa2b7a7..9e924df 100755
--- a/scripts/blockchain-docker-build.sh
+++ b/scripts/blockchain-docker-build.sh
@@ -4,9 +4,13 @@ MY_PATH=$( cd "$MY_PATH" && pwd )
 # Check used system variable set
 BEE_ENV_PREFIX=$("$MY_PATH/utils/env-variable-value.sh" BEE_ENV_PREFIX)
 BEE_IMAGE_PREFIX=$("$MY_PATH/utils/env-variable-value.sh" BEE_IMAGE_PREFIX)
-BEE_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BEE_VERSION)
+BLOCKCHAIN_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BLOCKCHAIN_VERSION)
 
 NAME="$BEE_ENV_PREFIX-blockchain"
 
 echo "Make a snapshot from the blockchain..."
-docker commit $NAME $BEE_IMAGE_PREFIX/$NAME:$BEE_VERSION
+docker commit $NAME $BEE_IMAGE_PREFIX/$NAME:$BLOCKCHAIN_VERSION
+
+echo "Stop and remove running blockchain node that the image built on..."
+docker container stop $NAME
+docker container rm $NAME
diff --git a/scripts/blockchain.sh b/scripts/blockchain.sh
index 408ba15..d4314ae 100755
--- a/scripts/blockchain.sh
+++ b/scripts/blockchain.sh
@@ -20,4 +20,4 @@ if [ -z "$CONTAINER_IN_DOCKER" ]; then
       --db swarm-testchain --gasLimit 6721975
 else
   docker start $NAME
-fi
\ No newline at end of file
+fi
diff --git a/scripts/environment.sh b/scripts/environment.sh
index 279caaf..81d4724 100755
--- a/scripts/environment.sh
+++ b/scripts/environment.sh
@@ -30,7 +30,7 @@ MY_PATH=$( cd "$MY_PATH" && pwd )  # absolutized and normalized
 # Check used system variable set
 BEE_ENV_PREFIX=$("$MY_PATH/utils/env-variable-value.sh" BEE_ENV_PREFIX)
 BEE_IMAGE_PREFIX=$("$MY_PATH/utils/env-variable-value.sh" BEE_IMAGE_PREFIX)
-BEE_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BEE_VERSION)
+BLOCKCHAIN_VERSION=$("$MY_PATH/utils/env-variable-value.sh" BLOCKCHAIN_VERSION)
 
 # Init variables
 EPHEMERAL=false
@@ -88,7 +88,7 @@ if [ -z "$BLOCKCHAIN_CONTAINER" ] ; then
     if $EPHEMERAL ; then
         BLOCKCHAIN_ARGUMENTS="$BLOCKCHAIN_ARGUMENTS --rm"
     fi
-    docker run $BLOCKCHAIN_ARGUMENTS $BEE_IMAGE_PREFIX/$SWARM_BLOCKCHAIN_NAME:$BEE_VERSION
+    docker run $BLOCKCHAIN_ARGUMENTS $BEE_IMAGE_PREFIX/$SWARM_BLOCKCHAIN_NAME:$BLOCKCHAIN_VERSION
 else
     docker start $BLOCKCHAIN_CONTAINER
 fi