diff --git a/.appveyor.yml b/.appveyor.yml
index 5dbfd5662d7..b0a5e290486 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -49,10 +49,8 @@ install:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 build_script:
+  - git submodule update --init
   - cargo build --release --verbose
-  # Now we build wapm
-  - git submodule init
-  - git submodule update
   # Cache wapm cli target in dir above to prevent breaking git submodule on windows
   - if not exist wapm-cli-target mkdir wapm-cli-target
   - move wapm-cli-target wapm-cli
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3761f073e3c..e02dd9a554b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -27,6 +27,10 @@ jobs:
     <<: *run_with_build_env_vars
     steps:
       - checkout
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule update --init
       - restore_cache:
           keys:
             - v8-lint-{{ arch }}-{{ checksum "Cargo.lock" }}
@@ -57,6 +61,10 @@ jobs:
     <<: *run_with_build_env_vars
     steps:
       - checkout
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule update --init
       - restore_cache:
           keys:
             - v8-test-cargo-cache-linux-stable-{{ arch }}-{{ checksum "Cargo.lock" }}
@@ -87,6 +95,10 @@ jobs:
     <<: *run_with_build_env_vars
     steps:
       - checkout
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule update --init
       - restore_cache:
           keys:
             - v8-test-cargo-cache-linux-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
@@ -118,6 +130,10 @@ jobs:
       xcode: "9.0"
     steps:
       - checkout
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule update --init
       - restore_cache:
           keys:
             - v8-cargo-cache-darwin-nightly-{{ arch }}-{{ checksum "Cargo.lock" }}
@@ -172,6 +188,10 @@ jobs:
       - image: circleci/rust:latest
     steps:
       - checkout
+      - run:
+          name: "Pull Submodules"
+          command: |
+            git submodule update --init
       - run:
           name: "Pull dependencies"
           command: |