diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb78dd0e1..90a4db615 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -87,7 +87,7 @@ jobs:
         run: node_modules/karma/bin/karma start karma.conf.js --single-run --browsers ChromeHeadless
 
       - name: Run BioCollect functional tests
-        run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata feature/cognito
+        run: ./src/main/scripts/runFunctionalTests.sh chromeHeadless /tmp/ecodata feature/pwa2
         continue-on-error: true
         env:
           GITHUB_ACTOR: ${{env.GITHUB_ACTOR}}
@@ -95,16 +95,19 @@ jobs:
 
       - name: Archive log directory
         uses: actions/upload-artifact@v4
+        if: ${{ failure() }}
         with:
           path: ./logs
 
       - name: Clean to remove clover instrumentation
         uses: gradle/gradle-build-action@v2.4.2
+        if: ${{ success() }}
         with:
           arguments: clean
 
       - name: Publish the JAR to the repository
         uses: gradle/gradle-build-action@v2.4.2
+        if: ${{ success() }}
         with:
           arguments: publish
         env:
diff --git a/src/integration-test/resources/wiremock/mappings/jwks.json b/src/integration-test/resources/wiremock/mappings/jwks.json
deleted file mode 100644
index 5e7f699f9..000000000
--- a/src/integration-test/resources/wiremock/mappings/jwks.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "request": {
-    "urlPath": "/jwks",
-    "method": "GET"
-  },
-  "response": {
-    "status": 200,
-    "headers": {
-      "content-Type": "application/json"
-    },
-    "jsonBody": {
-      "keys": [
-        {
-          "alg": "RS256",
-          "e": "AQAB",
-          "kty": "RSA",
-          "n": "gRtjwICtIC_4ae33Ks7S80n32PLFEC4UtBanBFE9Pjzcpp4XWDPgbbOkNC9BZ-Jkyq6aoP_UknfJPI-cIvE6IE96bPNGs6DcfZ73Cq2A9ZXTdiuuOiqMwhEgLKFVRUZZ50calENLGyi96-6lcDnwLehh-kEg7ARITmrBO0iAjFU",
-          "use": "sig"
-        }
-      ]
-    }
-  }
-}
diff --git a/src/test/js/integration/pageobjects/AddBioActivityPage.js b/src/test/js/integration/pageobjects/AddBioActivityPage.js
index cb8be0460..60446593d 100644
--- a/src/test/js/integration/pageobjects/AddBioActivityPage.js
+++ b/src/test/js/integration/pageobjects/AddBioActivityPage.js
@@ -9,7 +9,7 @@ class AddBioActivityPage extends ReloadablePage {
     get imageUploadInput() { return $("input[name=files][accept='image/*']"); }
     get imageTitleInput() { return $(".image-title-input"); }
     get saveButton() { return $("#save"); }
-    get okButtonBootBoxDialog(){ return $(".btn.btn-primary.bootbox-accept")}
+    get okButtonBootBoxDialog(){ return $(".bootbox-accept")}
     get iframe() { return $("iframe"); }
 
     async open(projectActivityId) {
@@ -63,7 +63,7 @@ class AddBioActivityPage extends ReloadablePage {
     }
 
     async dismissBootBoxDialog(){
-        await this.okButtonBootBoxDialog.waitForClickable({ timeout: 10000 });
+        await this.okButtonBootBoxDialog.waitForClickable({ timeout: 20000 });
         await this.okButtonBootBoxDialog.click();
     }
 }