diff --git a/.github/workflows/ipa-basic-test.yml b/.github/workflows/ipa-basic-test.yml
index c68a3db5ca6..b96493b8355 100644
--- a/.github/workflows/ipa-basic-test.yml
+++ b/.github/workflows/ipa-basic-test.yml
@@ -253,9 +253,6 @@ jobs:
         run: |
           docker exec ipa cat /var/log/dirsrv/slapd-EXAMPLE-COM/security
 
-      - name: Remove IPA server
-        run: docker exec ipa ipa-server-install --uninstall -U
-
       - name: Check IPA CA install log
         if: always()
         run: |
@@ -284,6 +281,9 @@ jobs:
           tests/bin/ipa-artifacts-save.sh ipa
         continue-on-error: true
 
+      - name: Remove IPA server
+        run: docker exec ipa ipa-server-install --uninstall -U
+
       - name: Upload artifacts
         if: always()
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/ipa-kra-test.yml b/.github/workflows/ipa-kra-test.yml
index 50951ed5da5..f964edc6cde 100644
--- a/.github/workflows/ipa-kra-test.yml
+++ b/.github/workflows/ipa-kra-test.yml
@@ -252,9 +252,6 @@ jobs:
         run: |
           docker exec ipa cat /var/log/dirsrv/slapd-EXAMPLE-COM/security
 
-      - name: Remove IPA server
-        run: docker exec ipa ipa-server-install --uninstall -U
-
       - name: Check IPA CA install log
         if: always()
         run: |
@@ -293,6 +290,9 @@ jobs:
           tests/bin/ipa-artifacts-save.sh ipa
         continue-on-error: true
 
+      - name: Remove IPA server
+        run: docker exec ipa ipa-server-install --uninstall -U
+
       - name: Upload artifacts
         if: always()
         uses: actions/upload-artifact@v4