diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90d541331..7d66efb77 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ version: 2
         command: make -j && make check
     - run:
         name: Run tests
-        command: mkdir test-results && python3 -m pytest --verbose --junitxml=test-results/pytest/results.xml
+        command: mkdir test-results && python3 -m pytest --verbose --junitxml=test-results/pytest/results.xml --numprocesses=auto
     - store_test_results: # Note that this command will fail when running CircleCI locally, that is expected behaviour
         path: test-results
 
@@ -21,69 +21,69 @@ jobs:
   debian-buster-amd64:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:amd64-buster-0.0.4
+      IMAGE: dstebila/liboqs:debian-buster-amd64-0.1.0
       CONFIGURE_ARGS: --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
       SKIP_TESTS: style
   ubuntu-trusty-x86_64-gcc47:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-trusty-0.0.1
+      IMAGE: dstebila/liboqs:ubuntu-trusty-x86_64-0.1.0
       CC: gcc-4.7
       CONFIGURE_ARGS: --disable-sig-picnic  --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
       SKIP_TESTS: style
   ubuntu-trusty-x86_64-gcc48:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-trusty-0.0.1
+      IMAGE: dstebila/liboqs:ubuntu-trusty-x86_64-0.1.0
       CC: gcc-4.8
       CONFIGURE_ARGS: --disable-sig-picnic --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
       SKIP_TESTS: style
   ubuntu-xenial-x86_64-gcc49:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-4.9
       CONFIGURE_ARGS: --disable-sig-picnic --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-xenial-x86_64-gcc5:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-5
       CONFIGURE_ARGS: --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-xenial-x86_64-gcc6:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-6
       CONFIGURE_ARGS: --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-xenial-x86_64-gcc7:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-7
       CONFIGURE_ARGS: --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-xenial-x86_64-gcc8:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-8
       CONFIGURE_ARGS: --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-xenial-x86_64-gcc8-noopenssl:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-8
       CONFIGURE_ARGS: --without-openssl --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-xenial-x86_64-gcc8-noshared:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-xenial-0.0.5
+      IMAGE: dstebila/liboqs:ubuntu-xenial-x86_64-0.1.0
       CC: gcc-8
       CONFIGURE_ARGS: --disable-shared --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
   ubuntu-bionic-x86_64-gcc7:
     <<: *oqsjob
     environment:
-      IMAGE: dstebila/liboqs:x86_64-bionic-0.0.1
+      IMAGE: dstebila/liboqs:ubuntu-bionic-x86_64-0.1.0
       CC: gcc-7
       CONFIGURE_ARGS: --disable-kem-bike # FIXME: BIKE doesn't work on CircleCI due to symbol _CMP_LT_OS not being defined
       SKIP_TESTS: style