diff --git a/Applications/ocp-reliability/Dockerfile b/Applications/ocp-reliability/Dockerfile
index 854ea5fd..ba453651 100644
--- a/Applications/ocp-reliability/Dockerfile
+++ b/Applications/ocp-reliability/Dockerfile
@@ -1,11 +1,12 @@
 FROM quay.io/startx/runner-oc:latest
 
 ENV SX_VERSION="latest" \
-    SX_TYPE="runner" \
+    SX_TYPE="application" \
     SX_SERVICE="ocp-reliability" \
     SX_ID="startx/ocp-reliability" \
     SX_NAME="Startx OCP Reliability" \
     SX_SUMMARY="Startx ocp-reliability based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_OC_VERSION="4.10.12"
 
 LABEL name="$SX_ID" \
@@ -13,11 +14,25 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing ocp-reliability test again't an openshift cluster." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,openshift,kubernetes,reliability" \
     io.openshift.min-memory="128Mi" \
     io.openshift.min-cpu="100m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,openshift,kubernetes,reliability' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Application/ocp-reliability/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/app-ocp-reliability.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/ocp-reliability,docker.io/startx/app-ocp-reliability'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing ocp-reliability test again't an openshift cluster." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Application/ocp-reliability/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Application/ocp-reliability" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 RUN dnf install -yq --nogpgcheck jq && \
diff --git a/Applications/phpmyadmin/Dockerfile b/Applications/phpmyadmin/Dockerfile
index aa7ab31f..1654e3ee 100644
--- a/Applications/phpmyadmin/Dockerfile
+++ b/Applications/phpmyadmin/Dockerfile
@@ -6,14 +6,15 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/app-phpmyadmin" \
     SX_NAME="Startx PhpMyAdmin service image (fedora rawhide)" \
     SX_SUMMARY="Startx phpmyadmin service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     MYSQL_LANG=fr_FR
 
 LABEL name="$SX_ID" \
     summary="$SX_SUMMARY" \
     description="$SX_SUMMARY. Use for executing phpmyadmin database web-console or as container mainstream image for your dynamic web application containers." \
     version="$SX_VERSION" \
-    release="1" \
-    maintainer="Startx <dev@startx.fr>" \
+    release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,apache,httpd,php,phpmyadmin,mysql,mariadb" \
@@ -22,7 +23,19 @@ LABEL name="$SX_ID" \
     io.openshift.min-memory="128Mi" \
     io.openshift.min-cpu="200m" \
     io.openshift.expose-services="8080:http" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,apache,httpd,php,phpmyadmin,mysql,mariadb' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Application/phpmyadmin/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/app-phpmyadmin.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/phpmyadmin,docker.io/startx/app-phpmyadmin'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing phpmyadmin database web-console or as container mainstream image for your dynamic web application containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Application/phpmyadmin/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Application/phpmyadmin" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/GitlabRunner/ansible/Dockerfile b/GitlabRunner/ansible/Dockerfile
index faa09094..35477120 100644
--- a/GitlabRunner/ansible/Dockerfile
+++ b/GitlabRunner/ansible/Dockerfile
@@ -7,6 +7,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/runner-ansible" \
     SX_NAME="Startx Ansible gitlab runner image (fedora rawhide)" \
     SX_SUMMARY="Startx ansible gitlab runner based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_HUGO_RELEASE="0.83.1"
 
 LABEL name="$SX_ID" \
@@ -14,11 +15,25 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for building ansible playbooks based on fedora and using gitlab CI runners." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,runner,ansible,automation" \
     io.openshift.min-memory="128Mi" \
     io.openshift.min-cpu="200m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,runner,ansible,automation' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/GitlabRunner/ansible/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/runner-ansible.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/runner-ansible,docker.io/startx/runner-ansible'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for building ansible playbooks based on fedora and using gitlab CI runners." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/GitlabRunner/ansible/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/GitlabRunner/ansible" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/GitlabRunner/apache/Dockerfile b/GitlabRunner/apache/Dockerfile
index 3362d90f..c226649d 100644
--- a/GitlabRunner/apache/Dockerfile
+++ b/GitlabRunner/apache/Dockerfile
@@ -7,18 +7,33 @@ ENV SX_VERSION="latest" \
     SX_UNAME="user" \
     SX_ID="startx/runner-apache" \
     SX_NAME="Startx Apache gitlab runner image (fedora rawhide)" \
-    SX_SUMMARY="Startx apache gitlab runner based on fedora rawhide"
+    SX_SUMMARY="Startx apache gitlab runner based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr"
 
 LABEL name="$SX_ID" \
     summary="$SX_SUMMARY" \
     description="$SX_SUMMARY. Use for building application based on http using gitlab CI runners." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,runner,apache,httpd" \
     io.openshift.min-memory="128Mi" \
     io.openshift.min-cpu="100m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,runner,apache,httpd' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/GitlabRunner/apache/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/runner-apache.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/runner-apache,docker.io/startx/runner-apache'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for building application based on http using gitlab CI runners." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/GitlabRunner/apache/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/GitlabRunner/apache" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/GitlabRunner/bash/Dockerfile b/GitlabRunner/bash/Dockerfile
