diff --git a/.github/workflows/build-tests.yml b/.github/workflows/build-tests.yml
index 5f50ec8e9..18d323a20 100644
--- a/.github/workflows/build-tests.yml
+++ b/.github/workflows/build-tests.yml
@@ -91,7 +91,7 @@ jobs:
     needs: wait-for-build
     runs-on: ubuntu-latest
     env:
-      SHARED: /tmp/workdir/pki
+      SHARED: /tmp/workdir/jss
     steps:
     - name: Clone repository
       uses: actions/checkout@v4
@@ -171,7 +171,7 @@ jobs:
     needs: wait-for-build
     runs-on: ubuntu-latest
     env:
-      SHARED: /tmp/workdir/pki
+      SHARED: /tmp/workdir/jss
     steps:
     - name: Clone repository
       uses: actions/checkout@v4
diff --git a/.github/workflows/pki-ca-test.yml b/.github/workflows/pki-ca-test.yml
index 53a64123f..bba527ba0 100644
--- a/.github/workflows/pki-ca-test.yml
+++ b/.github/workflows/pki-ca-test.yml
@@ -75,7 +75,12 @@ jobs:
       - name: Initialize PKI client
         run: |
           docker exec pki pki-server cert-export ca_signing --cert-file ca_signing.crt
-          docker exec pki pki client-cert-import ca_signing --ca-cert ca_signing.crt
+
+          docker exec pki pki nss-cert-import \
+              --cert ca_signing.crt \
+              --trust CT,C,C \
+              ca_signing
+
           docker exec pki pki info
 
       - name: Check CA certs
@@ -86,7 +91,7 @@ jobs:
 
       - name: Check CA admin
         run: |
-          docker exec pki pki client-cert-import \
+          docker exec pki pki pkcs12-import \
               --pkcs12 /root/.dogtag/pki-tomcat/ca_admin_cert.p12 \
               --pkcs12-password Secret.123
           docker exec pki pki -n caadmin ca-user-show caadmin
diff --git a/.github/workflows/pki-tps-test.yml b/.github/workflows/pki-tps-test.yml
index a2db71252..6847be410 100644
--- a/.github/workflows/pki-tps-test.yml
+++ b/.github/workflows/pki-tps-test.yml
@@ -81,10 +81,16 @@ jobs:
       - name: Check TPS admin
         run: |
           docker exec pki pki-server cert-export ca_signing --cert-file ca_signing.crt
-          docker exec pki pki client-cert-import ca_signing --ca-cert ca_signing.crt
+
+          docker exec pki pki nss-cert-import \
+              --cert ca_signing.crt \
+              --trust CT,C,C \
+              ca_signing
+
           docker exec pki pki pkcs12-import \
               --pkcs12 /root/.dogtag/pki-tomcat/ca_admin_cert.p12 \
               --pkcs12-password Secret.123
+
           docker exec pki pki -n caadmin tps-user-show tpsadmin
 
       - name: Set up TPS authentication