diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3ed3202..6985c31a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -73,17 +73,23 @@ jobs:
       - run:
           name: Build OQS nginx
           command: |
-            docker build --build-arg MAKE_DEFINES="-j 18" -t oqs-nginx-img . 
+            docker build --build-arg MAKE_DEFINES="-j 18" -t oqs-nginx-img . &&
+            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg OPENSSL_TAG=master --build-arg LIBOQS_TAG=main --build-arg OQSPROVIDER_TAG=main -t oqs-nginx-img-main . 
           working_directory: nginx
       - run:
           name: Build curl with generic liboqs
           command: |
-            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg LIBOQS_BUILD_DEFINES="-DOQS_OPT_TARGET=generic" -t oqs-curl-generic . 
+            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg LIBOQS_BUILD_DEFINES="-DOQS_OPT_TARGET=generic" -t oqs-curl-generic . &&
+            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg LIBOQS_BUILD_DEFINES="-DOQS_OPT_TARGET=generic" --build-arg OPENSSL_TAG=master --build-arg LIBOQS_TAG=main --build-arg OQSPROVIDER_TAG=main -t oqs-curl-generic-main . 
           working_directory: curl
       - run:
           name: Test Curl with generic liboqs
           command: |
-            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl-generic perftest.sh 
+            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl-generic perftest.sh
+      - run:
+          name: Test Curl with generic liboqs (main/master)
+          command: |
+            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl-generic-main perftest.sh 
       - run:
           name: Test nginx and curl generic
           command: |
@@ -91,6 +97,13 @@ jobs:
             docker run --network nginx-test --detach --rm --name oqs-nginx oqs-nginx-img &&
             sleep 2 &&
             docker run --network nginx-test oqs-curl-generic curl -k https://oqs-nginx:4433
+      - run:
+          name: Test nginx and curl generic (main/master)
+          command: |
+            docker network create nginx-test-main &&
+            docker run --network nginx-test-main --detach --rm --name oqs-nginx-main oqs-nginx-img-main &&
+            sleep 2 &&
+            docker run --network nginx-test-main oqs-curl-generic-main curl -k https://oqs-nginx-main:4433
       - when:
           condition:
             or:
@@ -219,14 +232,14 @@ jobs:
             # The CircleCI executor offers 35 cores, but using
             # all of them might exhaust memory
             docker build --build-arg MAKE_DEFINES="-j 18" -t oqs-curl . &&
-            docker build --build-arg MAKE_DEFINES="-j 18" --target dev -t oqs-curl-dev . 
-            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg OPENSSL_TAG=master --build-arg LIBOQS_TAG=main --build-arg OQSPROVIDER_TAG=main -t oqs-curl-latest . &&
+            docker build --build-arg MAKE_DEFINES="-j 18" --target dev -t oqs-curl-dev . &&
+            docker build --build-arg MAKE_DEFINES="-j 18" --build-arg OPENSSL_TAG=master --build-arg LIBOQS_TAG=main --build-arg OQSPROVIDER_TAG=main -t oqs-curl-main . &&
           working_directory: curl
       - run:
           name: Test Curl (dev)
           command: |
-            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl perftest.sh 
-            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl-latest perftest.sh
+            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl perftest.sh &&
+            docker run -e TEST_TIME=5 -e KEM_ALG=kyber768 -e SIG_ALG=dilithium3 -it oqs-curl-main perftest.sh
       - run:
           name: Test httpd using curl (dev)
           command: |