index 37159cb7..a9f0fbdb 100644
--- a/GitlabRunner/bash/Dockerfile
+++ b/GitlabRunner/bash/Dockerfile
@@ -7,18 +7,33 @@ ENV SX_VERSION="latest" \
     SX_UNAME="user" \
     SX_ID="startx/runner-bash" \
     SX_NAME="Startx Bash gitlab runner image (fedora rawhide)" \
-    SX_SUMMARY="Startx bash gitlab runner based on fedora rawhide"
+    SX_SUMMARY="Startx bash gitlab runner based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr"
 
 LABEL name="$SX_ID" \
     summary="$SX_SUMMARY" \
     description="$SX_SUMMARY. Use for building application based on bash using gitlab CI runners." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,runner,bash" \
     io.openshift.min-memory="32Mi" \
     io.openshift.min-cpu="50m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,runner,bash' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/GitlabRunner/bash/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/runner-bash.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/runner-bash,docker.io/startx/runner-bash'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for building application based on bash using gitlab CI runners." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/GitlabRunner/bash/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/GitlabRunner/bash" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/GitlabRunner/nodejs/Dockerfile b/GitlabRunner/nodejs/Dockerfile
index 260146a9..2358f1be 100644
--- a/GitlabRunner/nodejs/Dockerfile
+++ b/GitlabRunner/nodejs/Dockerfile
@@ -7,18 +7,33 @@ ENV SX_VERSION="latest" \
     SX_UNAME="user" \
     SX_ID="startx/runner-nodejs" \
     SX_NAME="Startx Nodejs gitlab runner image (fedora rawhide)" \
-    SX_SUMMARY="Startx nodejs gitlab runner based on fedora rawhide"
+    SX_SUMMARY="Startx nodejs gitlab runner based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr"
 
 LABEL name="$SX_ID" \
     summary="$SX_SUMMARY" \
     description="$SX_SUMMARY. Use for building application based on nodejs using gitlab CI runners." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,runner,nodejs" \
     io.openshift.min-memory="64Mi" \
     io.openshift.min-cpu="100m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,runner,nodejs' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/GitlabRunner/nodejs/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/runner-nodejs.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/runner-nodejs,docker.io/startx/runner-nodejs'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for building application based on nodejs using gitlab CI runners." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/GitlabRunner/nodejs/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/GitlabRunner/nodejs" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/GitlabRunner/oc/Dockerfile b/GitlabRunner/oc/Dockerfile
index fe3e15d9..a8ce7ceb 100644
--- a/GitlabRunner/oc/Dockerfile
+++ b/GitlabRunner/oc/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/runner-oc" \
     SX_NAME="Startx OCP/K8S client gitlab runner image (fedora rawhide)" \
     SX_SUMMARY="Startx ocp/k8s gitlab runner based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_OC_VERSION="4.10.12" \
     SX_ISTIO_VERSION="1.14.1"  \
     SX_HELM_VERSION="3.9.0"  \
@@ -16,11 +17,25 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for building application based on oc or kubectl using gitlab CI runners." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,runner,openshift,kubernetes" \
     io.openshift.min-memory="128Mi" \
     io.openshift.min-cpu="100m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,runner,openshift,kubernetes' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/GitlabRunner/oc/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/runner-oc.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/runner-oc,docker.io/startx/runner-oc'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for building application based on oc or kubectl using gitlab CI runners." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/GitlabRunner/oc/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/GitlabRunner/oc" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/GitlabRunner/php/Dockerfile b/GitlabRunner/php/Dockerfile
index 1388912d..3665a26b 100644
--- a/GitlabRunner/php/Dockerfile
+++ b/GitlabRunner/php/Dockerfile
@@ -7,18 +7,33 @@ ENV SX_VERSION="latest" \
     SX_UNAME="user" \
     SX_ID="startx/runner-php" \
     SX_NAME="Startx Apache-PHP gitlab runner image (fedora rawhide)" \
-    SX_SUMMARY="Startx apache-php gitlab runner based on fedora rawhide"
+    SX_SUMMARY="Startx apache-php gitlab runner based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr"
 
 LABEL name="$SX_ID" \
     summary="$SX_SUMMARY" \
     description="$SX_SUMMARY. Use for building application based on php using gitlab CI runners." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
+    io.openshift.tags="startx,os,runner,apache,php,httpd" \
     io.openshift.min-memory="256Mi" \
     io.openshift.min-cpu="100m" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,runner,apache,php,httpd' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/GitlabRunner/php/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/runner-php.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/runner-php,docker.io/startx/runner-php'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for building application based on php using gitlab CI runners." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/GitlabRunner/php/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/GitlabRunner/php" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/apache/Dockerfile b/Services/apache/Dockerfile
index 051c7a25..53a1e0ba 100644
--- a/Services/apache/Dockerfile
+++ b/Services/apache/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-apache" \
     SX_NAME="Startx Apache service image (fedora rawhide)" \
     SX_SUMMARY="Startx apache service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     HTTPDCONF=/etc/httpd/conf.d/app.conf \
     LOG_PATH=/var/log/httpd \
     APP_PATH=/app \
