diff --git a/dockerfiles/tasks/apidocjs/Dockerfile b/dockerfiles/tasks/apidocjs/Dockerfile
index 1aee236..c92aef4 100644
--- a/dockerfiles/tasks/apidocjs/Dockerfile
+++ b/dockerfiles/tasks/apidocjs/Dockerfile
@@ -1,13 +1,21 @@
 # Using alpine linux for small image
 # - http://gliderlabs.viewdocs.io/docker-alpine/
-FROM alpine:3.4
+FROM node:14.2-alpine
 MAINTAINER Richard Morgan <r_morgan@sympatico.ca>
-LABEL version=2.0
+LABEL version=1.0 \
+    "usage"="docker run --rm --name apidocker -v <source dir>:/src -it apidocker" \
+    "env"="DOCS_DIR, APP_DIR, FILE_FILTER"
+
+ENV DOCS_DIR="build/docs/" \
+ APP_DIR="app/" \
+ FILE_FILTER=".[php]$"
 
 # install system packages
 RUN apk --no-cache add \
   nodejs \
  && npm install apidoc -g
 
-WORKDIR /src
+ADD ./entrypoint-apidocs.sh /scripts/entrypoint.sh
+RUN chmod +x -R /scripts && mkdir /src
 
+ENTRYPOINT /scripts/entrypoint.sh
diff --git a/dockerfiles/tasks/apidocjs/build.sh b/dockerfiles/tasks/apidocjs/build.sh
index c32e1a9..909a319 100755
--- a/dockerfiles/tasks/apidocjs/build.sh
+++ b/dockerfiles/tasks/apidocjs/build.sh
@@ -1,6 +1,14 @@
 #!/usr/bin/env bash
+set -e
+#set -x
 
+#build
 docker build --rm -f Dockerfile -t apidocjs:latest .
+
+#test
+docker run --rm --entrypoint=node apidocjs --version
 docker run --rm apidocjs apidoc | grep 'apidoc.json'
+
+#save
 docker tag apidocjs:latest dkregistry.xai-corp.net:5000/xaicorp/apidocjs:latest
 docker push dkregistry.xai-corp.net:5000/xaicorp/apidocjs:latest
diff --git a/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh b/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh
new file mode 100755
index 0000000..a6544b3
--- /dev/null
+++ b/dockerfiles/tasks/apidocjs/entrypoint-apidocs.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env sh
+set -e
+#set -x
+
+echo Building docs into: "${DOCS_DIR}"
+echo Reading Source files from "${APP_DIR}"
+echo Using file filter: "${FILE_FILTER}"
+echo
+
+cd /src/ || exit
+echo ${APP_DIR} : ${DOCS_DIR} : ${FILE_FILTER}
+rm -rf ${DOCS_DIR} && mkdir -p ${DOCS_DIR}
+apidoc -i ${APP_DIR} -o ${DOCS_DIR} -f ${FILE_FILTER}
diff --git a/dockerfiles/tasks/php/Dockerfile-7.2 b/dockerfiles/tasks/php/Dockerfile-7.2
index b8a9c40..ebc279a 100644
--- a/dockerfiles/tasks/php/Dockerfile-7.2
+++ b/dockerfiles/tasks/php/Dockerfile-7.2
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y software-properties-common python-softw
     \
   && apt-cache pkgnames | grep php7.2 \
   && rm /usr/bin/php && ln -s /usr/bin/php7.2 /usr/bin/php \
-  && ln -s /usr/sbin/php-fpm7.2 /usr/sbin/php-fpm
+  && ln -s /usr/sbin/php-fpm7.2 /usr/sbin/php-fpm \
   && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 COPY ./docker-php-fpm.conf /etc/php/7.2/fpm/pool.d/www.conf
diff --git a/dockerfiles/tasks/php/build.sh b/dockerfiles/tasks/php/build.sh
index 8823b94..54a6068 100755
--- a/dockerfiles/tasks/php/build.sh
+++ b/dockerfiles/tasks/php/build.sh
@@ -67,32 +67,3 @@ build_dev 7.2
 #build_dev 7.3
 
 exit
-
-docker build --rm -f Dockerfile-71 -t xaicorp/php:7.1 .
-docker build --rm -f Dockerfile-71-dev -t xaicorp/php:7.1-dev .
-docker run --rm --entrypoint php xaicorp/php:7.1 --version | grep 'PHP 7.1.'
-docker run --rm --entrypoint php xaicorp/php:7.1-dev --version | grep 'PHP 7.1.'
-docker run --rm --entrypoint php xaicorp/php:7.1-dev --version | grep 'Xdebug'
-docker tag xaicorp/php:7.1 dkregistry.xai-corp.net:5000/xaicorp/php:7.1
-docker tag xaicorp/php:7.1-dev dkregistry.xai-corp.net:5000/xaicorp/php:7.1-dev
-docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.1
-docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.1-dev
-
-docker tag xaicorp/php:7.1-dev rmorgan/php-fpm:7.1
-
-
-docker build --rm -f Dockerfile-72 -t xaicorp/php:7.2 .
-docker build --rm -f Dockerfile-72-dev -t xaicorp/php:7.2-dev .
-docker run --rm --entrypoint php xaicorp/php:7.2 --version | grep 'PHP 7.2.'
-docker run --rm --entrypoint php xaicorp/php:7.2-dev --version | grep 'PHP 7.2.'
-docker run --rm --entrypoint php xaicorp/php:7.2-dev --version | grep 'Xdebug'
-docker tag xaicorp/php:7.2 dkregistry.xai-corp.net:5000/xaicorp/php:7.2
-docker tag xaicorp/php:7.2-dev dkregistry.xai-corp.net:5000/xaicorp/php:7.2-dev
-docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.2
-docker push dkregistry.xai-corp.net:5000/xaicorp/php:7.2-dev
-
-docker tag xaicorp/php:7.2-dev rmorgan/php-fpm:7.2
-docker tag xaicorp/php:7.1-dev rmorgan/php-fpm:latest
-
-
-docker build --rm -f Dockerfile-73 -t xaicorp/php:7.3 .