diff --git a/tomee/README.md b/tomee/README.md
index 707b1bda2..06b43356d 100644
--- a/tomee/README.md
+++ b/tomee/README.md
@@ -24,25 +24,29 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`8-jre-7.0.9-plume`, `7.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.0/jre8/plume/Dockerfile)
--	[`8-jre-7.0.9-plus`, `7.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.0/jre8/plus/Dockerfile)
--	[`8-jre-7.0.9-webprofile`, `7.0`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.0/jre8/webprofile/Dockerfile)
--	[`8-jre-7.1.4-plume`, `7.1.4-plume`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.1/jre8/plume/Dockerfile)
--	[`8-jre-7.1.4-plus`, `7.1.4-plus`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.1/jre8/plus/Dockerfile)
--	[`8-jre-7.1.4-microprofile`, `7.1.4-microprofile`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.1/jre8/microprofile/Dockerfile)
--	[`8-jre-7.1.4-webprofile`, `7.1.4-webprofile`, `7`, `7.1`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-7.1/jre8/webprofile/Dockerfile)
--	[`8-jre-8.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre8/plume/Dockerfile)
--	[`8-jre-8.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre8/plus/Dockerfile)
--	[`8-jre-8.0.9-microprofile`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre8/microprofile/Dockerfile)
--	[`8-jre-8.0.9-webprofile`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre8/webprofile/Dockerfile)
--	[`11-jre-8.0.9-plume`, `8.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre11/plume/Dockerfile)
--	[`11-jre-8.0.9-plus`, `8.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre11/plus/Dockerfile)
--	[`11-jre-8.0.9-microprofile`, `8.0.9-microprofile`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre11/microprofile/Dockerfile)
--	[`11-jre-8.0.9-webprofile`, `8.0.9-webprofile`, `latest`, `8`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-8.0/jre11/webprofile/Dockerfile)
--	[`11-jre-9.0.0-M7-plume`, `9.0.0-M7-plume`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-9.0/jre11/plume/Dockerfile)
--	[`11-jre-9.0.0-M7-plus`, `9.0.0.M7-plus`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-9.0/jre11/plus/Dockerfile)
--	[`11-jre-9.0.0-M7-microprofile`, `9.0.0-M7-microprofile`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-9.0/jre11/microprofile/Dockerfile)
--	[`11-jre-9.0.0-M7-webprofile`, `9.0.0-M7-webprofile`, `9`](https://github.com/tomitribe/docker-tomee/blob/210f85f1442d152c4d88b0fd3fc5b225a6a494dc/TomEE-9.0/jre11/webprofile/Dockerfile)
+-	[`8-jre-7.0.9-plume`, `7.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.0/jre8/plume/Dockerfile)
+-	[`8-jre-7.0.9-plus`, `7.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.0/jre8/plus/Dockerfile)
+-	[`8-jre-7.0.9-webprofile`, `7.0`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.0/jre8/webprofile/Dockerfile)
+-	[`8-jre-7.1.4-plume`, `7.1.4-plume`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.1/jre8/plume/Dockerfile)
+-	[`8-jre-7.1.4-plus`, `7.1.4-plus`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.1/jre8/plus/Dockerfile)
+-	[`8-jre-7.1.4-microprofile`, `7.1.4-microprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.1/jre8/microprofile/Dockerfile)
+-	[`8-jre-7.1.4-webprofile`, `7.1.4-webprofile`, `7`, `7.1`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-7.1/jre8/webprofile/Dockerfile)
+-	[`8-jre-8.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre8/plume/Dockerfile)
+-	[`8-jre-8.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre8/plus/Dockerfile)
+-	[`8-jre-8.0.9-microprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre8/microprofile/Dockerfile)
+-	[`8-jre-8.0.9-webprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre8/webprofile/Dockerfile)
+-	[`11-jre-8.0.9-plume`, `8.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre11/plume/Dockerfile)
+-	[`11-jre-8.0.9-plus`, `8.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre11/plus/Dockerfile)
+-	[`11-jre-8.0.9-microprofile`, `8.0.9-microprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre11/microprofile/Dockerfile)
+-	[`11-jre-8.0.9-webprofile`, `8.0.9-webprofile`, `latest`, `8`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jre11/webprofile/Dockerfile)
+-	[`11-jre-9.0.0-M7-plume`, `9.0.0-M7-plume`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-9.0/jre11/plume/Dockerfile)
+-	[`11-jre-9.0.0-M7-plus`, `9.0.0.M7-plus`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-9.0/jre11/plus/Dockerfile)
+-	[`11-jre-9.0.0-M7-microprofile`, `9.0.0-M7-microprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-9.0/jre11/microprofile/Dockerfile)
+-	[`11-jre-9.0.0-M7-webprofile`, `9.0.0-M7-webprofile`, `9`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-9.0/jre11/webprofile/Dockerfile)
+-	[`17-jdk-8.0.9-plume`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jdk17/plume/Dockerfile)
+-	[`17-jdk-8.0.9-plus`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jdk17/plus/Dockerfile)
+-	[`17-jdk-8.0.9-microprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jdk17/microprofile/Dockerfile)
+-	[`17-jdk-8.0.9-webprofile`](https://github.com/tomitribe/docker-tomee/blob/928565e89b2be78f6a0a3de4dbab5509ed95b526/TomEE-8.0/jdk17/webprofile/Dockerfile)
 
 # Quick reference (cont.)
 
@@ -50,7 +54,7 @@ WARNING:
 	[https://github.com/tomitribe/docker-tomee/issues](https://github.com/tomitribe/docker-tomee/issues)
 
 -	**Supported architectures**: ([more info](https://github.com/docker-library/official-images#architectures-other-than-amd64))  
-	[`amd64`](https://hub.docker.com/r/amd64/tomee/)
+	[`amd64`](https://hub.docker.com/r/amd64/tomee/), [`arm64v8`](https://hub.docker.com/r/arm64v8/tomee/)
 
 -	**Published image artifact details**:  
 	[repo-info repo's `repos/tomee/` directory](https://github.com/docker-library/repo-info/blob/master/repos/tomee) ([history](https://github.com/docker-library/repo-info/commits/master/repos/tomee))