@@ -20,7 +21,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing application based on http or as container mainstream image for your web application containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,apache,httpd" \
@@ -31,7 +32,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="$SX_S2IDIR" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,apache,httpd' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/apache/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-apache.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/apache,docker.io/startx/sv-apache'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing application based on http or as container mainstream image for your web application containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/apache/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/apache" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY httpd.conf $HTTPDCONF
diff --git a/Services/couchbase/Dockerfile b/Services/couchbase/Dockerfile
index 0b64b58f..8c5d560e 100644
--- a/Services/couchbase/Dockerfile
+++ b/Services/couchbase/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-couchbase" \
     SX_NAME="Startx Couchbase service image (fedora rawhide)" \
     SX_SUMMARY="Startx couchbase service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     CB_PATH=/opt/couchbase \
     DATA_PATH=/opt/couchbase/var \
     CB_VERSION=6.6.2 \
@@ -18,7 +19,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing database based on couchbase or as container mainstream image for your database backend containers." \
     version="$SX_VERSION" \
     release="1" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,database,couchbase" \
@@ -29,7 +30,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,database,couchbase' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/couchbase/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-couchbase.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/couchbase,docker.io/startx/sv-couchbase'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing database based on couchbase or as container mainstream image for your database backend containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/couchbase/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/couchbase" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/mariadb/Dockerfile b/Services/mariadb/Dockerfile
index 851e8d4f..b681ab11 100644
--- a/Services/mariadb/Dockerfile
+++ b/Services/mariadb/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-mariadb" \
     SX_NAME="Startx Mariadb service image (fedora rawhide)" \
     SX_SUMMARY="Startx mariadb service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     MY_CONF=/etc/my.cnf \
     DATA_PATH=/data \
     LOG_PATH=/var/log/mariadb \
@@ -19,7 +20,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing database based on mariadb or as container mainstream image for your database backend containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,database,mariadb" \
@@ -30,7 +31,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,database,mariadb' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/mariadb/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-mariadb.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/mariadb,docker.io/startx/sv-mariadb'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing database based on mariadb or as container mainstream image for your database backend containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/mariadb/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/mariadb" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/memcache/Dockerfile b/Services/memcache/Dockerfile
index 62c2c028..d56a9f14 100644
--- a/Services/memcache/Dockerfile
+++ b/Services/memcache/Dockerfile
@@ -5,14 +5,15 @@ ENV SX_VERSION="latest" \
     SX_SERVICE="memcache" \
     SX_ID="startx/sv-memcache" \
     SX_NAME="Startx Memcached service image (fedora rawhide)" \
-    SX_SUMMARY="Startx Memcached service based on fedora rawhide"
+    SX_SUMMARY="Startx Memcached service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr"
 
 LABEL name="$SX_ID" \
     summary="$SX_SUMMARY" \
     description="$SX_SUMMARY. Use for executing database based on memcached or as container mainstream image for your database backend containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,memcached,database" \
@@ -23,7 +24,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,memcached,database' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/memcache/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-memcache.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/memcache,docker.io/startx/sv-memcache'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing database based on memcached or as container mainstream image for your database backend containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/memcache/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/memcache" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/mongo/Dockerfile b/Services/mongo/Dockerfile
index dd314275..785d2928 100644
--- a/Services/mongo/Dockerfile
+++ b/Services/mongo/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-mongo" \
     SX_NAME="Startx MongoDB service image (fedora rawhide)" \
     SX_SUMMARY="Startx mongo service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     LOG_PATH=/var/log/mongodb \
     MONGO_RUNTIME=/usr/bin/mongod \
     MONGO_USER=mongod \
@@ -16,7 +17,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing database based on mongo or as container mainstream image for your database backend containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,database,mongo" \
@@ -27,7 +28,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,database,mongo' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/mongo/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-mongo.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/mongo,docker.io/startx/sv-mongo'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing database based on mongo or as container mainstream image for your database backend containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/mongo/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/mongo" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/nodejs/Dockerfile b/Services/nodejs/Dockerfile
index ce7a8701..aa53bc01 100644
--- a/Services/nodejs/Dockerfile
+++ b/Services/nodejs/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-nodejs" \
     SX_NAME="Startx Nodejs service image (fedora rawhide)" \
     SX_SUMMARY="Startx nodejs service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     LOG_PATH=/var/log/nodejs \
     APP_PATH=/app \
     DATA_PATH=/data \
@@ -16,7 +17,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing application based on nodejs or as container mainstream image for your micro-service containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,nodejs,httpd" \
@@ -27,7 +28,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \ 
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,nodejs,httpd' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/nodejs/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-nodejs.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/nodejs,docker.io/startx/sv-nodejs'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing application based on nodejs or as container mainstream image for your micro-service containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/nodejs/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/nodejs" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/ooconv/Dockerfile b/Services/ooconv/Dockerfile
index 74ed7d9c..20a7d3a9 100644
--- a/Services/ooconv/Dockerfile
+++ b/Services/ooconv/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-ooconv" \
     SX_NAME="Startx LibreOffice converter service image (fedora rawhide)" \
     SX_SUMMARY="Startx unoconv service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_USER=ooconv \
     APP_PATH=/home/ooconv \
     LOG_PATH=/var/log/ooconv \
