diff --git a/debian-stretch-slim-16.0.0-rc3/Dockerfile b/debian-stretch-slim-16-current/Dockerfile
similarity index 94%
rename from debian-stretch-slim-16.0.0-rc3/Dockerfile
rename to debian-stretch-slim-16-current/Dockerfile
index 5ab84d2..1cf08da 100644
--- a/debian-stretch-slim-16.0.0-rc3/Dockerfile
+++ b/debian-stretch-slim-16-current/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:stretch-slim
 
 LABEL maintainer="Andrius Kairiukstis <k@andrius.mobi>"
 
-ENV ASTERISK_VERSION 16.0.0-rc3
+ENV ASTERISK_VERSION 16-current
 ENV OPUS_CODEC       asterisk-16.0/x86-64/codec_opus-16.0_current-x86_64
 
 COPY build-asterisk.sh /
diff --git a/debian-stretch-slim-16.0.0-rc3/Dockerfile-centos b/debian-stretch-slim-16-current/Dockerfile-centos
similarity index 100%
rename from debian-stretch-slim-16.0.0-rc3/Dockerfile-centos
rename to debian-stretch-slim-16-current/Dockerfile-centos
diff --git a/debian-stretch-slim-16.0.0-rc3/build-asterisk.sh b/debian-stretch-slim-16-current/build-asterisk.sh
similarity index 99%
rename from debian-stretch-slim-16.0.0-rc3/build-asterisk.sh
rename to debian-stretch-slim-16-current/build-asterisk.sh
index d30b90e..cd88e25 100755
--- a/debian-stretch-slim-16.0.0-rc3/build-asterisk.sh
+++ b/debian-stretch-slim-16-current/build-asterisk.sh
@@ -33,6 +33,7 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-i
     libvorbis-dev \
     libxml2-dev \
     libxslt1-dev \
+    procps \
     portaudio19-dev \
     unixodbc \
     unixodbc-bin \
diff --git a/debian-stretch-slim-16.0.0-rc3/docker-entrypoint.sh b/debian-stretch-slim-16-current/docker-entrypoint.sh
similarity index 69%
rename from debian-stretch-slim-16.0.0-rc3/docker-entrypoint.sh
rename to debian-stretch-slim-16-current/docker-entrypoint.sh
index f1f82f4..a82f419 100755
--- a/debian-stretch-slim-16.0.0-rc3/docker-entrypoint.sh
+++ b/debian-stretch-slim-16-current/docker-entrypoint.sh
@@ -14,12 +14,11 @@ if [ "${ASTERISK_UID}" != "" ] && [ "${ASTERISK_GID}" != "" ]; then
   # if they've sent as env variables (i.e. to macth with host user to fix permissions for mounted folders
 
   deluser asterisk && \
-  adduser --gecos "" --no-create-home --uid ${ASTERISK_UID} --disabled-password ${ASTERISK_USER} \
-  || exit
+  adduser --gecos "" --no-create-home --uid ${ASTERISK_UID} --disabled-password ${ASTERISK_USER} || exit
+
+  chown -R ${ASTERISK_UID}:${ASTERISK_UID} /etc/asterisk \
+                                           /var/*/asterisk \
+                                           /usr/*/asterisk
 fi
 
-chown -R ${ASTERISK_USER}: /var/log/asterisk \
-                           /var/lib/asterisk \
-                           /var/run/asterisk \
-                           /var/spool/asterisk; \
 exec ${COMMAND}