diff --git a/Makefile b/Makefile
index 5667b3f817ce602f6f275942d933cc2eb4ddbd59..682b5fd339124b3329e59b47182d1101ab5014d9 100644
--- a/Makefile
+++ b/Makefile
@@ -125,12 +125,13 @@ publish:
 	done
 
 #Update README.md based on the template ._README.md
-TOOLSET := `echo "$(sort $(IMAGES_TO_PUBLISH))" | sed -e "s/ /\n - /g"))`
+TOOLSET = `make all --dry-run | grep 'docker build' | cut -d ' ' -f 6 | sort -u | awk '{print "- " $$0}'`
 README_HEAD = `cat ./_README.md | sed -e '/%CONTAINERS_LIST%/Q'`
 README_TAIL = `cat ./_README.md | sed -e '1,/%CONTAINERS_LIST%/d'`
 README_FOOTER = `echo "\n\r_Last update: \`date\`_\n"`
 update_readme:
-	@echo "$(README_HEAD)  \n\n - $(TOOLSET) \n $(README_TAIL) \n$(README_FOOTER)" > README.md
+	echo $(TOOLSET)
+	@echo "$(README_HEAD)  \n\n$(TOOLSET) \n $(README_TAIL) \n$(README_FOOTER)" > README.md
 	@git add README.md
 
 delete_dangling_images:
diff --git a/README.md b/README.md
index 79f1f50748c3b0324cba3c072b35a357529437d3..4030458408d2b5865a0ccced0430bb5c8ad66c65 100644
--- a/README.md
+++ b/README.md
@@ -11,21 +11,23 @@ This file is automatically updated after execute `git commit` based on the conte
 
 ### Available tools    
 
- - its-registry.unl.edu/unl-its/docker-ci/dependency-check:latest
- - its-registry.unl.edu/unl-its/docker-ci/detect-secrets:latest
- - its-registry.unl.edu/unl-its/docker-ci/magento2-unit-test:latest
- - its-registry.unl.edu/unl-its/docker-ci/magento2-xml-lint:latest
- - its-registry.unl.edu/unl-its/docker-ci/php-lint:5.6
- - its-registry.unl.edu/unl-its/docker-ci/php-lint:7.0
- - its-registry.unl.edu/unl-its/docker-ci/php-lint:7.1
- - its-registry.unl.edu/unl-its/docker-ci/php-lint:7.2
- - its-registry.unl.edu/unl-its/docker-ci/php-lint:latest
- - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:5.6
- - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.1
- - its-registry.unl.edu/unl-its/docker-ci/secrets-detection:latest
- - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:latest
- - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php
- - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:python 
+- its-registry.unl.edu/unl-its/docker-ci/android-build-server:latest
+- its-registry.unl.edu/unl-its/docker-ci/dependency-check
+- its-registry.unl.edu/unl-its/docker-ci/detect-secrets
+- its-registry.unl.edu/unl-its/docker-ci/magento2-unit-test:latest
+- its-registry.unl.edu/unl-its/docker-ci/magento2-xml-lint:latest
+- its-registry.unl.edu/unl-its/docker-ci/php-lint:5.6
+- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.0
+- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.1
+- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.2
+- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:5.6
+- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.0
+- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.1
+- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.2
+- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:android
+- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:latest
+- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php
+- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:python 
     
 
-
_Last update: Fri May 31 16:56:10 CDT 2019_
+
_Last update: Fri May 31 17:38:15 CDT 2019_