diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3ab1372..8a43626b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,6 +1,6 @@
-version: 2
+version: 2.0
 jobs:
-  build:
+  build_ka10:
     docker:
       - image: debian
     environment:
@@ -11,7 +11,44 @@ jobs:
       - run:
           name: build
           command: "make EMULATOR=$EMULATOR"
-          no_output_timeout: 60m
-          timeout: 60m
+          no_output_timeout: 30m
+          timeout: 120m
       - store_artifacts:
           path: out
+  build_klh10:
+    docker:
+      - image: debian
+    environment:
+      EMULATOR: "klh10"
+    steps:
+      - checkout
+      - run: sh -ex build/dependencies.sh install_linux
+      - run:
+          name: build
+          command: "make EMULATOR=$EMULATOR"
+          no_output_timeout: 30m
+          timeout: 120m
+      - store_artifacts:
+          path: out
+  build_simh:
+    docker:
+      - image: debian
+    environment:
+      EMULATOR: "simh"
+    steps:
+      - checkout
+      - run: sh -ex build/dependencies.sh install_linux
+      - run:
+          name: build
+          command: "make EMULATOR=$EMULATOR"
+          no_output_timeout: 30m
+          timeout: 120m
+      - store_artifacts:
+          path: out
+workflows:
+  version: 2
+  build:
+    jobs:
+      - build_ka10
+      - build_klh10
+      - build_simh