@@ -16,7 +17,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing OpenOffice document converter or as container mainstream image for your document convertion backend containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,document,libreoffice" \
@@ -27,7 +28,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,document,libreoffice' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/ooconv/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-ooconv.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/ooconv,docker.io/startx/sv-ooconv'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing OpenOffice document converter or as container mainstream image for your document convertion backend containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/ooconv/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/ooconv" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/Services/php/Dockerfile b/Services/php/Dockerfile
index 5eac9b67..65353434 100644
--- a/Services/php/Dockerfile
+++ b/Services/php/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-php" \
     SX_NAME="Startx Apache-PHP service image (fedora rawhide)" \
     SX_SUMMARY="Startx apache-php service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_PHPSESS_PATH="/var/lib/php/session" \
     SX_PHP_TMPPATH="/tmp"
 
@@ -14,7 +15,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing application based on http-php or as container mainstream image for your dynamic web application containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,apache,httpd,php" \
@@ -25,7 +26,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,apache,httpd,php' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/php/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-php.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/php,docker.io/startx/sv-php'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing application based on http-php or as container mainstream image for your dynamic web application containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/php/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/php" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY httpd.conf $HTTPDCONF
diff --git a/Services/postgres/Dockerfile b/Services/postgres/Dockerfile
index e94a7576..2548a1d0 100644
--- a/Services/postgres/Dockerfile
+++ b/Services/postgres/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/sv-postgres" \
     SX_NAME="Startx Postgres service image (fedora rawhide)" \
     SX_SUMMARY="Startx postgres service based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     DATA_PATH=/data \
     LOG_PATH=/var/log/postgres
 
@@ -14,7 +15,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing database based on postgres or as container mainstream image for your database backend containers." \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,database,postgresql" \
@@ -25,7 +26,19 @@ LABEL name="$SX_ID" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
     io.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,database,postgresql' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/Services/postgres/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-postgres.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/postgres,docker.io/startx/sv-postgres'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing database based on postgres or as container mainstream image for your database backend containers." \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/Services/postgres/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/Services/postgres" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY sx /tmp/
diff --git a/VDI/chrome/Dockerfile b/VDI/chrome/Dockerfile
index 4306c0c9..1f695765 100644
--- a/VDI/chrome/Dockerfile
+++ b/VDI/chrome/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/vdi-chrome" \
     SX_NAME="Startx Chrome VDI image (fedora rawhide)" \
     SX_SUMMARY="Startx chrome container-based desktop application based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_CHROME_SUPERVISOR_CONF=/etc/supervisor/conf.d/ \
     LOG_PATH=/var/log/chrome \
     APP_PATH=/home/chrome \
@@ -20,7 +21,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing chrome browser as container mainstream image with persistence capabilities" \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,chrome,vnc,X11" \
@@ -30,7 +31,19 @@ LABEL name="$SX_ID" \
     io.openshift.expose-VDI="$SX_CHROME_PORT:vnc" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,chrome,vnc,X11' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/VDI/chrome/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-chrome.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/chrome,docker.io/startx/vdi-chrome'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing chrome browser as container mainstream image with persistence capabilities" \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/VDI/chrome/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/VDI/chrome" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY supervisord.conf $SX_CHROME_SUPERVISOR_CONF/
diff --git a/VDI/firefox/Dockerfile b/VDI/firefox/Dockerfile
index 166e575f..a6d8bba6 100644
--- a/VDI/firefox/Dockerfile
+++ b/VDI/firefox/Dockerfile
@@ -6,6 +6,7 @@ ENV SX_VERSION="latest" \
     SX_ID="startx/vdi-firefox" \
     SX_NAME="Startx Firefox VDI image (fedora rawhide)" \
     SX_SUMMARY="Startx firefox container-based desktop application based on fedora rawhide" \
+    SX_MAINTAINER_MAIL="dev@startx.fr" \
     SX_FIREFOX_SUPERVISOR_CONF=/etc/supervisor/conf.d/ \
     LOG_PATH=/var/log/firefox \
     APP_PATH=/home/firefox \
@@ -19,7 +20,7 @@ LABEL name="$SX_ID" \
     description="$SX_SUMMARY. Use for executing firefox browser as container mainstream image with persistence capabilities" \
     version="$SX_VERSION" \
     release="$SX_VERSION" \
-    maintainer="Startx <dev@startx.fr>" \
+    maintainer="Startx <$SX_MAINTAINER_MAIL>" \
     io.k8s.description="$SX_SUMMARY" \
     io.k8s.display-name="$SX_ID" \
     io.openshift.tags="startx,os,fedora,firefox,vnc,X11" \
@@ -29,7 +30,19 @@ LABEL name="$SX_ID" \
     io.openshift.expose-VDI="$SX_FIREFOX_PORT:vnc" \
     io.openshift.s2i.destination="/tmp" \
     io.openshift.s2i.scripts-url="image:///s2i" \
