diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac11d3930..6a78b3ea3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,10 @@
+# TODO: Figure out a way to use nvm in the linux build
 linux:
-  image: tutum/curl:latest
+  image: node:8.10.0
   tags:
     - docker
   script:
     - whoami
-    - touch ~/.bash_profile
-    - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-    - export NVM_DIR=~/.nvm
-    - chmod 755 ~/.nvm/nvm.sh
-    - source ~/.nvm/nvm.sh
-    - nvm install
     - node -v
     - yarn -v
     - yarn install --frozen-lockfile
@@ -47,8 +42,6 @@ windows:
     # install
     - set PATH=%PATH%;C:\Users\Administrator\AppData\Local\nvs\
     - set SIGNAL_ENV=production
-    - echo %username%
-    - echo %PATH%
     - set /p NVMRC_VER=<.nvmrc
     - call nvs add %NVMRC_VER%
     - call nvs use %NVMRC_VER%
@@ -56,13 +49,7 @@ windows:
     - call yarn install --frozen-lockfile
     # build
     - call yarn generate
-    # - yarn lint-windows
-    # - yarn lint-deps
-    # - call yarn test-node
-    # - call yarn nsp check
     - call node build\grunt.js
-    # - type package.json | findstr /v certificateSubjectName > temp.json
-    # - move temp.json package.json
     - call yarn prepare-beta-build
     - call node_modules\.bin\build --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never
     - call node build\grunt.js test-release:win