diff --git a/daint.cscs.ch/gpu/computer-setup.yml b/daint.cscs.ch/gpu/computer-setup.yml
index cc18e8e..d9673be 100644
--- a/daint.cscs.ch/gpu/computer-setup.yml
+++ b/daint.cscs.ch/gpu/computer-setup.yml
@@ -26,7 +26,7 @@ metadata:
         <p>
             <a href="https://user.cscs.ch/access/running/piz_daint/" target="_blank">Piz Daint</a> supercomputer at CSCS Lugano, Switzerland, hybrid partition. <br>
             The CSCS now require MFA to login, please check the <a href="https://user.cscs.ch/access/auth/mfa/" target="_blank">MFA CSCS documentation</a> for details on how to set up SSH connection. <br>
-            If you are using the AiiDAlab, please use the <a href="https://github.com/aiidalab/aiidalab-mfa-cscs" target="_blank">MFA CSCS plugin</a> to set SSH connection.
+            If you are using the AiiDAlab, <a href="/apps/apps/home/open_app.ipynb?app=mfa-cscs&redirect=apps/apps/home/start.ipynb" target="_blank">use the MFA CSCS app</a> to set SSH connection.
         </p>
     template_variables:
         label:
diff --git a/daint.cscs.ch/mc/computer-configure.yml b/daint.cscs.ch/mc/computer-configure.yml
index 0fc0eca..0fdb931 100644
--- a/daint.cscs.ch/mc/computer-configure.yml
+++ b/daint.cscs.ch/mc/computer-configure.yml
@@ -1,7 +1,9 @@
 ---
 username: '{{ username }}'
-safe_interval: 60
-proxy_command: ssh -q -Y {{ username }}@ela.cscs.ch netcat daint.cscs.ch 22
+safe_interval: 10
+proxy_command: ssh -q -Y {username}@ela.cscs.ch netcat daint.cscs.ch 22
+key_filename: ~/.ssh/cscs-key
+key_policy: AutoAddPolicy
 metadata:
     tooltip: |
         <p>
diff --git a/daint.cscs.ch/mc/computer-setup.yml b/daint.cscs.ch/mc/computer-setup.yml
index 12da722..fbf1bb3 100644
--- a/daint.cscs.ch/mc/computer-setup.yml
+++ b/daint.cscs.ch/mc/computer-setup.yml
@@ -23,7 +23,7 @@ metadata:
         <p>
             <a href="https://user.cscs.ch/access/running/piz_daint/" target="_blank">Piz Daint</a> supercomputer at CSCS Lugano, Switzerland, hybrid partition. <br>
             The CSCS now require MFA to login, please check the <a href="https://user.cscs.ch/access/auth/mfa/" target="_blank">MFA CSCS documentation</a> for details on how to set up SSH connection. <br>
-            If you are using the AiiDAlab, please use the <a href="https://github.com/aiidalab/aiidalab-mfa-cscs" target="_blank">MFA CSCS plugin</a> to set SSH connection.
+            If you are using the AiiDAlab, <a href="/apps/apps/home/open_app.ipynb?app=mfa-cscs&redirect=apps/apps/home/start.ipynb" target="_blank">use the MFA CSCS app</a> to set SSH connection.
         </p>
     template_variables:
         label: