diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile
index f9eed6c..e1ffc93 100644
--- a/support/docker/Dockerfile
+++ b/support/docker/Dockerfile
@@ -17,10 +17,11 @@ RUN yum install -y centos-release-scl && \
     rm -rf /var/cache/yum && \
     mkdir -p /opt/ansible/threescale-cicd && \
     git clone -b ${GIT_BRANCH} -- ${GIT_REPOSITORY} /opt/ansible/threescale-cicd && \
-    cd /opt/ansible/threescale-cicd/support/docker && \
+    cd /opt/ansible/threescale-cicd/support/docker && mkdir api && \
     ansible-playbook install.yaml
 
 WORKDIR /opt/ansible/threescale-cicd/support/docker
+VOLUME [ "/opt/ansible/threescale-cicd/support/docker/api" ]
 
 ENTRYPOINT [ "/usr/bin/ansible-playbook", "deploy-api.yaml" ]
 CMD [ ]
diff --git a/support/openshift/Dockerfile b/support/openshift/Dockerfile
index fd342a5..189a9ae 100644
--- a/support/openshift/Dockerfile
+++ b/support/openshift/Dockerfile
@@ -17,10 +17,11 @@ RUN yum install -y centos-release-scl && \
     rm -rf /var/cache/yum && \
     mkdir -p /opt/ansible/threescale-cicd && \
     git clone -b ${THREESCALE_CICD_GIT_BRANCH} -- ${THREESCALE_CICD_GIT_REPOSITORY} /opt/ansible/threescale-cicd && \
-    cd /opt/ansible/threescale-cicd/support/openshift && \
+    cd /opt/ansible/threescale-cicd/support/openshift && mkdir api && \
     ansible-playbook install.yaml
 
 WORKDIR /opt/ansible/threescale-cicd/support/openshift
+VOLUME [ "/opt/ansible/threescale-cicd/support/docker/api" ]
 
 ENTRYPOINT [ "/usr/bin/ansible-playbook", "deploy-api.yaml" ]
 CMD [ ]