diff --git a/Jenkinsfile b/Jenkinsfile
index 4162c6f2..c441ecff 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,8 +32,8 @@ pipeline {
 
         stage("Deploy to staging") {
             steps {
-                sh "ssh ${JENKINS_AT_STAGING} rm -fr /app/env.list /app/start.sh"
-                sh "scp ./docker/env.list ./docker/start.sh ${JENKINS_AT_STAGING}:/app"
+                sh "ssh ${JENKINS_AT_STAGING} rm -fr /app/start.sh"
+                sh "scp ./docker/start.sh ${JENKINS_AT_STAGING}:/app"
                 sh "ssh ${JENKINS_AT_STAGING} \"cd /app && ./start.sh ${env.GIT_COMMIT}\""
             }
         }
diff --git a/front-end/tests/e2e/specs/0.register.e2e.js b/front-end/tests/e2e/specs/0.register.e2e.js
index ec603af7..eda4ea5b 100644
--- a/front-end/tests/e2e/specs/0.register.e2e.js
+++ b/front-end/tests/e2e/specs/0.register.e2e.js
@@ -29,7 +29,7 @@ module.exports = {
 
     registerPage
       .navigate()
-      .waitForElementVisible('@app', 500)
+      .waitForElementVisible('@app', 30000)
       .assert.visible('@usernameInput')
       .assert.visible('@emailAddressInput')
       .assert.visible('@firstNameInput')
diff --git a/front-end/tests/e2e/specs/1.login.e2e.js b/front-end/tests/e2e/specs/1.login.e2e.js
index f715868d..c020bbf3 100644
--- a/front-end/tests/e2e/specs/1.login.e2e.js
+++ b/front-end/tests/e2e/specs/1.login.e2e.js
@@ -6,7 +6,7 @@ module.exports = {
 
     loginPage
       .navigate()
-      .waitForElementVisible('@app', 500)
+      .waitForElementVisible('@app', 30000)
       .assert.visible('@usernameInput')
       .assert.visible('@passwordInput')
       .assert.visible('@submitButton')
@@ -20,7 +20,7 @@ module.exports = {
       .navigate()
       .login('not-exist', 'incorrect')
 
-    browser.pause(500)
+    browser.pause(2000)
 
     loginPage
       .assert.visible('@formError')