diff --git a/.gitignore b/.gitignore
index 5e1d668b8d..6a417ac2b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,4 @@ dev/tool/history.json
 .aider*
 /combined_dependencies
 .tmp
+ws-tests/docker-compose.override.yml
diff --git a/ws-tests/create-version-override.sh b/ws-tests/create-version-override.sh
index 6319fd91ad..8def7ea240 100755
--- a/ws-tests/create-version-override.sh
+++ b/ws-tests/create-version-override.sh
@@ -28,13 +28,20 @@ grep -B 1 "image: hardcoreeng/" $COMPOSE_FILE | grep -v "\-\-" | grep -v "image:
         pod_name=$(echo $image | sed 's/hardcoreeng\///')
         
         echo "    image: hardcoreeng/$pod_name:$VERSION" >> $OVERRIDE_FILE
+        echo "    pull_policy: always" >> $OVERRIDE_FILE
         if [ "$pod_name" == "account" ]; then
           echo "    environment:" >> $OVERRIDE_FILE
           echo "      - REGION_INFO=|;europe|Europe" >> $OVERRIDE_FILE
         fi
+        if [ "$pod_name" == "workspace" ]; then
+          echo "    environment:" >> $OVERRIDE_FILE
+          echo "      - INIT_WORKSPACE=huly" >> $OVERRIDE_FILE 
+        fi
     fi
 done
 
+./fetch-tool-bundle.sh
+
 echo "Created $OVERRIDE_FILE with fixed version $VERSION for all hardcoreeng services"
 echo "To use it, run: prepare.sh"