diff --git a/script/docker/fvp/dockerfile-template b/script/docker/fvp/dockerfile-template
index e124865..5803557 100644
--- a/script/docker/fvp/dockerfile-template
+++ b/script/docker/fvp/dockerfile-template
@@ -1,23 +1,20 @@
-FROM ${OS}:${OS_VER}
+FROM ${OS}:${OS_VER} as FVP
 
-ENV ARMLMD_LICENSE_FILE=27000@ci.trustedfirmware.org
-
-# Install package required
 RUN apt-get update && \
     apt-get install --no-install-recommends --yes bc libatomic1 telnet libdbus-1-3 xterm && \
     rm -rf /var/cache/apt
 
-# Create model directory
-RUN mkdir ${MODEL_DIR}
+FROM FVP
 
-# Add FVP Binaries
-ADD ${MODEL}_${MODEL_VER}.tgz ${MODEL_DIR}
+WORKDIR ${MODEL_DIR}
 
-# Install the model
-RUN cd ${MODEL_DIR} && \
-    ${MODEL_DIR}/${MODEL}.sh \
+# Add the FVP model tarball
+# NOTE: some tarballs contain an installer script others don't, so it may be the case
+# that the ADD instruction do install the model under /opt/model
+ADD ${MODEL}_${MODEL_VER}.tgz .
+
+# Install packages and model
+RUN ${MODEL_DIR}/${MODEL}.sh \
         --i-agree-to-the-contained-eula \
         --verbose \
-        --destination ${MODEL_DIR}/${MODEL}
-
-WORKDIR /opt/model/${MODEL}/models/Linux64_GCC-6.4/
\ No newline at end of file
+        --destination ${MODEL_DIR}/${MODEL} && rm -f ${MODEL_DIR}/${MODEL}.sh || true