diff --git a/.github/fiware/image-clone.sh b/.github/fiware/image-clone.sh
new file mode 100755
index 0000000..5bc1296
--- /dev/null
+++ b/.github/fiware/image-clone.sh
@@ -0,0 +1,31 @@
+set -e
+
+SOURCE="telefonicaiot/fiware-pep-steelskin"
+DOCKER_TARGET="fiware/pep-steelskin"
+QUAY_TARGET="quay.io/fiware/pep-steelskin"
+
+# DOCKER_TARGET="fiware/$(basename $(git rev-parse --show-toplevel))"
+# QUAY_TARGET="quay.io/fiware/$(basename $(git rev-parse --show-toplevel))"
+
+VERSION=$(git describe --exclude 'FIWARE*' --tags $(git rev-list --tags --max-count=1))
+
+function clone {
+   echo 'cloning from '"$1 $2"' to '"$3"
+   docker pull -q "$1":"$2"
+   docker tag "$1":"$2" "$3":"$2"
+   
+   if ! [ -z "$4" ]; then
+        echo 'pushing '"$1 $2"' to latest'
+        docker push -q "$3":latest
+   fi
+}
+
+for i in "$@" ; do
+    if [[ $i == "docker" ]]; then
+        clone "$SOURCE" "$VERSION" "$DOCKER_TARGET" true
+    fi
+    if [[ $i == "quay" ]]; then
+        clone "$SOURCE" "$VERSION" "$QUAY_TARGET" true
+    fi
+    echo ""
+done
\ No newline at end of file
diff --git a/README.md b/README.md
index 949002e..efbccd9 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![FIWARE Security](https://nexus.lab.fiware.org/static/badges/chapters/security.svg)](https://www.fiware.org/developers/catalogue/)
 [![License: APGL](https://img.shields.io/github/license/telefonicaid/fiware-pep-steelskin.svg)](https://opensource.org/licenses/AGPL-3.0)
+[![Docker badge](https://img.shields.io/badge/quay.io-fiware%2Fpep--steelskin-grey?logo=red%20hat&labelColor=EE0000)](https://quay.io/repository/fiware/pep-steelskin)
 <br/>
 [![CI](https://github.com/telefonicaid/fiware-pep-steelskin/workflows/CI/badge.svg)](https://github.com/telefonicaid/fiware-pep-steelskin/actions?query=workflow%3ACI)
 [![Coverage Status](https://coveralls.io/repos/github/telefonicaid/fiware-pep-steelskin/badge.svg?branch=master)](https://coveralls.io/github/telefonicaid/fiware-pep-steelskin?branch=master)
@@ -45,7 +46,7 @@ Three other documents provide further information about the PEP Proxy:
 ### Dependencies
 The PEP Proxy is standard Node.js app and doesn't require more dependencies than the Node.js interpreter (0.10 or higher) and the NPM package utility. For RPM installations using Yum, those dependencies should be automatically installed.
 
-### Without RPM Packages 
+### Without RPM Packages
 Just checkout this directory and install the Node.js dependencies using:
 
 ```
@@ -399,7 +400,7 @@ For testing purposes it might be interesting to launch the process directly with
 
 Take into account that when the process is executed manually the system configuration for the script (in /etc/sysconfig/pepProxy) is not loaded and the default configuration (in /opt/pepProxy/config.js) is used. 
 
-####    Stop service
+#### Stop service
 To stop the service, use either the service command:
 ```
 service pepProxy stop
@@ -710,7 +711,7 @@ An up-to-date list of the convenience operations can be found [here](https://doc
 | GET    | /v1/contextTypes                                                                     | R |
 | GET    | /v1/contextTypes{typename}                                                           | R |
 
-#### NGSIv2 
+#### NGSIv2
 | Method | Path                                                                                    | Action |
 | ------ |:--------------------------------------------------------------------------------------- | ---:|
 | GET    | /v2                                                                                     | R |