diff --git a/.travis.yml b/.travis.yml
index 314abc73..8b83db2a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ jobs:
       install:
         - docker-compose build
       script:
-        - docker-compose up -d
+        - docker-compose up
         - sleep 15 # Wait for cluster to become ready, TODO: do not sleep
         - HEADERS="$(curl -I -s http://localhost:3000/)"
         - STATUS="$(echo $HEADERS | head -n1)"
diff --git a/docker/Dockerfile.postgres b/docker/Dockerfile.postgres
index 720bdff8..3b25b802 100644
--- a/docker/Dockerfile.postgres
+++ b/docker/Dockerfile.postgres
@@ -1,6 +1,9 @@
 FROM postgres:10
 
 ENV POSTGRES_USER postgres
+# Do not require a PostgreSQL superuser password.
+# See https://github.com/docker-library/postgres/issues/681.
+ENV POSTGRES_HOST_AUTH_METHOD trust
 
 ADD ./config/sql /config/sql
 ADD ./docker/entrypoint.postgres.sh /entrypoint.sh
diff --git a/kubernetes/README.md b/kubernetes/README.md
index 163e9cd7..1c62f469 100644
--- a/kubernetes/README.md
+++ b/kubernetes/README.md
@@ -17,9 +17,9 @@ $ kubectl create configmap invidious-postgresql-init \
   --from-file=../config/sql/session_ids.sql \
   --from-file=../config/sql/nonces.sql \
   --from-file=../config/sql/annotations.sql \
+  --from-file=../config/sql/privacy.sql \
   --from-file=../config/sql/playlists.sql \
-  --from-file=../config/sql/playlist_videos.sql \
-  --from-file=../config/sql/privacy.sql
+  --from-file=../config/sql/playlist_videos.sql
 
 # Install Helm app to your Kubernetes cluster
 $ helm install invidious ./