diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 74137bd5..1dab562b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,13 @@ jobs:
     if: github.repository == 'noaa-oar-arl/monetio'
     strategy:
       matrix:
-        python-version: ["3.6", "3.8", "3.10"]
+        python-version: ["3.8", "3.10"]
+        aqs: [false]
+        include:
+          - python-version: "3.6"
+            aqs: true
+          - python-version: "3.10"
+            aqs: true
     defaults:
       run:
         shell: bash -l {0}
@@ -24,17 +30,35 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up Python (micromamba)
+      - name: Set up Python (micromamba) [${{ matrix.python-version }}, no AQS]
+        if: matrix.python-version != '3.6' && matrix.aqs == false
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-file: environment-dev.yml
+          cache-environment: true
+          create-args: >-
+            python=${{ matrix.python-version }}
+
+      - name: Set up Python (micromamba) [${{ matrix.python-version }}, AQS]
+        if: matrix.python-version != '3.6' && matrix.aqs == true
         uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: environment-dev.yml
           cache-environment: true
           create-args: >-
             python=${{ matrix.python-version }}
+            'openssl <3'
 
-      - name: Adjust conda env for Python 3.6
+      - name: Set up Python (micromamba) [3.6, AQS]
         if: matrix.python-version == '3.6'
-        run: micromamba install attrs=22.2.0
+        uses: mamba-org/setup-micromamba@v1
+        with:
+          environment-file: environment-dev.yml
+          cache-environment: true
+          create-args: >-
+            python=${{ matrix.python-version }}
+            attrs=22.2.0
+            'openssl <3'
 
       - name: Test with pytest
         run: pytest -n auto -v
@@ -44,15 +68,11 @@ jobs:
           pip install https://github.com/noaa-oar-arl/pytspack/archive/master.zip
           pytest -n auto -v -k with_pytspack
 
-      - name: Downgrade OpenSSL and test AQS
+      - name: Test AQS
+        if: matrix.aqs == true
         run: |
-          micromamba install 'openssl <3'
           pytest -n auto -v -k aqs
 
-      - name: Restore current openssl
-        if: success() || failure()
-        run: micromamba update openssl
-
   docs:
     name: Check docs build
     runs-on: ubuntu-latest