diff --git a/README.md b/README.md
index 06c4bf8..0d02b37 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,12 @@ The smallest Docker image with Asterisk PBX https://hub.docker.com/r/andrius/ast
 This image is based on Alpine Linux image, which is only a 5MB image, and contains
 [Asterisk PBX](http://www.asterisk.org/get-started/features).
 
-Total size of this image for `latest` tag (Alpine-based) is:
+Total size of this image for `latest` tag (based on Alpine linux) is:
 
 [![](https://images.microbadger.com/badges/image/andrius/asterisk.svg)](https://microbadger.com/images/andrius/asterisk "Get your own image badge on microbadger.com")
 
-And for `debian-15-current` [![](https://images.microbadger.com/badges/image/andrius/asterisk:debian-15-current.svg)](https://microbadger.com/images/andrius/asterisk:debian-15-current "Get your own image badge on microbadger.com").
+And for `debian-stretch-slim-15-current`
+[![](https://images.microbadger.com/badges/image/andrius/asterisk:debian-stretch-slim-15-current.svg)](https://microbadger.com/images/andrius/asterisk:debian-stretch-slim-15-current "Get your own image badge on microbadger.com").
 
 # Custom UID/GID
 
diff --git a/alpine-11.6.1/Dockerfile b/alpine-2.6-11.6.1/Dockerfile
similarity index 100%
rename from alpine-11.6.1/Dockerfile
rename to alpine-2.6-11.6.1/Dockerfile
diff --git a/alpine-11.6.1/docker-entrypoint.sh b/alpine-2.6-11.6.1/docker-entrypoint.sh
similarity index 100%
rename from alpine-11.6.1/docker-entrypoint.sh
rename to alpine-2.6-11.6.1/docker-entrypoint.sh
diff --git a/alpine-11.x/Dockerfile b/alpine-2.7-11.x/Dockerfile
similarity index 100%
rename from alpine-11.x/Dockerfile
rename to alpine-2.7-11.x/Dockerfile
diff --git a/alpine-11.x/docker-entrypoint.sh b/alpine-2.7-11.x/docker-entrypoint.sh
similarity index 100%
rename from alpine-11.x/docker-entrypoint.sh
rename to alpine-2.7-11.x/docker-entrypoint.sh
diff --git a/alpine-14/Dockerfile b/alpine-3.6-14.x/Dockerfile
similarity index 100%
rename from alpine-14/Dockerfile
rename to alpine-3.6-14.x/Dockerfile
diff --git a/alpine-14/docker-entrypoint.sh b/alpine-3.6-14.x/docker-entrypoint.sh
similarity index 100%
rename from alpine-14/docker-entrypoint.sh
rename to alpine-3.6-14.x/docker-entrypoint.sh
diff --git a/alpine-15.2.2/Dockerfile b/alpine-3.7-15.x/Dockerfile
similarity index 100%
rename from alpine-15.2.2/Dockerfile
rename to alpine-3.7-15.x/Dockerfile
diff --git a/alpine-15.2.2/docker-entrypoint.sh b/alpine-3.7-15.x/docker-entrypoint.sh
similarity index 100%
rename from alpine-15.2.2/docker-entrypoint.sh
rename to alpine-3.7-15.x/docker-entrypoint.sh
diff --git a/alpine-15/Dockerfile b/alpine-3.8-15.x/Dockerfile
similarity index 100%
rename from alpine-15/Dockerfile
rename to alpine-3.8-15.x/Dockerfile
diff --git a/alpine-15/docker-entrypoint.sh b/alpine-3.8-15.x/docker-entrypoint.sh
similarity index 100%
rename from alpine-15/docker-entrypoint.sh
rename to alpine-3.8-15.x/docker-entrypoint.sh
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..9b12b96
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+TAG=$1
+
+cd ${TAG} && \
+docker build --pull --force-rm -t andrius/asterisk:${TAG} --file ./Dockerfile . && \
+docker run -d --rm --name asterisk-${TAG} andrius/asterisk:${TAG} && \
+sleep 3 && \
+docker exec -ti asterisk-${TAG} sh -c "cat /etc/iss*"; \
+docker exec -ti asterisk-${TAG} sh -c "asterisk -rx 'core show version'"; \
+docker stop asterisk-${TAG}; \
+cd ..
diff --git a/check-docker-hub.sh b/check-docker-hub.sh
new file mode 100755
index 0000000..4f33430
--- /dev/null
+++ b/check-docker-hub.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+TAG=$1
+docker pull andrius/asterisk:${TAG} && \
+docker run -d --rm --name asterisk-${TAG} andrius/asterisk:${TAG} && \
+sleep 2 && \
+docker exec -ti asterisk-${TAG} sh -c "asterisk -rx 'core show version'"; \
+docker stop asterisk-${TAG}; \
+docker rmi andrius/asterisk:${TAG}
diff --git a/debian-10.12.4/Dockerfile b/debian-jessie-slim-10.12.4/Dockerfile
similarity index 100%
rename from debian-10.12.4/Dockerfile
rename to debian-jessie-slim-10.12.4/Dockerfile
diff --git a/debian-10.12.4/build-asterisk.sh b/debian-jessie-slim-10.12.4/build-asterisk.sh
similarity index 100%
rename from debian-10.12.4/build-asterisk.sh
rename to debian-jessie-slim-10.12.4/build-asterisk.sh
diff --git a/debian-10.12.4/docker-entrypoint.sh b/debian-jessie-slim-10.12.4/docker-entrypoint.sh
similarity index 100%
rename from debian-10.12.4/docker-entrypoint.sh
rename to debian-jessie-slim-10.12.4/docker-entrypoint.sh
diff --git a/debian-11.25.3/Dockerfile b/debian-jessie-slim-11.25.3/Dockerfile
similarity index 100%
rename from debian-11.25.3/Dockerfile
rename to debian-jessie-slim-11.25.3/Dockerfile
diff --git a/debian-11.25.3/build-asterisk.sh b/debian-jessie-slim-11.25.3/build-asterisk.sh
similarity index 100%
rename from debian-11.25.3/build-asterisk.sh
rename to debian-jessie-slim-11.25.3/build-asterisk.sh
diff --git a/debian-11.25.3/docker-entrypoint.sh b/debian-jessie-slim-11.25.3/docker-entrypoint.sh
similarity index 100%
rename from debian-11.25.3/docker-entrypoint.sh
rename to debian-jessie-slim-11.25.3/docker-entrypoint.sh
diff --git a/debian-12.8.2/Dockerfile b/debian-jessie-slim-12.8.2/Dockerfile
similarity index 100%
rename from debian-12.8.2/Dockerfile
rename to debian-jessie-slim-12.8.2/Dockerfile
diff --git a/debian-12.8.2/build-asterisk.sh b/debian-jessie-slim-12.8.2/build-asterisk.sh
similarity index 100%
rename from debian-12.8.2/build-asterisk.sh
rename to debian-jessie-slim-12.8.2/build-asterisk.sh
diff --git a/debian-12.8.2/docker-entrypoint.sh b/debian-jessie-slim-12.8.2/docker-entrypoint.sh
similarity index 100%
rename from debian-12.8.2/docker-entrypoint.sh
rename to debian-jessie-slim-12.8.2/docker-entrypoint.sh
diff --git a/debian-13-current/Dockerfile b/debian-stretch-slim-13-current/Dockerfile
similarity index 100%
rename from debian-13-current/Dockerfile
rename to debian-stretch-slim-13-current/Dockerfile
diff --git a/debian-13-current/build-asterisk.sh b/debian-stretch-slim-13-current/build-asterisk.sh
similarity index 100%
rename from debian-13-current/build-asterisk.sh
rename to debian-stretch-slim-13-current/build-asterisk.sh
diff --git a/debian-13-current/docker-entrypoint.sh b/debian-stretch-slim-13-current/docker-entrypoint.sh
similarity index 100%
rename from debian-13-current/docker-entrypoint.sh
rename to debian-stretch-slim-13-current/docker-entrypoint.sh
diff --git a/debian-14-current/Dockerfile b/debian-stretch-slim-14-current/Dockerfile
similarity index 100%
rename from debian-14-current/Dockerfile
rename to debian-stretch-slim-14-current/Dockerfile
diff --git a/debian-14-current/Dockerfile-centos b/debian-stretch-slim-14-current/Dockerfile-centos
similarity index 100%
rename from debian-14-current/Dockerfile-centos
rename to debian-stretch-slim-14-current/Dockerfile-centos
diff --git a/debian-14-current/build-asterisk.sh b/debian-stretch-slim-14-current/build-asterisk.sh
similarity index 100%
rename from debian-14-current/build-asterisk.sh
rename to debian-stretch-slim-14-current/build-asterisk.sh
diff --git a/debian-14-current/docker-entrypoint.sh b/debian-stretch-slim-14-current/docker-entrypoint.sh
similarity index 100%
rename from debian-14-current/docker-entrypoint.sh
rename to debian-stretch-slim-14-current/docker-entrypoint.sh
diff --git a/debian-15-current/Dockerfile b/debian-stretch-slim-15-current/Dockerfile
similarity index 100%
rename from debian-15-current/Dockerfile
rename to debian-stretch-slim-15-current/Dockerfile
diff --git a/debian-15-current/Dockerfile-centos b/debian-stretch-slim-15-current/Dockerfile-centos
similarity index 100%
rename from debian-15-current/Dockerfile-centos
rename to debian-stretch-slim-15-current/Dockerfile-centos
diff --git a/debian-15-current/build-asterisk.sh b/debian-stretch-slim-15-current/build-asterisk.sh
similarity index 100%
rename from debian-15-current/build-asterisk.sh
rename to debian-stretch-slim-15-current/build-asterisk.sh
diff --git a/debian-15-current/docker-entrypoint.sh b/debian-stretch-slim-15-current/docker-entrypoint.sh
similarity index 100%
rename from debian-15-current/docker-entrypoint.sh
rename to debian-stretch-slim-15-current/docker-entrypoint.sh
diff --git a/debian-16.0.0-rc3/Dockerfile b/debian-stretch-slim-16.0.0-rc3/Dockerfile
similarity index 100%
rename from debian-16.0.0-rc3/Dockerfile
rename to debian-stretch-slim-16.0.0-rc3/Dockerfile
diff --git a/debian-16.0.0-rc3/Dockerfile-centos b/debian-stretch-slim-16.0.0-rc3/Dockerfile-centos
similarity index 100%
rename from debian-16.0.0-rc3/Dockerfile-centos
rename to debian-stretch-slim-16.0.0-rc3/Dockerfile-centos
diff --git a/debian-16.0.0-rc3/build-asterisk.sh b/debian-stretch-slim-16.0.0-rc3/build-asterisk.sh
similarity index 100%
rename from debian-16.0.0-rc3/build-asterisk.sh
rename to debian-stretch-slim-16.0.0-rc3/build-asterisk.sh
diff --git a/debian-16.0.0-rc3/docker-entrypoint.sh b/debian-stretch-slim-16.0.0-rc3/docker-entrypoint.sh
similarity index 100%
rename from debian-16.0.0-rc3/docker-entrypoint.sh
rename to debian-stretch-slim-16.0.0-rc3/docker-entrypoint.sh