diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index 050c87e..b279dda 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Disassembler <disassembler@dasm.cz>
 RUN \
  # Create OS user (which will be picked up later by apk add)
  addgroup -S -g 3306 mysql \
- && adduser -S -u 3306 -h /var/lib/mysql -s /bin/nologin -g mysql -G mysql mysql \
+ && adduser -S -u 3306 -h /var/lib/mysql -s /bin/false -g mysql -G mysql mysql \
  # Install MariaDB
  && apk --no-cache add mariadb mariadb-client \
  # Create socket directory
diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile
index a364cbf..16934f8 100644
--- a/rabbitmq/Dockerfile
+++ b/rabbitmq/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Disassembler <disassembler@dasm.cz>
 RUN \
  # Create OS user (which will be picked up later by apk add)
  addgroup -S -g 5672 rabbitmq \
- && adduser -S -u 5672 -h /usr/lib/rabbitmq -s /sbin/nologin -g rabbitmq -G rabbitmq rabbitmq \
+ && adduser -S -u 5672 -h /usr/lib/rabbitmq -s /bin/false -g rabbitmq -G rabbitmq rabbitmq \
  # Add edge/testing repository
  && echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/testing' >>/etc/apk/repositories \
  # Install RabbitMQ