diff --git a/ckan/setup/ckan.ini b/ckan/setup/ckan.ini
index c19f2e3c..c95f84c8 100644
--- a/ckan/setup/ckan.ini
+++ b/ckan/setup/ckan.ini
@@ -42,6 +42,8 @@ beaker.session.secret = TShFJxS41xNdVJAxQsoIEm5zu
 beaker.session.type=ext:database
 #beaker.session.url=postgresql://ckan:ckan@db/ckan
 beaker.session.cookie_expires=true
+beaker.session.secure = True
+beaker.session.samesite = Strict
 beaker.session.url = $CKAN___BEAKER__SESSION__URL
 beaker.session.timeout=900
 
diff --git a/e2e/cypress/integration/dataset.cy.js b/e2e/cypress/integration/dataset.cy.js
index 219dd11e..20085bbe 100644
--- a/e2e/cypress/integration/dataset.cy.js
+++ b/e2e/cypress/integration/dataset.cy.js
@@ -63,10 +63,10 @@ describe('Dataset', () => {
         // the button is visible
         cy.get('#contact-btn').should('be.visible').click();
         // the modal is invisible
-        cy.get('#fba-modal-dialog').should('be.visible');
+        cy.get('.fba-modal-dialog').should('be.visible');
         cy.get('#fba_location_code').should('have.value', 'ek500-water-column-sonar-data-collected-during-al0001');
         // can hide the modal
-        cy.get('a[class="fba-modal-close"]').click();
-        cy.get('#fba-modal-dialog').should('not.be.visible');
+        cy.get('a.fba-modal-close').click();
+        cy.get('.fba-modal-dialog').should('not.be.visible');
     });
 });