diff --git a/.travis.yml b/.travis.yml
index 24a00351..32407203 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,14 +32,14 @@ after_script:
 # ##
   - echo "1john2_password" | docker login -u "1john2ci" --password-stdin
 
-  - docker tag nextcloud:16.0-apache 1john2ci/nextcloud:apache-ncd-20190509
-  - docker push 1john2ci/nextcloud:apache-ncd-20190509
+  - docker tag nextcloud:16.0-apache 1john2ci/nextcloud:apache-ncd-20190510
+  - docker push 1john2ci/nextcloud:apache-ncd-20190510
 
-  - docker tag nextcloud:16.0-nginx 1john2ci/nextcloud:nginx-ncd-20190509
-  - docker push 1john2ci/nextcloud:nginx-ncd-20190509
+  - docker tag nextcloud:16.0-nginx 1john2ci/nextcloud:nginx-ncd-20190510
+  - docker push 1john2ci/nextcloud:nginx-ncd-20190510
 
-  - docker tag nextcloud:16.0-fpm-full 1john2ci/nextcloud:fpm-ncd-20190509
-  - docker push 1john2ci/nextcloud:fpm-ncd-20190509
+  - docker tag nextcloud:16.0-fpm-full 1john2ci/nextcloud:fpm-ncd-20190510
+  - docker push 1john2ci/nextcloud:fpm-ncd-20190510
 
 jobs:
   include:
diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile
index 4d50922f..6b33ef67 100644
--- a/16.0/apache/Dockerfile
+++ b/16.0/apache/Dockerfile
@@ -1,6 +1,24 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.3-apache-stretch
 
+# ##
+# Install standard troubleshooting utils
+# We can't remove apache2 - it brokes build for fpm/apache containers
+# ##
+RUN set -ex; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        vim \
+        net-tools \
+        iproute2 \
+        iputils-ping \
+        wget \
+        psmisc \
+        procps \
+    ; \
+    rm -rf /var/lib/apt/lists/*;
+
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
     \
diff --git a/16.0/fpm/Dockerfile b/16.0/fpm/Dockerfile
index 4b8ec812..6780dafe 100644
--- a/16.0/fpm/Dockerfile
+++ b/16.0/fpm/Dockerfile
@@ -1,6 +1,24 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:7.3-fpm-stretch
 
+# ##
+# Install standard troubleshooting utils
+# We can't remove apache2 - it brokes build for fpm/apache containers
+# ##
+RUN set -ex; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        vim \
+        net-tools \
+        iproute2 \
+        iputils-ping \
+        wget \
+        psmisc \
+        procps \
+    ; \
+    rm -rf /var/lib/apt/lists/*;
+
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
     \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index d7a00264..a5347b27 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -1,5 +1,23 @@
 FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch
 
+# ##
+# Install standard troubleshooting utils
+# We can't remove apache2 - it brokes build for fpm/apache containers
+# ##
+RUN set -ex; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        vim \
+        net-tools \
+        iproute2 \
+        iputils-ping \
+        wget \
+        psmisc \
+        procps \
+    ; \
+    rm -rf /var/lib/apt/lists/*;
+
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
     \
diff --git a/start_container.sh b/start_container.sh
index f17e39b8..9e15824d 100755
--- a/start_container.sh
+++ b/start_container.sh
@@ -24,7 +24,7 @@ IMAGE="1john2ci/nextcloud:${NAME}-ncd-${TAG}"
 NAME="${NAME}-ncd"
 
 declare -A PUBLISH=(
-[nginx-ncd]=' -p 80:80 '
+[nginx-ncd]=' -p 127.0.0.1:8060:80 '
 [fpm-ncd]=''
 )
 
@@ -57,5 +57,8 @@ eval "CMD='docker run -dit \
     "${IMAGE}" \
     "${EXECCMD}" \
   '"
+export SQLITE_DATABASE='test'
+export NEXTCLOUD_ADMIN_USER='admin'
+export NEXTCLOUD_ADMIN_PASSWORD='admin'
 
 ${CMD}