diff --git a/cloudpebble/Dockerfile b/cloudpebble/Dockerfile
index a343ede1..86cac7e3 100644
--- a/cloudpebble/Dockerfile
+++ b/cloudpebble/Dockerfile
@@ -23,7 +23,7 @@ RUN npm install -g npm jshint
 # Fix broken sources.list (jessie repositories have been archived)
 RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && apt-get install -y --force-yes \
     gettext \
     postgresql-client libpq-dev \
   --no-install-recommends && rm -rf /var/lib/apt/lists/*
diff --git a/docker-compose.yml b/docker-compose.yml
index 2d0a752d..22c1b01f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,6 +54,8 @@ redis:
   image: redis
 postgres:
   image: postgres
+  environment:
+    - POSTGRES_HOST_AUTH_METHOD=trust
 s3:
   image: kuracloud/fake-s3
   ports: