diff --git a/e2e-test/qa/search/backup/Makefile b/e2e-test/qa/search/backup/Makefile
index 82f93b157..16a5472df 100644
--- a/e2e-test/qa/search/backup/Makefile
+++ b/e2e-test/qa/search/backup/Makefile
@@ -13,7 +13,7 @@ ifeq ($(dc-backup),)
 	dc-backup:=$(dc) -f ../docker-compose.yml -f docker-compose.backup.yml
 endif
 
-backup-prepare: ## 1 - prepare backup for testing
+backup-prepare: clean ## 1 - prepare backup for testing
 	@echo "Starting Backup Prepare" && \
 	$(sudo) rm -rf $(HOST_BACKUP_LOCATION) && \
 	mkdir -p $(HOST_BACKUP_LOCATION)/alf_data && \
@@ -27,12 +27,12 @@ backup-perform: ## 2 - perform the backup	of alf_data and db data
 	@echo "Starting Backup Perform" && \
 	$(sudo) rm -rf $(HOST_BACKUP_LOCATION)_$(SUFIX) && \
 	$(sudo) chmod -R 777 $(HOST_BACKUP_LOCATION) && \
-	docker-compose stop alfresco && \
+	$(dc-backup) stop alfresco && \
 	$(dc-backup) exec postgres bash -c 'pg_dump --dbname=postgresql://alfresco:alfresco@127.0.0.1:5432/alfresco' > $(HOST_BACKUP_LOCATION)/db/alfresco.pg && \
 	cp -R $(HOST_BACKUP_LOCATION) $(HOST_BACKUP_LOCATION)_$(SUFIX) && \
-	docker-compose start alfresco
+	$(dc-backup) start alfresco
 
-backup-restore: ## 3 - start restoring from backup location
+backup-restore: clean ## 3 - start restoring from backup location
 	@echo "Starting Backup Restore" && \
 	$(sudo) rm -rf $(HOST_BACKUP_LOCATION) && \
 	mkdir -p $(HOST_BACKUP_LOCATION) && \
@@ -40,6 +40,7 @@ backup-restore: ## 3 - start restoring from backup location
 	cp -rf $(HOST_BACKUP_LOCATION)_$(SUFIX)/db/ $(HOST_BACKUP_LOCATION)/db/ && \
 	cp -rf $(HOST_BACKUP_LOCATION)_$(SUFIX)/solr $(HOST_BACKUP_LOCATION)/solr && \
 	$(sudo) chmod -R 777 $(HOST_BACKUP_LOCATION) && \
+	$(dc-backup) up -d postgres && sleep 30 && \
 	$(dc-backup) exec postgres bash -c 'psql --dbname=postgresql://alfresco:alfresco@127.0.0.1:5432/alfresco < /backup/db/alfresco.pg' && \
 	$(dc-backup) up -d
 
@@ -47,13 +48,13 @@ all: show-config ## 0 - executes the entire backup process
 	# perform the backup and waits until the server is starting
 	# do some change on backed up data
 	# then restore from backup and check the content is restored as expected
-	make clean backup-prepare wait && \
+	make backup-prepare wait && \
 	make run-mvn-tests suiteXmlFile=./src/test/resources/search-pre-backup-suite.xml
 	
 	make backup-perform wait && \
 	make run-mvn-tests suiteXmlFile=./src/test/resources/search-on-backup-suite.xml
 	
-	make clean backup-restore wait && \
+	make backup-restore wait && \
 	make run-mvn-tests suiteXmlFile=./src/test/resources/search-post-backup-suite.xml
 
 show-config: ## show compose configuration
diff --git a/e2e-test/qa/search/backup/README.md b/e2e-test/qa/search/backup/README.md
index 4ca159a4c..2f1679ccc 100644
--- a/e2e-test/qa/search/backup/README.md
+++ b/e2e-test/qa/search/backup/README.md
@@ -4,6 +4,8 @@ Testing the Backup of SearchService product
 
 **Build Plan:** https://bamboo.alfresco.com/bamboo/browse/SAD-QAB
 
+![](docs/backup.png?raw=true)
+
 # Steps
 
 * **a)** prepare the backup
diff --git a/e2e-test/qa/search/backup/docs/backup.png b/e2e-test/qa/search/backup/docs/backup.png
new file mode 100644
index 000000000..2bec6377f
Binary files /dev/null and b/e2e-test/qa/search/backup/docs/backup.png differ
diff --git a/e2e-test/qa/search/upgrade/README.md b/e2e-test/qa/search/upgrade/README.md
index d741a8592..fae181d47 100644
--- a/e2e-test/qa/search/upgrade/README.md
+++ b/e2e-test/qa/search/upgrade/README.md
@@ -4,6 +4,8 @@ Testing the Upgrade of SearchService product
 
 **Build Plan:** https://bamboo.alfresco.com/bamboo/browse/SAD-QAUP
 
+![](docs/upgrade.png?raw=true)
+
 # Steps
 
 * **a)** start the initial version
diff --git a/e2e-test/qa/search/upgrade/docs/upgrade.png b/e2e-test/qa/search/upgrade/docs/upgrade.png
new file mode 100644
index 000000000..3d36c9e54
Binary files /dev/null and b/e2e-test/qa/search/upgrade/docs/upgrade.png differ