diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 83b9bc5..ff63153 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - run: cp development.env.template development.env
-    - run: docker-compose build
-    - run: docker-compose up -d db
-    - run: docker-compose run --rm web bash -lc 'bin/rails db:create db:migrate'
-    - run: docker-compose run --rm web bash -lc 'bin/rails test'
+    - run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml build
+    - run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml up -d db
+    - run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml run --rm web bash -lc 'bin/rails db:create db:migrate'
+    - run: docker-compose --file docker-compose.yml --file docker-compose.ci.yml run --rm web bash -lc 'bin/rails test'
diff --git a/Dockerfile b/Dockerfile
index 599dec8..1935874 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
-FROM ruby:2.5.0
+FROM ruby:2.7.1
 
-# Note: must install newer nodejs to work around
-# https://github.com/docker-library/ruby/issues/226
 RUN apt-get update -qq &&\
   curl -sL https://deb.nodesource.com/setup_10.x | bash - &&\
   apt-get install -y build-essential libpq-dev nodejs &&\
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a484a8..5e1ce48 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,6 +298,3 @@ DEPENDENCIES
   spring-watcher-listen (~> 2.0.0)
   uglifier (>= 1.3.0)
   web-console (>= 3.3.0)
-
-BUNDLED WITH
-   1.16.1
diff --git a/docker-compose.ci.yml b/docker-compose.ci.yml
new file mode 100644
index 0000000..cb29108
--- /dev/null
+++ b/docker-compose.ci.yml
@@ -0,0 +1,3 @@
+web:
+  env_file:
+    - development.env.template
diff --git a/docker-compose.yml b/docker-compose.yml
index dab98b5..b49df1d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,7 @@
 db:
   image: postgres:10
+  environment:
+    POSTGRES_HOST_AUTH_METHOD: trust
   ports:
     - '5432:5432'