diff --git a/.travis.yml b/.travis.yml
index 4b0051c..af8af4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,9 @@ before_script:
   - docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mailman-web
   - docker-compose ps
   - sleep 30
+  - docker ps
+  - docker logs mailman-web
+  - docker logs mailman-core
 
 script:
    - tests/core.sh
diff --git a/core/Dockerfile b/core/Dockerfile
index a02a7f3..3102de6 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER Abhilash Raj
 # from the Gitlab.
 RUN apk update \
     && apk add --virtual build-deps gcc python3-dev musl-dev wget \
-	&& apk add postgresql-dev bash \
+	&& apk add postgresql-dev bash su-exec \
     && wget -O mailman.zip https://gitlab.com/mailman/mailman/repository/archive.zip?ref=master  \
 	&& wget -O mailman_hyperkitty.zip https://gitlab.com/mailman/mailman-hyperkitty/repository/archive.zip?ref=master  \
 	&& pip install mailman.zip mailman_hyperkitty.zip psycopg2 \
@@ -24,4 +24,6 @@ ENTRYPOINT ["/opt/run.sh"]
 
 ENV MAILMAN_CONFIG_FILE /config/mailman.cfg
 
+RUN adduser -S mailman
+
 CMD ["/usr/local/bin/master"]
diff --git a/core/assets/run.sh b/core/assets/run.sh
index b89194f..9c63e60 100755
--- a/core/assets/run.sh
+++ b/core/assets/run.sh
@@ -122,4 +122,7 @@ base_url: $HYPERKITTY_URL
 api_key: $HYPERKITTY_API_KEY
 EOF
 
-exec "$@"
+# Now chown the places where mailman wants to write stuff.
+chown -R mailman /opt/mailman
+
+exec su-exec mailman "$@"