diff --git a/.circleci/config.yml b/.circleci/config.yml
index cca7e4e2c..39d29cf6c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -67,7 +67,7 @@ jobs:
       - run:
           name: Install dependencies
           command: |
-            yarn global add node-gyp &&
+            yarn global add node-gyp@6.1.0 &&
             yarn install --frozen-lockfile
       - save_cache:
           key: dependency-cache-{{ checksum "yarn.lock" }}
diff --git a/Dockerfile b/Dockerfile
index 0b7c8caa4..f947361ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,8 @@ ARG REVISION_HASH
 ENV REVISION_HASH=${REVISION_HASH}
 
 # Install app dependencies and build static assets.
-RUN yarn global add node-gyp && \
+# Pin node-gyp@6.1.0 as newer versions do not build on Node 8.
+RUN yarn global add node-gyp@6.1.0 && \
     yarn install --frozen-lockfile && \
     yarn build && \
     yarn cache clean