diff --git a/.circleci/config.yml b/.circleci/config.yml
index 962e25d180eb..7c36f10ad969 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,14 @@
 build-steps: &build-steps
   steps:
     - checkout
+    - run:
+        name: Install Node.js 10 on MacOS
+        command: |
+          if [ "$INSTALL_MACOS_NODE" == "true" ]; then
+            echo 'Installing Node.js 10 for MacOS'
+            brew update
+            brew install node@10
+          fi
     - run:
         name: Check for release
         command: |
@@ -117,7 +125,7 @@ build-steps: &build-steps
 
 build-defaults: &build-defaults
   docker:
-    - image: electronbuilds/electron:0.0.7
+    - image: electronbuilds/electron:0.0.8
   <<: *build-steps
 
 version: 2
@@ -241,16 +249,18 @@ jobs:
     environment:
       TARGET_ARCH: x64
       RUN_TESTS: true
+      INSTALL_MACOS_NODE: true
     macos:
-      xcode: "9.0"
+      xcode: "8.3.3"
     <<: *build-steps
 
   electron-osx-x64-release-nightly:
     environment:
       TARGET_ARCH: x64
       RUN_RELEASE_BUILD: true
+      INSTALL_MACOS_NODE: true
     macos:
-      xcode: "9.0"
+      xcode: "8.3.3"
     <<: *build-steps
 
   electron-mas-x64:
@@ -258,8 +268,9 @@ jobs:
       TARGET_ARCH: x64
       MAS_BUILD: 1
       RUN_TESTS: true
+      INSTALL_MACOS_NODE: true
     macos:
-      xcode: "9.0"
+      xcode: "8.3.3"
     <<: *build-steps
 
   electron-mas-x64-release-nightly:
@@ -267,8 +278,9 @@ jobs:
       TARGET_ARCH: x64
       MAS_BUILD: 1
       RUN_RELEASE_BUILD: true
+      INSTALL_MACOS_NODE: true
     macos:
-      xcode: "9.0"
+      xcode: "8.3.3"
     <<: *build-steps
 
 
diff --git a/Dockerfile b/Dockerfile
index 2d74e16915d2..74e5eeedea9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,8 @@ ENV HOME=/home
 RUN chmod a+rwx /home
 
 # Install node.js
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN apt-get update && apt-get install -y nodejs
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN apt-get install -y nodejs
 
 # Install wget used by crash reporter
 RUN apt-get install -y wget
diff --git a/Dockerfile.circleci b/Dockerfile.circleci
index 0cdb1e88c24f..d369c8c64016 100644
--- a/Dockerfile.circleci
+++ b/Dockerfile.circleci
@@ -3,8 +3,8 @@ FROM electronbuilds/libchromiumcontent:0.0.4
 USER root
 
 # Install node.js
-RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
-RUN apt-get update && apt-get install -y nodejs
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+RUN apt-get install -y nodejs
 
 # Install wget used by crash reporter
 RUN apt-get install -y wget