-    fr.startx.component="$SX_ID:$SX_VERSION"
+    fr.startx.component="$SX_ID:$SX_VERSION" \
+    io.artifacthub.package.maintainers='[{"name":"STARTX","email":"$SX_MAINTAINER_MAIL"}]' \
+    io.artifacthub.package.keywords='startx,os,fedora,firefox,vnc,X11' \
+    io.artifacthub.package.readme-url="https://docker-images.readthedocs.io/en/latest/VDI/firefox/" \
+    io.artifacthub.package.logo-url='https://gitlab.com/startx1/containers/-/raw/master/docs/img/sv-firefox.svg' \
+    io.artifacthub.package.alternative-locations='quay.io/startx/firefox,docker.io/startx/vdi-firefox'
+    io.artifacthub.package.license='Apache-2.0' \
+    org.opencontainers.image.version="$SX_VERSION" \
+    org.opencontainers.image.description="$SX_SUMMARY. Use for executing firefox browser as container mainstream image with persistence capabilities" \
+    org.opencontainers.image.created='2022-06-25T00:00:00Z' \
+    org.opencontainers.image.documentation="https://docker-images.readthedocs.io/en/latest/VDI/firefox/" \
+    org.opencontainers.image.source="https://gitlab.com/startx1/containers/-/tree/master/VDI/firefox" \
+    org.opencontainers.image.vendor="STARTX"
 
 USER root
 COPY supervisord.conf $SX_FIREFOX_SUPERVISOR_CONF/
diff --git a/docs/img/app-phpmyadmin.svg b/docs/img/app-phpmyadmin.svg
new file mode 100644
index 00000000..07c25eb3
--- /dev/null
+++ b/docs/img/app-phpmyadmin.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="40"
+   viewBox="0 0 60 40"
+   width="60"
+   version="1.1"
+   id="svg36"
+   sodipodi:docname="project.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview219"
+     showgrid="false"
+     inkscape:zoom="4.9625"
+     inkscape:cx="23.788151"
+     inkscape:cy="7.3379492"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g849" />
+  <metadata
+     id="metadata42">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs40">
+    <mask
+       id="a-1"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path2-9" />
+    </mask>
+    <mask
+       id="mask865"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path863" />
+    </mask>
+  </defs>
+  <mask
+     id="a"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path2" />
+  </mask>
+  <mask
+     id="b"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path5" />
+  </mask>
+  <g
+     id="g1042"
+     style="display:inline">
+    <g
+       id="g994"
+       transform="matrix(0.08667043,0,0,0.08667043,54.837532,-43.975856)"
+       style="display:inline">
+      <path
+         id="path990"
+         style="fill:#000e44;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.14747"
+         d="m 56.695351,510.77372 -107.53235,84.40183 -79.398391,-66.27467 61.189259,82.84335 -54.627399,74.39502 72.836531,-52.98696 102.528945,91.04567 -81.03891,-107.53235 z" />
+    </g>
+    <circle
+       style="opacity:1;fill:#ed8c8c;fill-opacity:1;stroke:none;stroke-width:0.308165;stroke-miterlimit:2.5;stroke-opacity:1;stop-color:#000000"
+       id="path912"
+       cx="16.627409"
+       cy="16.633268"
+       r="16.433828" />
+    <g
+       fill="none"
+       fill-rule="evenodd"
+       transform="matrix(0.15069337,0,0,0.15069337,-6.1976669,-20.880758)"
+       id="g1008">
+      <g
+         transform="matrix(0.92863152,0,0,-0.92863152,9.2718211,454.1644)"
+         id="g1006">
+        <g
+           fill="#0f1689"
+           mask="url(#a-1)"
+           id="g1002"
+           style="fill:#6f0f0c;fill-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)">
+          <path
+             d="m 203.46068,95.687543 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.5593,-33.077317 -6.93631,0 -12.55931,14.80922 -12.55931,33.077317 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="rotate(35,137.93117,151.55002)"
+             id="path996"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 30.142322,95.687543 c 6.936311,0 12.559301,-14.80922 12.559301,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.559301,-33.077317 -6.93631,0 -12.559301,14.80922 -12.559301,33.077317 0,18.268098 5.622991,33.077318 12.559301,33.077318 z"
+             transform="matrix(-0.81915204,0.57357644,0.57357644,0.81915204,58.084611,47.704768)"
+             id="path998"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 116.73282,66.275268 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.07731673 -12.55931,-33.07731673 -6.93631,0 -12.5593,14.80921973 -12.5593,33.07731673 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="matrix(-1,0,0,1,272.62852,53.670762)"
+             id="path1000"
+             style="fill:#6f0f0c;fill-opacity:1" />
+        </g>
+        <path
+           d="m 251.46701,173.09985 c -20.23008,-33.60997 -56.88957,-56.06791 -98.75578,-56.06791 -40.7208,0 -76.515877,21.2459 -97.058696,53.33459"
+           mask="url(#a-1)"
+           stroke="#0f1689"
+           stroke-width="20"
+           id="path1004"
+           style="stroke:#6f0c0c;stroke-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)" />
+      </g>
+    </g>
+    <g
+       id="g849"
+       transform="matrix(0.49527213,0,0,0.49527213,5.0758302,3.2125951)"
+       style="display:inline">
+      <path
+         fill="#ffa000"
+         d="M 38.778751,12.915937 H 22.152656 L 18.457968,9.221249 H 9.221249 c -2.0320782,0 -3.6946877,1.66261 -3.6946877,3.694688 v 7.389375 H 42.473439 v -3.694687 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path2-4"
+         style="fill:#6f0f0c;fill-opacity:1;stroke-width:0.923672" />
+      <path
+         fill="#ffca28"
+         d="M 38.778751,12.915937 H 9.221249 c -2.0320782,0 -3.6946877,1.662609 -3.6946877,3.694688 v 18.473438 c 0,2.032078 1.6626095,3.694688 3.6946877,3.694688 h 29.557502 c 2.032078,0 3.694688,-1.66261 3.694688,-3.694688 V 16.610625 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path4"
+         style="fill:#85211d;fill-opacity:1;stroke-width:0.923672" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.95879878,0,0,0.95879878,-871.34292,-378.35028)"
+     id="g893" />
+</svg>
diff --git a/docs/img/runner-ansible.svg b/docs/img/runner-ansible.svg
new file mode 100644
index 00000000..07c25eb3
--- /dev/null
+++ b/docs/img/runner-ansible.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="40"
+   viewBox="0 0 60 40"
+   width="60"
+   version="1.1"
+   id="svg36"
+   sodipodi:docname="project.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview219"
+     showgrid="false"
+     inkscape:zoom="4.9625"
+     inkscape:cx="23.788151"
+     inkscape:cy="7.3379492"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g849" />
+  <metadata
+     id="metadata42">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs40">
+    <mask
+       id="a-1"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path2-9" />
+    </mask>
+    <mask
+       id="mask865"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path863" />
+    </mask>
+  </defs>
+  <mask
+     id="a"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path2" />
+  </mask>
+  <mask
+     id="b"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path5" />
+  </mask>
+  <g
+     id="g1042"
+     style="display:inline">
+    <g
+       id="g994"
+       transform="matrix(0.08667043,0,0,0.08667043,54.837532,-43.975856)"
+       style="display:inline">
+      <path
+         id="path990"
+         style="fill:#000e44;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.14747"
+         d="m 56.695351,510.77372 -107.53235,84.40183 -79.398391,-66.27467 61.189259,82.84335 -54.627399,74.39502 72.836531,-52.98696 102.528945,91.04567 -81.03891,-107.53235 z" />
+    </g>
+    <circle
+       style="opacity:1;fill:#ed8c8c;fill-opacity:1;stroke:none;stroke-width:0.308165;stroke-miterlimit:2.5;stroke-opacity:1;stop-color:#000000"
+       id="path912"
+       cx="16.627409"
+       cy="16.633268"
+       r="16.433828" />
+    <g
+       fill="none"
+       fill-rule="evenodd"
+       transform="matrix(0.15069337,0,0,0.15069337,-6.1976669,-20.880758)"
+       id="g1008">
+      <g
+         transform="matrix(0.92863152,0,0,-0.92863152,9.2718211,454.1644)"
+         id="g1006">
+        <g
+           fill="#0f1689"
+           mask="url(#a-1)"
+           id="g1002"
+           style="fill:#6f0f0c;fill-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)">
+          <path
+             d="m 203.46068,95.687543 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.5593,-33.077317 -6.93631,0 -12.55931,14.80922 -12.55931,33.077317 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="rotate(35,137.93117,151.55002)"
+             id="path996"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 30.142322,95.687543 c 6.936311,0 12.559301,-14.80922 12.559301,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.559301,-33.077317 -6.93631,0 -12.559301,14.80922 -12.559301,33.077317 0,18.268098 5.622991,33.077318 12.559301,33.077318 z"
+             transform="matrix(-0.81915204,0.57357644,0.57357644,0.81915204,58.084611,47.704768)"
+             id="path998"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 116.73282,66.275268 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.07731673 -12.55931,-33.07731673 -6.93631,0 -12.5593,14.80921973 -12.5593,33.07731673 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="matrix(-1,0,0,1,272.62852,53.670762)"
+             id="path1000"
+             style="fill:#6f0f0c;fill-opacity:1" />
+        </g>
+        <path
+           d="m 251.46701,173.09985 c -20.23008,-33.60997 -56.88957,-56.06791 -98.75578,-56.06791 -40.7208,0 -76.515877,21.2459 -97.058696,53.33459"
+           mask="url(#a-1)"
+           stroke="#0f1689"
+           stroke-width="20"
+           id="path1004"
+           style="stroke:#6f0c0c;stroke-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)" />
+      </g>
+    </g>
+    <g
+       id="g849"
+       transform="matrix(0.49527213,0,0,0.49527213,5.0758302,3.2125951)"
+       style="display:inline">
+      <path
+         fill="#ffa000"
+         d="M 38.778751,12.915937 H 22.152656 L 18.457968,9.221249 H 9.221249 c -2.0320782,0 -3.6946877,1.66261 -3.6946877,3.694688 v 7.389375 H 42.473439 v -3.694687 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path2-4"
+         style="fill:#6f0f0c;fill-opacity:1;stroke-width:0.923672" />
+      <path
+         fill="#ffca28"
+         d="M 38.778751,12.915937 H 9.221249 c -2.0320782,0 -3.6946877,1.662609 -3.6946877,3.694688 v 18.473438 c 0,2.032078 1.6626095,3.694688 3.6946877,3.694688 h 29.557502 c 2.032078,0 3.694688,-1.66261 3.694688,-3.694688 V 16.610625 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path4"
+         style="fill:#85211d;fill-opacity:1;stroke-width:0.923672" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.95879878,0,0,0.95879878,-871.34292,-378.35028)"
+     id="g893" />
+</svg>
diff --git a/docs/img/sv-apache.svg b/docs/img/sv-apache.svg
new file mode 100644
index 00000000..07c25eb3
--- /dev/null
+++ b/docs/img/sv-apache.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="40"
+   viewBox="0 0 60 40"
+   width="60"
+   version="1.1"
+   id="svg36"
+   sodipodi:docname="project.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview219"
+     showgrid="false"
+     inkscape:zoom="4.9625"
+     inkscape:cx="23.788151"
+     inkscape:cy="7.3379492"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g849" />
+  <metadata
+     id="metadata42">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs40">
+    <mask
+       id="a-1"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path2-9" />
+    </mask>
+    <mask
+       id="mask865"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path863" />
+    </mask>
+  </defs>
+  <mask
+     id="a"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path2" />
+  </mask>
+  <mask
+     id="b"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path5" />
+  </mask>
+  <g
+     id="g1042"
+     style="display:inline">
+    <g
+       id="g994"
+       transform="matrix(0.08667043,0,0,0.08667043,54.837532,-43.975856)"
+       style="display:inline">
+      <path
+         id="path990"
+         style="fill:#000e44;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.14747"
+         d="m 56.695351,510.77372 -107.53235,84.40183 -79.398391,-66.27467 61.189259,82.84335 -54.627399,74.39502 72.836531,-52.98696 102.528945,91.04567 -81.03891,-107.53235 z" />
+    </g>
+    <circle
+       style="opacity:1;fill:#ed8c8c;fill-opacity:1;stroke:none;stroke-width:0.308165;stroke-miterlimit:2.5;stroke-opacity:1;stop-color:#000000"
+       id="path912"
+       cx="16.627409"
+       cy="16.633268"
+       r="16.433828" />
+    <g
+       fill="none"
+       fill-rule="evenodd"
+       transform="matrix(0.15069337,0,0,0.15069337,-6.1976669,-20.880758)"
+       id="g1008">
+      <g
+         transform="matrix(0.92863152,0,0,-0.92863152,9.2718211,454.1644)"
+         id="g1006">
+        <g
+           fill="#0f1689"
+           mask="url(#a-1)"
+           id="g1002"
+           style="fill:#6f0f0c;fill-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)">
+          <path
+             d="m 203.46068,95.687543 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.5593,-33.077317 -6.93631,0 -12.55931,14.80922 -12.55931,33.077317 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="rotate(35,137.93117,151.55002)"
+             id="path996"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 30.142322,95.687543 c 6.936311,0 12.559301,-14.80922 12.559301,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.559301,-33.077317 -6.93631,0 -12.559301,14.80922 -12.559301,33.077317 0,18.268098 5.622991,33.077318 12.559301,33.077318 z"
+             transform="matrix(-0.81915204,0.57357644,0.57357644,0.81915204,58.084611,47.704768)"
+             id="path998"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 116.73282,66.275268 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.07731673 -12.55931,-33.07731673 -6.93631,0 -12.5593,14.80921973 -12.5593,33.07731673 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="matrix(-1,0,0,1,272.62852,53.670762)"
+             id="path1000"
+             style="fill:#6f0f0c;fill-opacity:1" />
+        </g>
+        <path
+           d="m 251.46701,173.09985 c -20.23008,-33.60997 -56.88957,-56.06791 -98.75578,-56.06791 -40.7208,0 -76.515877,21.2459 -97.058696,53.33459"
+           mask="url(#a-1)"
+           stroke="#0f1689"
+           stroke-width="20"
+           id="path1004"
+           style="stroke:#6f0c0c;stroke-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)" />
+      </g>
+    </g>
+    <g
+       id="g849"
+       transform="matrix(0.49527213,0,0,0.49527213,5.0758302,3.2125951)"
+       style="display:inline">
+      <path
+         fill="#ffa000"
+         d="M 38.778751,12.915937 H 22.152656 L 18.457968,9.221249 H 9.221249 c -2.0320782,0 -3.6946877,1.66261 -3.6946877,3.694688 v 7.389375 H 42.473439 v -3.694687 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path2-4"
+         style="fill:#6f0f0c;fill-opacity:1;stroke-width:0.923672" />
+      <path
+         fill="#ffca28"
+         d="M 38.778751,12.915937 H 9.221249 c -2.0320782,0 -3.6946877,1.662609 -3.6946877,3.694688 v 18.473438 c 0,2.032078 1.6626095,3.694688 3.6946877,3.694688 h 29.557502 c 2.032078,0 3.694688,-1.66261 3.694688,-3.694688 V 16.610625 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path4"
+         style="fill:#85211d;fill-opacity:1;stroke-width:0.923672" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.95879878,0,0,0.95879878,-871.34292,-378.35028)"
+     id="g893" />
+</svg>
diff --git a/docs/img/vdi-chrome.svg b/docs/img/vdi-chrome.svg
new file mode 100644
index 00000000..07c25eb3
--- /dev/null
+++ b/docs/img/vdi-chrome.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="40"
+   viewBox="0 0 60 40"
+   width="60"
+   version="1.1"
+   id="svg36"
+   sodipodi:docname="project.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1016"
+     id="namedview219"
+     showgrid="false"
+     inkscape:zoom="4.9625"
+     inkscape:cx="23.788151"
+     inkscape:cy="7.3379492"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g849" />
+  <metadata
+     id="metadata42">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs40">
+    <mask
+       id="a-1"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path2-9" />
+    </mask>
+    <mask
+       id="mask865"
+       fill="#ffffff">
+      <path
+         d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+         fill="#ffffff"
+         fill-rule="evenodd"
+         id="path863" />
+    </mask>
+  </defs>
+  <mask
+     id="a"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path2" />
+  </mask>
+  <mask
+     id="b"
+     fill="#ffffff">
+    <path
+       d="M 0,0 H 313.30315 V 159.86486 H 0 Z"
+       fill="#ffffff"
+       fill-rule="evenodd"
+       id="path5" />
+  </mask>
+  <g
+     id="g1042"
+     style="display:inline">
+    <g
+       id="g994"
+       transform="matrix(0.08667043,0,0,0.08667043,54.837532,-43.975856)"
+       style="display:inline">
+      <path
+         id="path990"
+         style="fill:#000e44;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.14747"
+         d="m 56.695351,510.77372 -107.53235,84.40183 -79.398391,-66.27467 61.189259,82.84335 -54.627399,74.39502 72.836531,-52.98696 102.528945,91.04567 -81.03891,-107.53235 z" />
+    </g>
+    <circle
+       style="opacity:1;fill:#ed8c8c;fill-opacity:1;stroke:none;stroke-width:0.308165;stroke-miterlimit:2.5;stroke-opacity:1;stop-color:#000000"
+       id="path912"
+       cx="16.627409"
+       cy="16.633268"
+       r="16.433828" />
+    <g
+       fill="none"
+       fill-rule="evenodd"
+       transform="matrix(0.15069337,0,0,0.15069337,-6.1976669,-20.880758)"
+       id="g1008">
+      <g
+         transform="matrix(0.92863152,0,0,-0.92863152,9.2718211,454.1644)"
+         id="g1006">
+        <g
+           fill="#0f1689"
+           mask="url(#a-1)"
+           id="g1002"
+           style="fill:#6f0f0c;fill-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)">
+          <path
+             d="m 203.46068,95.687543 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.5593,-33.077317 -6.93631,0 -12.55931,14.80922 -12.55931,33.077317 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="rotate(35,137.93117,151.55002)"
+             id="path996"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 30.142322,95.687543 c 6.936311,0 12.559301,-14.80922 12.559301,-33.077318 0,-18.268097 -5.62299,-33.077317 -12.559301,-33.077317 -6.93631,0 -12.559301,14.80922 -12.559301,33.077317 0,18.268098 5.622991,33.077318 12.559301,33.077318 z"
+             transform="matrix(-0.81915204,0.57357644,0.57357644,0.81915204,58.084611,47.704768)"
+             id="path998"
+             style="fill:#6f0f0c;fill-opacity:1" />
+          <path
+             d="m 116.73282,66.275268 c 6.93631,0 12.5593,-14.80922 12.5593,-33.077318 0,-18.268097 -5.62299,-33.07731673 -12.55931,-33.07731673 -6.93631,0 -12.5593,14.80921973 -12.5593,33.07731673 0,18.268098 5.62299,33.077318 12.55931,33.077318 z"
+             transform="matrix(-1,0,0,1,272.62852,53.670762)"
+             id="path1000"
+             style="fill:#6f0f0c;fill-opacity:1" />
+        </g>
+        <path
+           d="m 251.46701,173.09985 c -20.23008,-33.60997 -56.88957,-56.06791 -98.75578,-56.06791 -40.7208,0 -76.515877,21.2459 -97.058696,53.33459"
+           mask="url(#a-1)"
+           stroke="#0f1689"
+           stroke-width="20"
+           id="path1004"
+           style="stroke:#6f0c0c;stroke-opacity:1"
+           transform="matrix(0.94489362,0,0,0.94489362,8.6962507,2.7018401)" />
+      </g>
+    </g>
+    <g
+       id="g849"
+       transform="matrix(0.49527213,0,0,0.49527213,5.0758302,3.2125951)"
+       style="display:inline">
+      <path
+         fill="#ffa000"
+         d="M 38.778751,12.915937 H 22.152656 L 18.457968,9.221249 H 9.221249 c -2.0320782,0 -3.6946877,1.66261 -3.6946877,3.694688 v 7.389375 H 42.473439 v -3.694687 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path2-4"
+         style="fill:#6f0f0c;fill-opacity:1;stroke-width:0.923672" />
+      <path
+         fill="#ffca28"
+         d="M 38.778751,12.915937 H 9.221249 c -2.0320782,0 -3.6946877,1.662609 -3.6946877,3.694688 v 18.473438 c 0,2.032078 1.6626095,3.694688 3.6946877,3.694688 h 29.557502 c 2.032078,0 3.694688,-1.66261 3.694688,-3.694688 V 16.610625 c 0,-2.032079 -1.66261,-3.694688 -3.694688,-3.694688 z"
+         id="path4"
+         style="fill:#85211d;fill-opacity:1;stroke-width:0.923672" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.95879878,0,0,0.95879878,-871.34292,-378.35028)"
+     id="g893" />
+</svg>