diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a483e0a4e5..5ea07d2a2f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -318,9 +318,22 @@ jobs:
         run: |
           scripts/install_gitea.sh
 
+      - name: Setup Deno
+        uses: denoland/setup-deno@v1
+        with:
+          deno-version: v1.x
+
       - name: Pre e2e
+        env:
+          FRONTEND_DEPLOY_IMAGE_TAG: ':${{ needs.get_version.outputs.frontend_sha }}'
+          PROCESSOR_DEPLOY_IMAGE_TAG: ':${{ needs.get_version.outputs.processor_sha }}'
+          NGINX_DEPLOY_IMAGE_TAG: ':${{ needs.get_version.outputs.nginx_sha }}'
+          GITEA_DEPLOY_IMAGE_TAG: ':${{ needs.get_version.outputs.gitea_sha }}'
         shell: bash
-        run: scripts/pre_e2e.sh
+        run: |
+          token=$(scripts/pre_e2e.sh)
+          docker-compose stop
+          echo "CYPRESS_GITEA_ADMIN_TOKEN=${token}" >> $GITHUB_ENV
 
       - name: e2e
         timeout-minutes: 40
diff --git a/README.md b/README.md
index 0877913273..bdbb897b15 100644
--- a/README.md
+++ b/README.md
@@ -335,22 +335,39 @@ We configure our staging servers using [Ansible](https://docs.ansible.com/ansibl
 ```console
 docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.e2e.yml up e2e
 ```
+##
+
+> Note: The GITEA_ADMIN_TOKEN is needed because the Gitea service is hidden and inaccessible to other containers.
+
+> Before running e2e tests locally make sure to source the `.env` file: ` set -o allexport && source .env && set +o allexport`
+  
 
 ### Without docker
 
+Make sure that npm packages are installed
+
+```console
+yarn --cwd e2e 
+```
+then you can run the tests with
+
 ```console
-cd e2e
-yarn
-yarn e2e
+yarn --cwd e2e e2e --env GITEA_ADMIN_TOKEN=$(scripts/pre_e2e.sh) 
 ```
 
 ### GUI
+Make sure that npm packages are installed
 
 ```console
-cd e2e
-yarn
-yarn gui
+yarn --cwd e2e
 ```
+then you can open the GUI with
+
+```console
+yarn --cwd e2e gui --env GITEA_ADMIN_TOKEN=$(scripts/pre_e2e.sh)
+```
+
+
 
 ### Recording new visual tests:
 
diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml
index 741603be04..a7e063296d 100644
--- a/docker-compose.e2e.yml
+++ b/docker-compose.e2e.yml
@@ -22,6 +22,7 @@ services:
       - COMMIT_INFO_SHA=${COMMIT_INFO_SHA}
       - COMMIT_INFO_TIMESTAMP=${COMMIT_INFO_TIMESTAMP}
       - COMMIT_INFO_BRANCH=${COMMIT_INFO_BRANCH}
+      - CYPRESS_GITEA_ADMIN_TOKEN=${CYPRESS_GITEA_ADMIN_TOKEN}
     depends_on:
       - nginx
     working_dir: /e2e
diff --git a/e2e/cypress/integration/IBOM.spec.js b/e2e/cypress/integration/IBOM.spec.js
index 2fa4f0dfae..4bb214917d 100644
--- a/e2e/cypress/integration/IBOM.spec.js
+++ b/e2e/cypress/integration/IBOM.spec.js
@@ -10,28 +10,17 @@ describe('IBOM page', () => {
   })
 
   it('should redirect to project page (multi project)', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     const multiProjectsNames = ['alpha-spectrometer', 'electron-detector']
     const multiProjectsRepoName = 'DIY_particle_detector'
     const syncedRepoUrlMultiProjects =
       'https://github.com/kitspace-test-repos/DIY_particle_detector'
 
-    /* Migrate the multiproject repo */
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
+
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 120_000 }).as('projectCards')
 
@@ -39,7 +28,7 @@ describe('IBOM page', () => {
 
     // Go to IBOM page for a subproject
     const subProjectName = multiProjectsNames[0]
-    cy.visit(`${username}/${multiProjectsRepoName}/${subProjectName}/IBOM`)
+    cy.visit(`${user.username}/${multiProjectsRepoName}/${subProjectName}/IBOM`)
 
     // Click on the title
     cy.get('#title').click()
@@ -47,36 +36,26 @@ describe('IBOM page', () => {
     // It should redirect to the subproject page
     cy.url({ timeout: 20_000 }).should(
       'eq',
-      `${
-        Cypress.config().baseUrl
-      }/${username}/${multiProjectsRepoName}/${subProjectName}`,
+      `${Cypress.config().baseUrl}/${
+        user.username
+      }/${multiProjectsRepoName}/${subProjectName}`,
     )
   })
 
   it('should redirect to the project page (normal project)', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    /* Migrate the normal repo */
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/CH330_Hardware'
     const normalRepoName = 'CH330_Hardware'
+    cy.importRepo(syncedRepoUrl, normalRepoName, user)
 
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
-
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${normalRepoName}`)
+    cy.forceVisit(`/${user.username}/${normalRepoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
     // Go to IBOM page for a single (not multi) project
     cy.get('[data-cy=ibom]').should('be.visible')
-    cy.visit(`${username}/${normalRepoName}/_/IBOM`)
+    cy.visit(`${user.username}/${normalRepoName}/_/IBOM`)
 
     // Click on the title
     cy.get('#title').click()
@@ -84,24 +63,20 @@ describe('IBOM page', () => {
     // It should redirect to the project page
     cy.url({ timeout: 20_000 }).should(
       'eq',
-      `${Cypress.config().baseUrl}/${username}/${normalRepoName}`,
+      `${Cypress.config().baseUrl}/${user.username}/${normalRepoName}`,
     )
   })
 
   it('should not render `Assembly Guide` button for projects with `ibom-enabled: false', () => {
-    const { username, email, password } = getFakeUser()
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
+    const user = getFakeUser()
     /* Migrate a repo with `omit-ibom` set to `true` */
-    cy.forceVisit('/projects/new')
+    const repoName = 'solarbird_shenzen_rdy'
     const IBOMDisabledRepoURL =
       'https://github.com/kitspace-test-repos/solarbird_shenzen_rdy'
-    const repoName = 'solarbird_shenzen_rdy'
-    cy.get('[data-cy=sync-field]').type(IBOMDisabledRepoURL)
-    cy.get('button').contains('Sync').click()
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.importRepo(IBOMDisabledRepoURL, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
+    cy.url({ timeout: 60_000 }).should('contain', `${user.username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 100_000 }).should('be.visible')
     // The ibom button shouldn't get rendered for this project.
diff --git a/e2e/cypress/integration/IBOM.visual.spec.js b/e2e/cypress/integration/IBOM.visual.spec.js
index 2cd332f887..3fd5319e94 100644
--- a/e2e/cypress/integration/IBOM.visual.spec.js
+++ b/e2e/cypress/integration/IBOM.visual.spec.js
@@ -2,27 +2,17 @@ import { getFakeUser } from '../support/getFakeUser'
 
 describe.skip('Regression test for IBOM ', () => {
   before(() => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'CH330_Hardware'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/CH330_Hardware'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
-    // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
-
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.importRepo(syncedRepoUrl, repoName, user)
+    cy.forceVisit(`/${user.username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
-    cy.visit(`${username}/${repoName}/IBOM`)
+    cy.visit(`${user.username}/${repoName}/IBOM`)
 
     // Wait until the ibom is visible
     cy.get('.topmostdiv').should('be.visible')
diff --git a/e2e/cypress/integration/authRedirects.spec.js b/e2e/cypress/integration/authRedirects.spec.js
deleted file mode 100644
index 2efe14041a..0000000000
--- a/e2e/cypress/integration/authRedirects.spec.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import { getFakeUser } from '../support/getFakeUser'
-
-describe('Authentication redirects', () => {
-  const { username, email, password } = getFakeUser()
-
-  before(() => {
-    /*
-     * The purpose of this isn't actually visiting the homepage.
-     * Sometimes, the frontend has a slow startup time which results in a random failure.
-     */
-    cy.visit('/')
-    cy.createUser(username, email, password)
-  })
-
-  it("should redirect unauthenticated users to '/login' when accessing require sign in page (server)", () => {
-    // Clear the cookies to make sure the user isn't authenticated
-    cy.clearCookies()
-    // `/project/new` is marked as require sign in.
-    cy.forceVisit('/projects/new')
-    cy.get('[data-cy=login-grid]').should('be.visible')
-  })
-
-  it("should redirect unauthenticated users to '/login' when accessing require sign in page (client)", () => {
-    // Clear the cookies to make sure the user isn't authenticated
-    cy.clearCookies()
-    cy.forceVisit('/')
-    // navigate to `/projects/new`with client-side interactions.
-    cy.get('[data-cy=add-project]').click({ timeout: 10000 })
-    // `/project/new` is marked as require sign in.
-    cy.get('[data-cy=login-grid]').should('be.visible')
-  })
-
-  /*
-   ! There is no (client) version of this because there is no user interaction which will lead to redirecting to `/login`
-   ! when the user is already logged in.
-   */
-  it('should redirect authenticated users to homepage when accessing reqSignOut page (server)', () => {
-    // Sign in
-    cy.visit('/login')
-    cy.signIn(username, password)
-    cy.get('[data-cy=user-menu]')
-
-    // `/login` is marked as `reqSignOut`.
-    cy.visit('/login')
-    cy.get('[data-cy=cards-grid]').should('be.visible')
-  })
-})
-
-describe('Redirect after login', () => {
-  const { username, email, password } = getFakeUser()
-
-  before(() => {
-    cy.visit('/')
-    cy.createUser(username, email, password)
-  })
-
-  beforeEach(() => {
-    // deauthenticate the user and reload the page to update the CSRF token
-    cy.clearCookies()
-    cy.reload()
-  })
-
-  it('should redirect to homepage if there is no redirect query', () => {
-    cy.visit('/login')
-    // sign the user in.
-    cy.signIn(username, password)
-
-    // After a successful login the user is redirect to the homepage.
-    cy.url().should('eq', `${Cypress.config().baseUrl}${Cypress.env('home_path')}`)
-  })
-
-  it('should redirect to correct page if there is a redirect query', () => {
-    const pageClickFrom = 'projects/new'
-
-    cy.visit(pageClickFrom)
-
-    // sign the user in.
-    cy.signIn(username, password)
-    // redirect to the page in the redirect query parameter
-    cy.url().should('eq', `http://kitspace.test:3000/${pageClickFrom}`)
-  })
-
-  it("should redirect to the `pathname` if it isn't `login`", () => {
-    const requireSignInPage = '/settings'
-
-    cy.visit(requireSignInPage)
-
-    cy.get('[data-cy=login-grid]').should('be.visible')
-    cy.signIn(username, password)
-    cy.url().should('eq', `http://kitspace.test:3000${requireSignInPage}`)
-
-    cy.get('h1').contains('Settings')
-  })
-})
-
-describe('Redirect after sign-up', () => {
-  it('should redirect to homepage if there is no redirect query', () => {
-    // sign the user up
-    const { username, email, password } = getFakeUser()
-
-    cy.visit('/login')
-    cy.signUp(username, email, password)
-
-    // After a successful sign up the user is redirect to the homepage.
-    cy.url().should('eq', `${Cypress.config().baseUrl}${Cypress.env('home_path')}`)
-  })
-
-  it('should redirect to correct page if there is a redirect query', () => {
-    const pageClickFrom = 'projects/new'
-    cy.visit(pageClickFrom)
-    // sign the user up
-    const { username, email, password } = getFakeUser()
-
-    cy.signUp(username, email, password)
-
-    // redirect to the page in the redirect query parameter
-    cy.url().should('eq', `http://kitspace.test:3000/${pageClickFrom}`)
-  })
-
-  it("should redirect to the `pathname` if it isn't `login`", () => {
-    const requireSignInPage = '/settings'
-
-    cy.visit(requireSignInPage)
-
-    cy.get('[data-cy=login-grid]').should('be.visible')
-
-    // sign the user up
-    const { username, email, password } = getFakeUser()
-    cy.signUp(username, email, password)
-
-    cy.url().should('eq', `http://kitspace.test:3000${requireSignInPage}`)
-    cy.get('h1').contains('Settings')
-  })
-})
-
-describe('Redirect after logout', () => {
-  it('should redirect to login page', () => {
-    const { username, email, password } = getFakeUser()
-    cy.createUser(username, email, password)
-
-    // Press the logout button
-    cy.get('img[alt=avatar]').trigger('mousemove').click()
-    cy.get('#logout').trigger('mousemove').click()
-
-    // should redirect to `/login`
-    cy.url().should('eq', 'http://kitspace.test:3000/login')
-  })
-})
-
-describe('"Add Project" behavior', () => {
-  const { username, email, password } = getFakeUser()
-
-  before(() => {
-    cy.visit('/')
-    cy.createUser(username, email, password)
-  })
-
-  beforeEach(() => {
-    // deauthenticate the user and reload the page to update the CSRF token
-    cy.clearCookies()
-    cy.reload()
-  })
-
-  it('should redirect unauthenticated user to /login and then back to /projects/new', () => {
-    // The user is unauthenticated
-    cy.window().its('session.user').should('not.ok')
-
-    // Clicking `Add Project` redirects to the login page.
-    // and adds redirect query to `/projects/new/`
-    cy.get('#add_project').click()
-
-    const { username, email, password } = getFakeUser()
-    cy.signUp(username, email, password)
-    cy.url().should('eq', 'http://kitspace.test:3000/projects/new')
-  })
-
-  it('should redirect authenticated user to /projects/new', () => {
-    // sign the user in.
-    cy.visit('/login')
-    cy.signIn(username, password)
-
-    // Clicking `Add Project` redirects to new project page.
-    cy.visit('/')
-    cy.get('#add_project').click()
-    cy.url().should('eq', 'http://kitspace.test:3000/projects/new')
-  })
-})
diff --git a/e2e/cypress/integration/legacyRedirect.spec.js b/e2e/cypress/integration/legacyRedirect.spec.js
index 0ab86d0203..13d643d133 100644
--- a/e2e/cypress/integration/legacyRedirect.spec.js
+++ b/e2e/cypress/integration/legacyRedirect.spec.js
@@ -10,27 +10,16 @@ describe('Legacy redirects', () => {
   })
 
   it('should redirect `/boards/*/user/project/*` to `/user/project/*`', () => {
-    const { username, email, password } = getFakeUser()
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     const multiProjectsRepoName = 'DIY_particle_detector'
     const multiProjectsNames = ['alpha-spectrometer', 'electron-detector']
     const syncedRepoUrlMultiProjects =
       'https://github.com/kitspace-test-repos/DIY_particle_detector'
-
     /* Migrate the multiproject repo */
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 120_000 }).as('projectCards')
 
@@ -38,38 +27,27 @@ describe('Legacy redirects', () => {
 
     /* Legacy redirect */
     cy.visit(
-      `/boards/github.com/${username}/${multiProjectsRepoName}/${multiProjectsNames[0]}`,
+      `/boards/github.com/${user.username}/${multiProjectsRepoName}/${multiProjectsNames[0]}`,
     )
     cy.url().should(
       'eq',
-      `${Cypress.config().baseUrl}/${username}/${multiProjectsRepoName}/${
+      `${Cypress.config().baseUrl}/${user.username}/${multiProjectsRepoName}/${
         multiProjectsNames[0]
       }`,
     )
   })
 
   it('should redirect `/interactive_bom/?*/user/project*` to `/user/project/IBOM`', () => {
-    const { username, email, password } = getFakeUser()
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
+    const user = getFakeUser()
     const multiProjectsRepoName = 'DIY_particle_detector'
     const multiProjectsNames = ['alpha-spectrometer', 'electron-detector']
     const syncedRepoUrlMultiProjects =
       'https://github.com/kitspace-test-repos/DIY_particle_detector'
 
     /* Migrate the multiproject repo */
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 120_000 }).as('projectCards')
 
@@ -77,11 +55,11 @@ describe('Legacy redirects', () => {
 
     /* Legacy redirect */
     cy.visit(
-      `/interactive_bom/?github.com/${username}/${multiProjectsRepoName}/${multiProjectsNames[0]}`,
+      `/interactive_bom/?github.com/${user.username}/${multiProjectsRepoName}/${multiProjectsNames[0]}`,
     )
     cy.url().should(
       'eq',
-      `${Cypress.config().baseUrl}/${username}/${multiProjectsRepoName}/${
+      `${Cypress.config().baseUrl}/${user.username}/${multiProjectsRepoName}/${
         multiProjectsNames[0]
       }/IBOM`,
     )
diff --git a/e2e/cypress/integration/multiProject.spec.js b/e2e/cypress/integration/multiProject.spec.js
index 33ffd16184..c9e11cb359 100644
--- a/e2e/cypress/integration/multiProject.spec.js
+++ b/e2e/cypress/integration/multiProject.spec.js
@@ -17,22 +17,13 @@ describe('Render project cards', () => {
   })
 
   it('should render a card for each multiproject', () => {
-    const { username, email, password } = getFakeUser()
-
+    const user = getFakeUser()
     const repoName = syncedRepoUrlMultiProjects.split('/').slice(-1).toString()
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the multiproject repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, repoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.forceVisit(`/${user.username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 60_000 }).should(
       'have.length',
@@ -40,7 +31,7 @@ describe('Render project cards', () => {
     )
 
     // should render a card for each multiproject
-    cy.visit(`/${username}`)
+    cy.visit(`/${user.username}`)
 
     multiProjectsNames.forEach(name => {
       cy.get('[data-cy=project-card]').contains(name)
@@ -48,38 +39,26 @@ describe('Render project cards', () => {
   })
 
   it('should display card thumbnail', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     // Migrate the multiproject repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 60_000 }).should(
       'have.length',
       multiProjectsNames.length,
     )
-    /* Migrate the normal repo */
-    cy.forceVisit('/projects/new')
+    // Migrate the normal repo
+    cy.importRepo(syncedRepoUrl, normalRepoName, user)
 
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.forceVisit(`/${user.username}/${normalRepoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${normalRepoName}`)
+    // Wait for the repo to finish processing, by checking the visibility of info-bar.
+    cy.get('[data-cy=info-bar]', { timeout: 100_000 }).should('be.visible')
 
-    cy.visit(`/${username}`)
+    cy.visit(`/${user.username}`)
     // There should be 3 cards = 2 form multiprojects + 1 normal project
     cy.get('[data-cy=project-card]', { timeout: 60_000 }).should(
       'have.length',
@@ -88,23 +67,13 @@ describe('Render project cards', () => {
   })
 
   it('should redirect to the multi project page', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     /* Migrate the multiproject repo */
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
+
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 60_000 }).should(
       'have.length',
@@ -115,45 +84,34 @@ describe('Render project cards', () => {
     cy.visit('/')
 
     // Search for the project
-    cy.get('nav [data-cy=search-field] > input').type(username)
+    cy.get('nav [data-cy=search-field] > input').type(user.username)
     cy.get('nav [data-cy=search-form]').submit()
 
     // Click on a subproject project card
     cy.get('[data-cy=project-card]').within(() => {
-      cy.contains(username)
+      cy.contains(user.username)
       cy.contains(multiProjectName).click({ force: true })
     })
 
-    // Should redirect to the `[username]/[projectName]/[multiProject]`
+    // Should redirect to the `[user.username]/[projectName]/[multiProject]`
     cy.url({ timeout: 20_000 }).should(
       'contain',
-      `${username}/${multiProjectsRepoName}/${multiProjectName}`,
+      `${user.username}/${multiProjectsRepoName}/${multiProjectName}`,
     )
   })
 
   it('should handle subproject names with URL invalid characters', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
+    const user = getFakeUser()
     const projectWithInvalidCharsURL =
       'https://github.com/kitspace-test-repos/open-visual-stimulator'
     const projectWithInvalidCharsName = 'open-visual-stimulator'
     const numberOfSubProjects = 4
 
     /* Migrate the multiproject repo */
-    cy.get('[data-cy=sync-field]').type(projectWithInvalidCharsURL)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(projectWithInvalidCharsURL, projectWithInvalidCharsName, user)
+
+    cy.forceVisit(`/${user.username}/${projectWithInvalidCharsName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 120_000 }).should(
-      'contain',
-      `${username}/${projectWithInvalidCharsName}`,
-    )
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 60_000 }).should(
       'have.length',
@@ -175,22 +133,12 @@ describe('Multi project page', () => {
   })
 
   it('should render the page components', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     // Migrate the multiproject repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
 
-    cy.url({ timeout: 60_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 60_000 }).as('projectCards')
 
@@ -201,12 +149,11 @@ describe('Multi project page', () => {
     cy.get('@projectCards').contains(subProjectName).click()
     cy.url({ timeout: 20_000 }).should(
       'contain',
-      `${username}/${multiProjectsRepoName}/${subProjectName}`,
+      `${user.username}/${multiProjectsRepoName}/${subProjectName}`,
     )
 
     // Different page elements should be visible.
     const pageComponents = [
-      'sync-msg',
       'info-bar',
       'board-showcase',
       'board-showcase-top',
@@ -224,22 +171,12 @@ describe('Multi project page', () => {
   })
 
   it('should render the details from multi project in kitspace.yaml', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const user = getFakeUser()
 
     // Migrate the multiproject repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrlMultiProjects)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrlMultiProjects, multiProjectsRepoName, user)
 
-    cy.url({ timeout: 10_000 }).should(
-      'contain',
-      `${username}/${multiProjectsRepoName}`,
-    )
+    cy.forceVisit(`/${user.username}/${multiProjectsRepoName}`)
     // Wait for the repo to finish processing, by checking the visibility sub projects cards.
     cy.get('[data-cy=project-card]', { timeout: 120_000 }).should(
       'have.length',
@@ -249,17 +186,17 @@ describe('Multi project page', () => {
     const multiProjectName = multiProjectsNames[0]
     cy.visit('/')
     // Search for the project
-    cy.get('nav [data-cy=search-field] > input').type(username)
+    cy.get('nav [data-cy=search-field] > input').type(user.username)
     cy.get('nav [data-cy=search-form]').submit()
 
     // Click on a multiproject project card
     cy.get('[data-cy=project-card]').within(() => {
-      cy.contains(username)
+      cy.contains(user.username)
       cy.contains(multiProjectName).click({ force: true })
     })
     cy.url({ timeout: 20_000 }).should(
       'contain',
-      `${username}/${multiProjectsRepoName}/${multiProjectName}`,
+      `${user.username}/${multiProjectsRepoName}/${multiProjectName}`,
     )
     // The info bar should have the correct title.
     cy.get('[data-cy=project-title]').should('have.text', multiProjectName)
diff --git a/e2e/cypress/integration/readme.spec.js b/e2e/cypress/integration/readme.spec.js
index 34de589aa5..dab9454ae9 100644
--- a/e2e/cypress/integration/readme.spec.js
+++ b/e2e/cypress/integration/readme.spec.js
@@ -10,24 +10,15 @@ describe('Relative README images URLs normalization', () => {
   })
 
   it('handles readme images starting with `/`', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'CH330_Hardware'
-    const syncedRepoUrl =
-      'https://github.com/kitspace-test-repos/CH330_Hardware'
-
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
+    const syncedRepoUrl = 'https://github.com/kitspace-test-repos/CH330_Hardware'
 
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.visit(`${user.username}/${repoName}`)
 
     cy.get('[data-cy=readme-img]', { timeout: 60_000 })
       .should('have.attr', 'src')
@@ -43,27 +34,19 @@ describe('Relative README images URLs normalization', () => {
   })
 
   it('handles readmes in folders', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'readmes-in-folders'
     const syncedRepoUrl =
       'https://github.com/kitspace-test-repos/readmes-in-folders'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.visit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.visit(`${user.username}/${repoName}`)
     cy.get('[data-cy=project-card]', { timeout: 20_000 }).should('have.length', 2)
 
-    cy.visit(`/${username}/${repoName}/project_2`)
+    cy.visit(`/${user.username}/${repoName}/project_2`)
     cy.get('[data-cy=readme]').within(() => {
       cy.get('img').each($img => {
         // checks for naturalWidth/naturalHeight are not working
@@ -79,27 +62,19 @@ describe('Relative README images URLs normalization', () => {
   })
 
   it('redirects relative urls to original git service', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'readmes-in-folders'
     const syncedRepoUrl =
       'https://github.com/kitspace-test-repos/readmes-in-folders'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.visit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.visit(`${user.username}/${repoName}`)
     cy.get('[data-cy=project-card]', { timeout: 20_000 }).should('have.length', 2)
 
-    cy.visit(`/${username}/${repoName}/project_1`)
+    cy.visit(`/${user.username}/${repoName}/project_1`)
 
     cy.get('[data-cy=readme]').within(() => {
       cy.get('a').each($a => {
@@ -111,24 +86,17 @@ describe('Relative README images URLs normalization', () => {
 
 describe('Readme style', () => {
   it('should auto link readme and summary links', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'readme-and-summary-auto-link'
     const syncedRepoUrl =
       'https://github.com/kitspace-test-repos/readme-and-summary-auto-link'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.visit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
@@ -150,23 +118,16 @@ describe('Readme style', () => {
   })
 
   it('renders :emoji: in readme and project description', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'ogx360'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/ogx360'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.visit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
@@ -176,23 +137,16 @@ describe('Readme style', () => {
   })
 
   it('preserves URLs for GitHub Actions badges', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'ogx360'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/ogx360'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.visit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
diff --git a/e2e/cypress/integration/search.spec.js b/e2e/cypress/integration/search.spec.js
index f180cc78f1..afc1693411 100644
--- a/e2e/cypress/integration/search.spec.js
+++ b/e2e/cypress/integration/search.spec.js
@@ -17,23 +17,16 @@ describe('Navbar search', () => {
   })
 
   it('should display project card on submitting search form', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'CH330_Hardware'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/CH330_Hardware'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish migration, by checking the visibility of processing-loader.
     cy.get('[data-cy=processing-loader]', { timeout: 60_000 })
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
@@ -52,23 +45,16 @@ describe('Navbar search', () => {
 
 describe('Homepage search on mobile', () => {
   it('should display project card on submitting search form', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'CH330_Hardware'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/CH330_Hardware'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field] > input').type(syncedRepoUrl, { force: true })
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish migration, by checking the visibility of processing-loader.
     cy.get('[data-cy=processing-loader]', { timeout: 60_000 })
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
@@ -97,23 +83,16 @@ describe('/search route', () => {
   })
 
   it('should use `q` from query parameters', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'HACK'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/HACK'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish migration, by checking the visibility of processing-loader.
     cy.get('[data-cy=processing-loader]', { timeout: 60_000 })
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
diff --git a/e2e/cypress/integration/signInForm.spec.js b/e2e/cypress/integration/signInForm.spec.js
deleted file mode 100644
index 3e98d09dc7..0000000000
--- a/e2e/cypress/integration/signInForm.spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import faker from 'faker'
-
-import { getFakeUser } from '../support/getFakeUser'
-
-describe('Log in form validation', () => {
-  before(() => {
-    cy.visit('/login')
-    cy.get('[data-cy=login-grid] a').contains('Login').click({ force: true })
-  })
-  it('should validate username field', () => {
-    const invalidUsernames = ['abc ', 'abc@', ' ', '^', 'longusername'.repeat(4)]
-
-    // Type the password to make sure we're validating the username only
-    cy.get('input[name=password]').type('123456')
-
-    invalidUsernames.forEach(username => {
-      cy.get('input[name=username]').clear().type(username).blur()
-      cy.get('.prompt.label').as('message')
-
-      // Validation error message should appear.
-      cy.get('@message').should('be.visible')
-
-      // The error message should indicate that the username is invalid.
-      cy.get('@message')
-        .contains(
-          /Invalid "username"\. Username must contain only letters, numbers, "_", "-", and "\."|"username" length must be less than or equal to 40 characters long/g,
-        )
-        .should('be.visible')
-
-      // Login button should stay disabled
-      cy.get('button').contains('Login').should('be.disabled')
-    })
-  })
-})
-
-describe('Log in form submission', () => {
-  const { username, email, password } = getFakeUser()
-
-  before(() => {
-    // create user and log him in.
-    cy.createUser(username, email, password)
-    cy.clearCookies()
-    cy.visit('/login')
-    cy.get('[data-cy=login-grid] a').contains('Login').click({ force: true })
-  })
-
-  it('should display error message on submitting form with wrong username', () => {
-    cy.signIn('nonRegUser', password)
-    cy.get('.negative').should('include.text', 'Wrong username or password')
-  })
-
-  it('should display error message on submitting form with wrong password', () => {
-    cy.signIn(username, 'wrong_password_1234')
-    cy.get('.negative').should('include.text', 'Wrong username or password')
-  })
-})
diff --git a/e2e/cypress/integration/signUpForm.spec.js b/e2e/cypress/integration/signUpForm.spec.js
deleted file mode 100644
index e91b078410..0000000000
--- a/e2e/cypress/integration/signUpForm.spec.js
+++ /dev/null
@@ -1,134 +0,0 @@
-import { getFakeUser } from '../support/getFakeUser'
-
-describe('Sign up form validation', () => {
-  before(() => {
-    cy.visit('/login')
-    cy.get('a').contains('Sign up').click({ force: true })
-  })
-
-  afterEach(() => {
-    // All the tests are invalid forms which should keep the button inactive.
-    cy.get('button').contains('Sign up').should('be.disabled')
-  })
-
-  it('should route to sign up form based on params', () => {
-    // The form is rendered on screen.
-    cy.contains('Create a new account')
-  })
-
-  it('should display error message on using invalid username', () => {
-    // Try different invalid usernames.
-    const invalidUsernames = ['abc ', 'abc@', ' ', '^', 'longusername'.repeat(4)]
-
-    invalidUsernames.forEach(username => {
-      cy.get('input[name=username]').clear().type(username).blur()
-
-      // The error message should indicate that the username is invalid.
-      cy.get('.prompt.label').as('message')
-      cy.get('@message')
-        .contains(
-          /Invalid "username"\. Username must contain only letters, numbers, "_", "-", and "\."|"username" length must be less than or equal to 40 characters long|"username" length must be at least 2 characters long/g,
-        )
-        .should('be.visible')
-      cy.get('@message').should('include.text', '"username"')
-    })
-  })
-
-  it('should display error message on using invalid email', () => {
-    // Try different invalid emails.
-    const invalidEmails = ['abc ', 'abc@', ' ', '^', 'www.google.com']
-
-    cy.get('input[name=username]').clear().type('someone')
-
-    invalidEmails.forEach(email => {
-      cy.get('input[name=email]').clear().type(email).blur()
-
-      // The error message should indicate that the email is invalid.
-      cy.get('.prompt.label').as('message')
-      cy.get('@message').should('be.visible')
-      cy.get('@message').should('include.text', 'Invalid email address')
-    })
-  })
-
-  it('should display error message on using invalid password', () => {
-    // Try different invalid password.
-    cy.get('input[name=username]').clear().type('someone')
-    cy.get('input[name=email]').clear().type('someone@example.com')
-    cy.get('input[name=password]').clear().type('12345').blur()
-
-    // The error message should indicate that the password is invalid.
-    cy.get('.prompt.label').as('message')
-    cy.get('@message').should('be.visible')
-    cy.get('@message').should('include.text', '"password"')
-  })
-})
-
-describe('Sign up form submission', () => {
-  const { username, email, password } = getFakeUser()
-
-  before(() => {
-    /*
-     * The purpose of this isn't actually visiting the homepage.
-     * Sometimes, the frontend has a slow startup time which results in a random failure.
-     */
-    cy.visit('/')
-    cy.clearCookies()
-
-    // Create user used for conflicts test then sign out again.
-    cy.visit('/login')
-    cy.signUp(username, email, password)
-    cy.clearCookies()
-  })
-
-  beforeEach(() => {
-    cy.visit('/login')
-  })
-
-  it('should automatically sign the user in after submitting a valid form', () => {
-    const { username, email, password } = getFakeUser()
-
-    cy.signUp(username, email, password)
-
-    // the user should be signed in
-    cy.get('[data-cy=user-menu]').should('be.visible')
-  })
-
-  it('should display error message on submitting a from with used username', () => {
-    cy.signUp(username, email, password)
-
-    // The error message should indicate that username is already taken.
-    cy.get('.negative').as('message')
-    cy.get('@message').should('be.visible')
-    cy.get('@message').should('include.text', 'User already exists.')
-  })
-
-  it('should display error message on submitting a from with used email', () => {
-    cy.signUp('newUser', email, password)
-
-    // The error message should indicate that this email is already registered.
-    cy.get('.negative').as('message')
-    cy.get('@message').should('be.visible')
-    cy.get('@message').should('include.text', 'Email is already used.')
-  })
-
-  it('should display error message on submitting a from with reserved username', () => {
-    const reservedNames = ['admin', 'user'] // Not a full list of Gitea reserved names.
-
-    reservedNames.forEach(name => {
-      cy.signUp(name, email, password)
-
-      // The error message should indicate that the username is reserved.
-      cy.get('.negative').as('message')
-      cy.get('@message').should('be.visible')
-      cy.get('@message').should('include.text', 'Name is reserved.')
-    })
-  })
-})
-
-describe('Already have an account? Log in here.', () => {
-  it('should open login pane on clicking "Already have an account? Log in here."', () => {
-    cy.visit('/login')
-    cy.get('[data-cy=log-in-here]').click({ force: true })
-    cy.get('h2').contains('Login')
-  })
-})
diff --git a/e2e/cypress/integration/syncRepo.spec.js b/e2e/cypress/integration/syncRepo.spec.js
index 0d2a184574..32f5202b14 100644
--- a/e2e/cypress/integration/syncRepo.spec.js
+++ b/e2e/cypress/integration/syncRepo.spec.js
@@ -9,13 +9,13 @@ describe('Syncing a project behavior validation', () => {
     cy.visit('/')
   })
 
-  it('should sync a repo on gitea', () => {
+  it.skip('should sync a repo via UI', () => {
     const syncedRepoUrl = 'https://github.com/AbdulrhmnGhanem/light-test-repo'
     const repoName = 'light-test-repo'
 
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
-    cy.createUser(username, email, password)
+    cy.createUser(user.username, email, password)
     cy.visit('/')
     cy.get('[data-cy=user-menu]')
 
@@ -25,32 +25,24 @@ describe('Syncing a project behavior validation', () => {
     cy.get('[data-cy=sync-result-message]').should('have.class', 'green')
 
     // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.url({ timeout: 60_000 }).should('contain', `${user.username}/${repoName}`)
     cy.get('[data-cy=project-title]')
 
-    cy.visit(`/${username}`)
+    cy.visit(`/${user.username}`)
     // assert the repo is on the user's project page
     cy.get('[data-cy=project-card]').contains(repoName)
   })
 
   it('should display original url for synced repos', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'CH330_Hardware'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/CH330_Hardware'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
     // The info bar should include the original url
     cy.get('[data-cy=original-url] > a', { timeout: 60_000 })
@@ -61,24 +53,17 @@ describe('Syncing a project behavior validation', () => {
       )
   })
 
-  it.skip('should fall back to repo description on missing `summary` key in `kitspace.yaml`', () => {
-    const { username, email, password } = getFakeUser()
+  it('should fall back to repo description on missing `summary` key in `kitspace.yaml`', () => {
+    const user = getFakeUser()
 
     const repoName = 'ArduTouch'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/ArduTouch'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
@@ -86,32 +71,25 @@ describe('Syncing a project behavior validation', () => {
     cy.get('[data-cy=project-description]').should('contain', 'ARDUTOUCH ')
   })
 
-  it.skip('should fall back to repo description in `ProjectCard` on missing `summary` in `kitspace.yaml', () => {
-    const { username, email, password } = getFakeUser()
+  it('should fall back to repo description in `ProjectCard` on missing `summary` in `kitspace.yaml', () => {
+    const user = getFakeUser()
 
     const repoName = 'CH330_Hardware_without_summary'
     const syncedRepoUrl =
       'https://github.com/kitspace-test-repos/CH330_Hardware_without_summary'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=info-bar]', { timeout: 60_000 }).should('be.visible')
 
     // Go to user projects page to limit the results to the project synced above
-    cy.visit(`/${username}`)
+    cy.visit(`/${user.username}`)
 
-    cy.get('[data-cy=project-card]').should('contain', username).and(
+    cy.get('[data-cy=project-card]').should('contain', user.username).and(
       'contain.text',
       // This is github repo description.
       'To test that meilisearch falls back to repo description',
@@ -119,27 +97,20 @@ describe('Syncing a project behavior validation', () => {
   })
 
   it.skip('should escape and render project description correctly', () => {
-    const { username, email, password } = getFakeUser()
+    const user = getFakeUser()
 
     const repoName = 'LED-Zappelin'
     const syncedRepoUrl = 'https://github.com/kitspace-test-repos/LED-Zappelin'
 
-    cy.createUser(username, email, password)
-    cy.visit('/')
-    cy.get('[data-cy=user-menu]')
-
-    cy.forceVisit('/projects/new')
-
     // Migrate the repo
-    cy.get('[data-cy=sync-field]').type(syncedRepoUrl)
-    cy.get('button').contains('Sync').click()
+    cy.importRepo(syncedRepoUrl, repoName, user)
+
+    cy.forceVisit(`/${user.username}/${repoName}`)
 
-    // Wait for redirection for project page
-    cy.url({ timeout: 60_000 }).should('contain', `${username}/${repoName}`)
     // Wait for the repo to finish processing, by checking the visibility of info-bar.
     cy.get('[data-cy=project-card]', { timeout: 60_000 })
     // Go to the PCB stimulator sub-project
-    cy.visit(`${username}/${repoName}/PCB-Stimulator`)
+    cy.visit(`${user.username}/${repoName}/PCB-Stimulator`)
 
     cy.get('[data-cy=project-description]').should(
       'contain',
diff --git a/e2e/cypress/support/commands.js b/e2e/cypress/support/commands.js
index 9876e079d9..c363b6d02f 100644
--- a/e2e/cypress/support/commands.js
+++ b/e2e/cypress/support/commands.js
@@ -1,3 +1,5 @@
+import 'cypress-wait-until'
+
 const signUpEndpoint = 'http://gitea.kitspace.test:3000/user/kitspace/sign_up'
 const signInEndpoint = 'http://gitea.kitspace.test:3000/user/kitspace/sign_in'
 
@@ -59,3 +61,104 @@ Cypress.Commands.add('forceVisit', (path, timeout) => {
   cy.visit('/', { timeout })
   cy.window().then(win => win.open(path, '_self'))
 })
+
+Cypress.Commands.add('importRepo', (remoteUrl, repoName, user) => {
+  cy.createGiteaUser(user).then(giteaUser => {
+    cy.mirrorRepo(remoteUrl, repoName, giteaUser)
+  })
+  cy.waitForStatusCode(
+    `http://gitea.kitspace.test:3000/${user.username}/${repoName}`,
+  )
+})
+
+Cypress.Commands.add('mirrorRepo', (remoteRepo, repoName, user) => {
+  const endpoint = 'http://gitea.kitspace.test:3000/api/v1/repos/migrate'
+  const headers = {
+    'Content-Type': 'application/json',
+    Authorization: `token ${Cypress.env('GITEA_ADMIN_TOKEN')}`,
+  }
+
+  const giteaOptions = {
+    clone_addr: remoteRepo,
+    uid: user.id,
+    repo_name: repoName,
+    mirror: true,
+    wiki: false,
+    private: false,
+    pull_requests: false,
+    releases: true,
+    issues: false,
+    service: 'github',
+  }
+
+  cy.request({
+    url: endpoint,
+    method: 'POST',
+    headers,
+    body: JSON.stringify(giteaOptions),
+    failOnStatusCode: false,
+  }).then(response => {
+    if (!response.status === 201) {
+      throw new Error('Failed to mirror repo')
+    }
+  })
+})
+
+Cypress.Commands.add('createGiteaUser', user => {
+  const headers = {
+    'Content-Type': 'application/json',
+    Authorization: `token ${Cypress.env('GITEA_ADMIN_TOKEN')}`,
+  }
+
+  const url = 'http://gitea.kitspace.test:3000/api/v1/admin/users'
+
+  // check if the user already exists
+  cy.request({
+    url: `http://gitea.kitspace.test:3000/api/v1/users/${user.username}`,
+    method: 'GET',
+    headers,
+    failOnStatusCode: false,
+  }).then(response => {
+    if (response.status === 200) {
+      return response.body
+    }
+    // if the user doesn't exist, create a new user and return the user object.
+    return cy
+      .request({
+        url,
+        method: 'POST',
+        headers,
+        body: JSON.stringify(user),
+        failOnStatusCode: false,
+      })
+      .then(response => {
+        if (response.status !== 201) {
+          throw new Error('Failed to create user')
+        }
+        return response.body
+      })
+  })
+})
+
+Cypress.Commands.add(
+  'waitForStatusCode',
+  (url, timeout = 60_000, interval = 1000) => {
+    cy.log(`Waiting for HTTP request to ${url} to return status 200...`)
+
+    cy.waitUntil(
+      () => {
+        return cy
+          .request({ url, method: 'GET', failOnStatusCode: false })
+          .its('status')
+          .then(status => {
+            if (status === 200) {
+              return true
+            }
+            cy.log(`Got status ${status}, retrying...`)
+            return false
+          })
+      },
+      { timeout, interval },
+    )
+  },
+)
diff --git a/e2e/cypress/support/index.d.ts b/e2e/cypress/support/index.d.ts
index 8bc6b1b0d9..2529fe3ca5 100644
--- a/e2e/cypress/support/index.d.ts
+++ b/e2e/cypress/support/index.d.ts
@@ -27,7 +27,7 @@ declare namespace Cypress {
      * @example
      * cy.signIn(username, password)
      */
-   signIn(username: string, password: string): Chainable<any>
+    signIn(username: string, password: string): Chainable<any>
   }
 
   interface Chainable<Subject> {
@@ -59,7 +59,7 @@ declare namespace Cypress {
      * @param newProject if the project is new wait for `@create` and `@upload`.
      * cy.get('.dropzone').dropFile(file, 'example.txt')
      */
-      dropFiles(files, fileNames: string[], username: string, newProject=true): Chainable<any>
+    dropFiles(files, fileNames: string[], username: string, newProject: boolean): Chainable<any>
   }
 
   interface Chainable<Subject> {
@@ -70,4 +70,14 @@ declare namespace Cypress {
      */
     forceVisit(path: string, timeout: number): Chainable<any>
   }
+
+  interface Chainable<Subject> {
+    /**
+     * Import a repo from a url
+     * @param remoteUrl
+     * @param repoName
+     * @param user
+     */
+    importRepo(remoteUrl: string, repoName: string, user: any): Chainable<any>
+  }
 }
diff --git a/e2e/package.json b/e2e/package.json
index 3f54428a5d..26571258d0 100644
--- a/e2e/package.json
+++ b/e2e/package.json
@@ -1,8 +1,8 @@
 {
   "name": "kitspace-e2e",
   "scripts": {
-    "e2e": "npx cypress run",
-    "gui": "npx cypress open",
+    "e2e": "yarn cypress run",
+    "gui": "yarn cypress open",
     "fmt": "prettier '*.json' cypress/ --write",
     "lint": "eslint cypress/"
   },
@@ -13,6 +13,7 @@
     "cypress-fail-fast": "^3.3.0",
     "cypress-image-snapshot": "^4.0.1",
     "cypress-terminal-report": "^3.4.1",
+    "cypress-wait-until": "^1.7.2",
     "eslint": ">=7.0.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-import-resolver-alias": "^1.1.2",
diff --git a/e2e/yarn.lock b/e2e/yarn.lock
index 31925c500e..ff697d0b51 100644
--- a/e2e/yarn.lock
+++ b/e2e/yarn.lock
@@ -505,6 +505,11 @@ cypress-terminal-report@^3.4.1:
     semver "^7.3.5"
     tv4 "^1.3.0"
 
+cypress-wait-until@^1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz#7f534dd5a11c89b65359e7a0210f20d3dfc22107"
+  integrity sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==
+
 cypress@^9.4.1:
   version "9.5.3"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.5.3.tgz#7c56b50fc1f1aa69ef10b271d895aeb4a1d7999e"
diff --git a/frontend/package.json b/frontend/package.json
index b953c72a01..f74b7df505 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -14,7 +14,6 @@
     "@justinribeiro/lite-youtube": "^1.3.1",
     "express": "^4.17.3",
     "file-loader": "^6.0.0",
-    "file-selector": "^0.2.4",
     "highlight.js": "^11.6.0",
     "joi": "^17.2.1",
     "lodash": "^4.17.21",
@@ -27,10 +26,7 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-double-scrollbar": "^0.0.15",
-    "react-dropzone": "^11.5.1",
-    "react-hot-toast": "^1.0.1",
     "react-intersection-observer": "^9.4.1",
-    "react-social-login-buttons": "3.1.2",
     "semantic-ui-css": "^2.4.1",
     "semantic-ui-react": "^2.0.3",
     "swr": "^1.3.0",
diff --git a/frontend/src/components/NavBar/UserMenu.jsx b/frontend/src/components/NavBar/UserMenu.jsx
deleted file mode 100644
index 30f18654a9..0000000000
--- a/frontend/src/components/NavBar/UserMenu.jsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import React, { useContext, useState } from 'react'
-import { Menu, Icon, Popup } from 'semantic-ui-react'
-import Link from 'next/link'
-import Image from 'next/image'
-import { useRouter } from 'next/router'
-
-import styles from './UserMenu.module.scss'
-import { AuthContext } from '@contexts/AuthContext'
-
-export const UserDropDownMenu = () => {
-  const { user } = useContext(AuthContext)
-  const [isOpen, setIsOpen] = useState(false)
-
-  const href = `/${user.username}`
-  return (
-    <Menu.Item className={styles.userMenuIcon} data-cy="user-menu">
-      <Popup
-        className={styles.userDropDownMenuPopup}
-        on="click"
-        position="bottom right"
-        trigger={
-          <a className={styles.userDropDownMenuContainer}>
-            <Image
-              alt="avatar"
-              className={styles.userImage}
-              height={35}
-              objectFit="scale-down"
-              src={user.avatar_url}
-              width={35}
-            />
-            <Icon name={`triangle ${isOpen ? 'up' : 'down'}`} />
-          </a>
-        }
-        onClose={() => setIsOpen(false)}
-        onOpen={() => setIsOpen(true)}
-      >
-        <Link passHref href={href}>
-          <div className={styles.userName}>
-            <a href={href}>{user.username}</a>
-          </div>
-        </Link>
-        <Menu attached vertical className={styles.menu}>
-          <UserMenuItems />
-        </Menu>
-      </Popup>
-    </Menu.Item>
-  )
-}
-
-export const UserMenuItems = () => {
-  return (
-    <>
-      <Link passHref href="/settings">
-        <Menu.Item id="settings">
-          <Icon name="settings" />
-          Settings
-        </Menu.Item>
-      </Link>
-      <LogoutButton />
-    </>
-  )
-}
-
-const LogoutButton = () => {
-  const { push } = useRouter()
-  const { logout } = useContext(AuthContext)
-
-  const onClick = async () => {
-    const loggedOut = await logout()
-
-    if (loggedOut) {
-      push('/login')
-    }
-  }
-
-  return (
-    <Menu.Item id="logout" onClick={onClick}>
-      <Icon name="sign out" />
-      Log out
-    </Menu.Item>
-  )
-}
diff --git a/frontend/src/components/NavBar/UserMenu.module.scss b/frontend/src/components/NavBar/UserMenu.module.scss
deleted file mode 100644
index 285e16c005..0000000000
--- a/frontend/src/components/NavBar/UserMenu.module.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-.userName {
-  margin-bottom: 10px;
-  text-align: center;
-}
-
-.userName a:hover {
-  text-decoration: none;
-  border-radius: 20%;
-  background-color: #efeaea;
-  padding: 5px;
-}
-.menu {
-  border: none !important;
-}
-
-.userMenuIcon {
-  padding-top: 0 !important;
-  padding-bottom: 0 !important;
-}
-
-.userDropDownMenuContainer {
-  display: flex;
-  align-items: center;
-}
-
-.userDropDownMenuContainer:hover {
-  text-decoration: none;
-}
-.userDropDownMenuPopup {
-  // Make the drop-down menu drops from the arrow icon
-  transform: translate(8px, -5px) !important;
-}
-
-.userDropDownMenuPopup *:hover {
-  text-decoration: none;
-}
-
-.userImage {
-  border-radius: 20%;
-}
diff --git a/frontend/src/components/NavBar/index.jsx b/frontend/src/components/NavBar/index.jsx
index d6f9e59ec1..573ed0999c 100644
--- a/frontend/src/components/NavBar/index.jsx
+++ b/frontend/src/components/NavBar/index.jsx
@@ -1,12 +1,9 @@
-import React, { useContext } from 'react'
-import { bool } from 'prop-types'
+import React from 'react'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
 import { Button, Icon, Menu, Popup } from 'semantic-ui-react'
 
-import { AuthContext } from '@contexts/AuthContext'
 import SearchBar from './SearchBar'
-import { UserMenuItems, UserDropDownMenu } from './UserMenu'
 import styles from './index.module.scss'
 import logoSvg from './logo.svg'
 
@@ -44,7 +41,6 @@ const BigBar = () => (
       <Menu inverted pointing secondary>
         <AddProjectButton />
         <ContactMenu />
-        <UserControllerButton />
       </Menu>
     </div>
   </>
@@ -66,7 +62,6 @@ const SmallBar = () => (
       }
     >
       <Menu inverted vertical className={styles.smallMenu}>
-        <UserControllerButton smallNavBar />
         <AddProjectButton />
         <SiteMenuItems />
         <SocialMenuItems />
@@ -78,7 +73,10 @@ const SmallBar = () => (
 const AddProjectButton = () => {
   return (
     <Menu.Item data-cy="add-project">
-      <Link passHref href="/projects/new">
+      <Link
+        passHref
+        href="https://github.com/kitspace/kitspace-v2#adding-your-project"
+      >
         <Button icon as="a" color="green" id="add_project" labelPosition="left">
           <Icon name="plus" />
           Add a project
@@ -174,44 +172,4 @@ const ContactMenu = () => (
   </Popup>
 )
 
-/**
- * Log in button if the user is unauthenticated, user menu otherwise.
- */
-const UserControllerButton = ({ smallNavBar }) => {
-  const { user } = useContext(AuthContext)
-
-  if (user != null) {
-    if (smallNavBar) {
-      return <UserMenuItems />
-    }
-
-    return <UserDropDownMenu />
-  }
-
-  return <LogInButton />
-}
-
-const LogInButton = () => {
-  const { asPath } = useRouter()
-
-  const href = { pathname: '/login' }
-  if (!asPath.startsWith('/login')) {
-    href.query = { redirect: asPath }
-  }
-
-  return (
-    <Menu.Item className={styles.LogInButton}>
-      <Link passHref href={href}>
-        <Button as="a" color="green" id="login">
-          Login
-        </Button>
-      </Link>
-    </Menu.Item>
-  )
-}
-
-UserControllerButton.propTypes = {
-  smallNavBar: bool,
-}
-
 export default NavBar
diff --git a/frontend/src/components/NewProject/ConflictModal.tsx b/frontend/src/components/NewProject/ConflictModal.tsx
deleted file mode 100644
index 67b40a38bf..0000000000
--- a/frontend/src/components/NewProject/ConflictModal.tsx
+++ /dev/null
@@ -1,166 +0,0 @@
-import React, { useContext, useEffect } from 'react'
-import { Button, Form, Input, Modal } from 'semantic-ui-react'
-
-import useForm from '@hooks/useForm'
-import ExistingProjectFromModel from '@models/ExistingProjectForm'
-import { isUsableProjectName } from '@utils/giteaApi'
-import { formatAsGiteaRepoName } from '@utils/index'
-import { AuthContext } from '@contexts/AuthContext'
-
-const ConflictModal = ({
-  conflictModalOpen,
-  onClose,
-  originalProjectName,
-  message,
-  onDifferentName,
-  onDifferentNameButtonContent,
-  onOverwrite,
-  onOverwriteButtonContent,
-}: BaseConflictModalProps) => {
-  const { user } = useContext(AuthContext)
-  const { form, onChange, isValid, populate, formatErrorPrompt } = useForm(
-    ExistingProjectFromModel,
-  )
-
-  const [isValidProjectName, setIsValidProjectName] = React.useState(false)
-
-  const didChangeName = originalProjectName !== form.name
-  const projectName = formatAsGiteaRepoName(form.name || '')
-
-  useEffect(() => {
-    populate({ name: originalProjectName })
-  }, [originalProjectName, populate])
-
-  useEffect(() => {
-    if (form.name && didChangeName) {
-      isUsableProjectName(user.username, form.name, isValid).then(
-        setIsValidProjectName,
-      )
-    }
-  }, [user, form.name, isValid, didChangeName])
-
-  return (
-    <Modal
-      closeIcon
-      data-cy="collision-modal"
-      open={conflictModalOpen}
-      onClose={onClose}
-    >
-      <Modal.Header>A project with that name already exists.</Modal.Header>
-      <Modal.Content>
-        <p>{message}</p>
-        <Form>
-          <Form.Field
-            fluid
-            control={Input}
-            error={formatProjectNameError(
-              isValidProjectName,
-              didChangeName,
-              projectName,
-              formatErrorPrompt('name'),
-            )}
-            label={didChangeName ? 'New project name' : 'Project name'}
-            name="name"
-            value={form.name || ''}
-            onChange={onChange}
-          />
-        </Form>
-      </Modal.Content>
-      <Modal.Actions>
-        {didChangeName ? (
-          <Button
-            color="green"
-            content={onDifferentNameButtonContent}
-            data-cy="collision-different-name"
-            disabled={!isValidProjectName}
-            onClick={() => onDifferentName(projectName)}
-          />
-        ) : (
-          <Button
-            color="orange"
-            content={onOverwriteButtonContent}
-            data-cy="collision-update"
-            onClick={onOverwrite}
-          />
-        )}
-      </Modal.Actions>
-    </Modal>
-  )
-}
-
-export const SyncConflictModal = ({
-  conflictModalOpen,
-  onClose,
-  originalProjectName,
-  onDifferentName,
-  onOverwrite,
-}: SyncConflictModalProps) => (
-  <ConflictModal
-    {...{
-      conflictModalOpen,
-      onClose,
-      originalProjectName,
-      onDifferentName,
-      onOverwrite,
-    }}
-    message="You have an imported a project with the same name. You can either overwrite the existing project or choose a different name."
-    onDifferentNameButtonContent="OK"
-    onOverwriteButtonContent="Overwrite"
-  />
-)
-
-export const UploadConflictModal = ({
-  conflictModalOpen,
-  onClose,
-  onDifferentName,
-  onOverwrite,
-  originalProjectName,
-}: SyncConflictModalProps) => (
-  <ConflictModal
-    {...{
-      conflictModalOpen,
-      onClose,
-      originalProjectName,
-      onDifferentName,
-      onOverwrite,
-    }}
-    message="You have an existing project with the same name. You can either choose a different name or update this file in the existing project."
-    onDifferentNameButtonContent="Choose a different name"
-    onOverwriteButtonContent="Update existing project"
-  />
-)
-
-/**
- * Disjoint form validation errors, e.g, maximum length, not empty, etc, with conflicting project name errors
- * @returns
- */
-const formatProjectNameError = (
-  isValidProjectName: boolean,
-  didChangeName: boolean,
-  projectName: string,
-  formErrors?: { content: any; pointing: string },
-) => {
-  if (formErrors) {
-    return formErrors
-  }
-  return !isValidProjectName && didChangeName
-    ? {
-        content: `A project named "${projectName}" already exists!`,
-        pointing: 'below',
-      }
-    : null
-}
-
-interface SyncConflictModalProps {
-  conflictModalOpen: boolean
-  onClose: () => void
-  onDifferentName: (name: string) => void
-  onOverwrite: () => void
-  originalProjectName: string
-}
-
-interface BaseConflictModalProps extends SyncConflictModalProps {
-  message: string
-  onDifferentNameButtonContent: string
-  onOverwriteButtonContent: string
-}
diff --git a/frontend/src/components/NewProject/Ops.js b/frontend/src/components/NewProject/Ops.js
deleted file mode 100644
index 67779cbffe..0000000000
--- a/frontend/src/components/NewProject/Ops.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const NoOp = Symbol('NoOp') // The user is doing nothing.
-export const UploadOp = Symbol('UploadOp') // The user is uploading files.
-export const SyncOp = Symbol('SyncOp') // The user is syncing a project.
diff --git a/frontend/src/components/NewProject/Sync/index.jsx b/frontend/src/components/NewProject/Sync/index.jsx
deleted file mode 100644
index 7de8fe2d5b..0000000000
--- a/frontend/src/components/NewProject/Sync/index.jsx
+++ /dev/null
@@ -1,225 +0,0 @@
-import React, { useContext, useState } from 'react'
-import { func } from 'prop-types'
-import { Input, Button, Form, Message } from 'semantic-ui-react'
-
-import { useRouter } from 'next/router'
-import isEmpty from 'lodash/isEmpty'
-
-import { AuthContext } from '@contexts/AuthContext'
-import { deleteRepo, mirrorRepo, repoExists } from '@utils/giteaApi'
-import { urlToName, waitFor } from '@utils/index'
-import SyncRepoFromModel from '@models/SyncRepoForm'
-import useForm from '@hooks/useForm'
-import { SyncOp, NoOp } from '../Ops'
-import { SyncConflictModal } from '../ConflictModal'
-import styles from './index.module.scss'
-
-const remoteRepoPlaceHolder = 'https://github.com/emard/ulx3s'
-
-const Sync = ({ setUserOp }) => {
-  const { push } = useRouter()
-  const { user, apiToken } = useContext(AuthContext)
-  const { form, errors, onChange, clear } = useForm(SyncRepoFromModel)
-
-  const [loading, setLoading] = useState(false)
-  const [message, setMessage] = useState({})
-  const [conflictModalOpen, setConflictModalOpen] = useState(false)
-  const repoName = urlToName(form.url)
-
-  const uid = user?.id
-  const username = user?.username
-
-  const onSuccessfulSync = async repoName => {
-    setMessage({
-      content: 'Migrated successfully, redirecting the project page...',
-      color: 'green',
-    })
-
-    const exists = waitFor(() => repoExists(`${username}/${repoName}`), {
-      timeoutMS: 60_000,
-    })
-
-    if (!exists) {
-      setMessage({
-        content: `Sorry, something went wrong with importing this repository.`,
-        color: 'red',
-      })
-      return
-    }
-    await push(`/${username}/${repoName}`)
-  }
-
-  const onFailedSync = async (delayedSyncOp, alreadySynced = false) => {
-    // If migration failed don't remove the uploading side.
-    clearTimeout(delayedSyncOp)
-    setUserOp(NoOp)
-
-    setLoading(false)
-    if (alreadySynced) {
-      setConflictModalOpen(true)
-    } else {
-      setMessage({
-        content: `Something went wrong. Are you sure "${form.url}" is a valid git repository?`,
-        color: 'red',
-      })
-    }
-  }
-
-  const handleClick = async () => {
-    if (isEmpty(errors)) {
-      // Syncing can be instantaneous, avoid flickering by delaying setting the user operation.
-      const delayedSyncOp = setTimeout(() => setUserOp(SyncOp), 500)
-
-      setLoading(true)
-      setMessage({
-        content: 'Processing the repository, this may take a while...',
-        color: 'green',
-      })
-
-      const repoURL = form.url
-      const repoName = urlToName(repoURL)
-
-      const res = await mirrorRepo(repoURL, uid, apiToken)
-      const migrateSuccessfully = res.ok
-      const alreadySynced = res.status === 409
-
-      if (migrateSuccessfully) {
-        onSuccessfulSync(repoName)
-      } else {
-        onFailedSync(delayedSyncOp, alreadySynced)
-      }
-    } else {
-      setMessage({
-        content: `Please, enter a valid URL to a remote git repo e.g., ${remoteRepoPlaceHolder}`,
-        color: 'yellow',
-      })
-    }
-  }
-
-  const onDifferentName = async repoName => {
-    // Syncing can be instantaneous, avoid flickering by delaying setting the user operation.
-    const delayedSyncOp = setTimeout(() => setUserOp(SyncOp), 500)
-
-    setLoading(true)
-    setConflictModalOpen(false)
-    setMessage({
-      content: 'Processing the repository, this may take a while...',
-      color: 'green',
-    })
-
-    const repoURL = form.url
-
-    const res = await mirrorRepo(repoURL, uid, apiToken, repoName)
-    const migrateSuccessfully = res.ok
-
-    if (migrateSuccessfully) {
-      onSuccessfulSync(repoName)
-    } else {
-      onFailedSync(delayedSyncOp)
-    }
-  }
-
-  const onOverwrite = async () => {
-    // Syncing can be instantaneous, avoid flickering by delaying setting the user operation.
-    const delayedSyncOp = setTimeout(() => setUserOp(SyncOp), 500)
-
-    setLoading(true)
-    setConflictModalOpen(false)
-    setMessage({
-      content: 'Processing the repository, this may take a while...',
-      color: 'green',
-    })
-
-    const repoURL = form.url
-    const repoName = urlToName(repoURL)
-
-    const deletedRepoSuccessfully = await deleteRepo(
-      `${user.username}/${repoName}`,
-      apiToken,
-    )
-
-    if (deletedRepoSuccessfully) {
-      const res = await mirrorRepo(repoURL, uid, apiToken)
-      const migrateSuccessfully = res.ok
-
-      if (migrateSuccessfully) {
-        onSuccessfulSync(repoName)
-      } else {
-        onFailedSync(delayedSyncOp)
-      }
-    } else {
-      // If migration failed don't remove the uploading side.
-      clearTimeout(delayedSyncOp)
-      setUserOp(NoOp)
-
-      setLoading(false)
-      setMessage({
-        content: `Couldn't overwrite "${repoName}"`,
-        color: 'red',
-      })
-    }
-  }
-
-  return (
-    <>
-      <div
-        style={{ display: 'flex', flexDirection: 'column', alignItems: 'center' }}
-      >
-        <p>Import an existing Git repository</p>
-        <Form>
-          <Form.Group inline className={styles.syncFormFields}>
-            <Form.Field
-              fluid
-              className={styles.urlInput}
-              control={Input}
-              data-cy="sync-field"
-              name="url"
-              placeholder={`e.g., ${remoteRepoPlaceHolder}`}
-              value={form.url || ''}
-              onChange={onChange}
-            />
-            <Form.Field
-              className={styles.syncButton}
-              color="green"
-              content="Sync"
-              control={Button}
-              disabled={loading || form.url == null}
-              icon="sync"
-              loading={loading}
-              onClick={handleClick}
-            />
-          </Form.Group>
-        </Form>
-        {!isEmpty(message) ? (
-          <Message
-            color={message.color}
-            data-cy="sync-result-message"
-            style={{ maxWidth: '70%' }}
-          >
-            {message.content}
-          </Message>
-        ) : null}
-      </div>
-      <SyncConflictModal
-        conflictModalOpen={conflictModalOpen}
-        originalProjectName={repoName}
-        onClose={() => {
-          setUserOp(NoOp)
-          // Close the modal
-          setConflictModalOpen(false)
-          // Clear input and error message.
-          clear()
-          setMessage({})
-        }}
-        onDifferentName={onDifferentName}
-        onOverwrite={onOverwrite}
-      />
-    </>
-  )
-}
-
-Sync.propTypes = {
-  setUserOp: func.isRequired,
-}
-
-export default Sync
diff --git a/frontend/src/components/NewProject/Sync/index.module.scss b/frontend/src/components/NewProject/Sync/index.module.scss
deleted file mode 100644
index 7cd9fd0367..0000000000
--- a/frontend/src/components/NewProject/Sync/index.module.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-.urlInput {
-  min-width: 300px;
-  max-height: 37px;
-  flex-grow: 1;
-  margin-bottom: 20px;
-  margin: auto !important;
-  padding: 0 !important;
-}
-
-.syncButton {
-  margin: auto !important;
-  padding: 0 !important;
-}
-
-.syncFormFields {
-  display: flex;
-  gap: 1em;
-}
diff --git a/frontend/src/components/OAuthButtons.jsx b/frontend/src/components/OAuthButtons.jsx
deleted file mode 100644
index 31819e83d8..0000000000
--- a/frontend/src/components/OAuthButtons.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react'
-import { Grid, Header } from 'semantic-ui-react'
-import {
-  GithubLoginButton,
-  TwitterLoginButton,
-  GoogleLoginButton,
-} from 'react-social-login-buttons'
-
-const OAuthButtons = () => (
-  <>
-    <Header as="h3" textAlign="center">
-      Or with
-    </Header>
-    <Grid divided columns={3}>
-      <Grid.Row>
-        <Grid.Column>
-          <TwitterLoginButton>Twitter</TwitterLoginButton>
-        </Grid.Column>
-        <Grid.Column>
-          <GithubLoginButton>GitHub</GithubLoginButton>
-        </Grid.Column>
-        <Grid.Column>
-          <GoogleLoginButton>Google</GoogleLoginButton>
-        </Grid.Column>
-      </Grid.Row>
-    </Grid>
-  </>
-)
-
-export default OAuthButtons
diff --git a/frontend/src/models/ExistingProjectForm.js b/frontend/src/models/ExistingProjectForm.js
deleted file mode 100644
index e00073bc35..0000000000
--- a/frontend/src/models/ExistingProjectForm.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Joi from 'joi'
-
-const ExistingProjectFromModel = Joi.object({
-  _csrf: Joi.string(),
-  name: Joi.string().required().max(60),
-})
-
-export default ExistingProjectFromModel
diff --git a/frontend/src/models/SignInForm.js b/frontend/src/models/SignInForm.js
deleted file mode 100644
index cb2b7925fb..0000000000
--- a/frontend/src/models/SignInForm.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import Joi from 'joi'
-
-const SignInFormModel = Joi.object({
-  _csrf: Joi.string(),
-  username: Joi.alternatives()
-    .try(
-      Joi.string()
-        .regex(/^[a-zA-Z0-9_.-]+$/, 'username')
-        .min(2)
-        .max(40)
-        .messages({
-          'string.pattern.name':
-            'Invalid "username". Username must contain only letters, numbers, "_", "-", and "."',
-        }),
-
-      Joi.string()
-        .regex(/^([A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4})$/i, 'email')
-        .messages({
-          'string.pattern.name': 'Invalid email address',
-        }),
-    )
-    .required(),
-  password: Joi.string().required(),
-})
-
-export default SignInFormModel
-// regex to match email
diff --git a/frontend/src/models/SignUpForm.js b/frontend/src/models/SignUpForm.js
deleted file mode 100644
index 400c5f2194..0000000000
--- a/frontend/src/models/SignUpForm.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import Joi from 'joi'
-
-const SignUpFormModel = Joi.object({
-  _csrf: Joi.string(),
-  username: Joi.string()
-    .regex(/^[a-zA-Z0-9_.-]+$/, 'username')
-    .min(2)
-    .max(40)
-    .messages({
-      'string.pattern.name':
-        'Invalid "username". Username must contain only letters, numbers, "_", "-", and ".".',
-    }),
-  email: Joi.string()
-    .regex(/^([A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4})$/i, 'email')
-    .messages({
-      'string.pattern.name': 'Invalid email address',
-    })
-    .required(),
-  password: Joi.string().min(6).required(),
-})
-
-export default SignUpFormModel
diff --git a/frontend/src/models/SyncRepoForm.js b/frontend/src/models/SyncRepoForm.js
deleted file mode 100644
index 5b2d634c64..0000000000
--- a/frontend/src/models/SyncRepoForm.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import Joi from 'joi'
-
-const SyncRepoFromModel = Joi.object({
-  _csrf: Joi.string(),
-  url: Joi.string().uri(),
-})
-
-export default SyncRepoFromModel
diff --git a/frontend/src/pages/login/index.jsx b/frontend/src/pages/login/index.jsx
deleted file mode 100644
index 4b870fef64..0000000000
--- a/frontend/src/pages/login/index.jsx
+++ /dev/null
@@ -1,289 +0,0 @@
-import React, { useState, useContext } from 'react'
-import { func } from 'prop-types'
-import { useRouter } from 'next/router'
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Input,
-  Message,
-  Segment,
-  Tab,
-} from 'semantic-ui-react'
-import isEmpty from 'lodash/isEmpty'
-import getConfig from 'next/config'
-
-import Page from '@components/Page'
-import useForm from '@hooks/useForm'
-import { withAlreadySignedIn } from '@utils/authHandlers'
-import { getSession } from '@utils/giteaInternalApi'
-import SignInFormModel from '@models/SignInForm'
-import { AuthContext } from '@contexts/AuthContext'
-import OAuthButtons from '@components/OAuthButtons'
-import SignUpFormModel from '@models/SignUpForm'
-import styles from './index.module.scss'
-
-const { KITSPACE_GITEA_URL } = getConfig().publicRuntimeConfig
-
-const Login = () => {
-  const [openPane, setOpenPane] = useState(0)
-  const handlePaneChange = e => setOpenPane(e.target.value)
-
-  return (
-    <Page title="Kitspace | Login">
-      <Grid
-        data-cy="login-grid"
-        style={{ maxWidth: '500px', margin: 'auto' }}
-        verticalAlign="middle"
-      >
-        <Grid.Column>
-          <Tab
-            activeIndex={openPane}
-            panes={[
-              {
-                menuItem: 'Sign up',
-                render: function FirstPane() {
-                  return <SignUpForm openLoginPane={() => setOpenPane(1)} />
-                },
-              },
-              {
-                menuItem: 'Login',
-                render: function SecondPane() {
-                  return <SignInForm />
-                },
-              },
-            ]}
-            onTabChange={handlePaneChange}
-          />
-        </Grid.Column>
-      </Grid>
-    </Page>
-  )
-}
-
-export const getServerSideProps = withAlreadySignedIn
-
-const SignInForm = () => {
-  const endpoint = `${KITSPACE_GITEA_URL}/user/kitspace/sign_in`
-
-  const { push, query } = useRouter()
-  const { setUser, setCsrf, setApiToken } = useContext(AuthContext)
-
-  const { form, onChange, onBlur, isValid, formatErrorPrompt } = useForm(
-    SignInFormModel,
-    true,
-  )
-  const [apiResponse, setApiResponse] = useState({})
-
-  const hasApiError = apiResponse.error != null
-  const isSuccessfulLogin = apiResponse.login != null
-
-  const submit = async () => {
-    const response = await fetch(endpoint, {
-      method: 'POST',
-      body: JSON.stringify({
-        ...form,
-        remember: true, // remember the user by default
-      }),
-      headers: { 'Content-Type': 'application/json' },
-      credentials: 'include',
-    })
-
-    const data = await response.json()
-
-    if (response.ok && data.user) {
-      setUser(data.user)
-      const session = await getSession()
-      setApiToken(session.ApiToken)
-      setCsrf(session.csrf)
-      push(query.redirect || '/')
-    } else {
-      const { error, message } = data
-      setApiResponse({
-        error: error || 'API error',
-        message: message || 'Something went wrong. Please, try again later.',
-      })
-    }
-  }
-
-  return (
-    <>
-      <Header as="h2" textAlign="center">
-        Login
-      </Header>
-      <Message
-        negative={hasApiError}
-        positive={isSuccessfulLogin}
-        style={{
-          display: hasApiError || isSuccessfulLogin ? 'block' : 'none',
-        }}
-      >
-        {apiResponse.message || 'Logged in!'}
-      </Message>
-      <Form>
-        <Segment>
-          <Form.Field
-            fluid
-            required
-            control={Input}
-            error={formatErrorPrompt('username')}
-            label="Username or Email"
-            name="username"
-            placeholder="Username or Email"
-            value={form.username || ''}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-          <Form.Field
-            fluid
-            required
-            control={Input}
-            error={formatErrorPrompt('password')}
-            label="Password"
-            name="password"
-            placeholder="Password"
-            type="password"
-            value={form.password || ''}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-          <Form.Field
-            fluid
-            color="green"
-            content="Login"
-            control={Button}
-            disabled={!isValid}
-            size="large"
-            onClick={submit}
-          />
-        </Segment>
-        <Segment>
-          <OAuthButtons />
-        </Segment>
-      </Form>
-    </>
-  )
-}
-
-const SignUpForm = ({ openLoginPane }) => {
-  const endpoint = `${KITSPACE_GITEA_URL}/user/kitspace/sign_up`
-
-  const { setUser, setCsrf, setApiToken } = useContext(AuthContext)
-  const { form, onChange, onBlur, isValid, errors, formatErrorPrompt } = useForm(
-    SignUpFormModel,
-    true,
-  )
-  const [apiResponse, setApiResponse] = useState({})
-  const { push, query } = useRouter()
-
-  const submit = async () => {
-    const response = await fetch(endpoint, {
-      method: 'POST',
-      body: JSON.stringify(form),
-      headers: { 'Content-Type': 'application/json' },
-      credentials: 'include',
-    })
-    const data = await response.json()
-
-    if (response.ok && data.user) {
-      setUser(data.user)
-      const session = await getSession()
-      setApiToken(session.ApiToken)
-      setCsrf(session.csrf)
-      push(query.redirect || '/')
-    } else {
-      const { error, message } = data
-      setApiResponse({
-        error: error || 'API error',
-        message: message || 'Something went wrong. Please, try again later.',
-      })
-    }
-  }
-
-  const hasApiError = apiResponse.error != null
-  const isSuccessfulReg = apiResponse.duration != null
-
-  return (
-    <>
-      <Header as="h2" textAlign="center">
-        Create a new account
-      </Header>
-      <Message
-        negative={hasApiError}
-        positive={isSuccessfulReg}
-        style={{
-          display: hasApiError && isEmpty(errors) ? 'block' : 'none',
-        }}
-      >
-        {errors.msg || apiResponse.message}
-      </Message>
-      <Form>
-        <Segment>
-          <Form.Field
-            fluid
-            required
-            control={Input}
-            error={formatErrorPrompt('username')}
-            label="Username"
-            name="username"
-            placeholder="Username"
-            value={form.username || ''}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-          <Form.Field
-            fluid
-            required
-            control={Input}
-            error={formatErrorPrompt('email')}
-            label="Email"
-            name="email"
-            placeholder="Email"
-            value={form.email || ''}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-          <Form.Field
-            fluid
-            required
-            control={Input}
-            error={formatErrorPrompt('password')}
-            label="Password"
-            name="password"
-            placeholder="Password"
-            type="password"
-            value={form.password || ''}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-          <Form.Field
-            fluid
-            color="green"
-            content="Sign up"
-            control={Button}
-            disabled={!isValid}
-            size="large"
-            onClick={submit}
-          />
-          <Form.Field
-            as="a"
-            className={styles.loginInstead}
-            data-cy="log-in-here"
-            label="Already have an account? Log in here."
-            onClick={openLoginPane}
-          />
-        </Segment>
-        <Segment>
-          <OAuthButtons />
-        </Segment>
-      </Form>
-    </>
-  )
-}
-
-SignUpForm.propTypes = {
-  openLoginPane: func,
-}
-
-export default Login
diff --git a/frontend/src/pages/login/index.module.scss b/frontend/src/pages/login/index.module.scss
deleted file mode 100644
index d945b11983..0000000000
--- a/frontend/src/pages/login/index.module.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.loginInstead label:hover {
-  cursor: pointer;
-}
diff --git a/frontend/src/pages/projects/new/index.jsx b/frontend/src/pages/projects/new/index.jsx
deleted file mode 100644
index bee83cf42a..0000000000
--- a/frontend/src/pages/projects/new/index.jsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import React from 'react'
-import { Grid } from 'semantic-ui-react'
-
-import { withRequireSignIn } from '@utils/authHandlers'
-import Page from '@components/Page'
-import Sync from '@components/NewProject/Sync'
-import styles from './index.module.scss'
-
-const New = () => {
-  return (
-    <Page title="Add a project - Kitspace">
-      <Grid centered stackable className={styles.projectsNew} columns={2}>
-        <Grid.Row>
-          <Grid.Column className={styles.optionColumn}>
-            <Sync setUserOp={() => {}} />
-          </Grid.Column>
-        </Grid.Row>
-      </Grid>
-    </Page>
-  )
-}
-
-export const getServerSideProps = withRequireSignIn('/projects/new')
-
-export default New
diff --git a/frontend/src/pages/projects/new/index.module.scss b/frontend/src/pages/projects/new/index.module.scss
deleted file mode 100644
index 9f3848b3fc..0000000000
--- a/frontend/src/pages/projects/new/index.module.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.projectsNew {
-  margin-top: 30px !important;
-  height: 75vh;
-  max-width: 1500px;
-}
-
-.syncSide {
-  padding-left: 50px;
-  padding-right: 50px;
-  display: flex;
-  flex-wrap: wrap;
-  justify-content: center;
-  width: 100%;
-}
-
-.optionColumn {
-  display: flex !important;
-  align-items: center;
-  justify-content: center;
-}
diff --git a/frontend/src/pages/search/index.tsx b/frontend/src/pages/search/index.tsx
index fd8ae8939a..9bd99b560a 100644
--- a/frontend/src/pages/search/index.tsx
+++ b/frontend/src/pages/search/index.tsx
@@ -64,7 +64,7 @@ const PageContent = () => {
       {projects.length === 0 ? (
         <p className={styles.noMatching} data-cy="cards-grid">
           Sorry, no result.{' '}
-          <Link href="/projects/new">
+          <Link href="https://github.com/kitspace/kitspace#adding-your-project">
             <a>Add your project!</a>
           </Link>
         </p>
diff --git a/frontend/src/pages/settings.jsx b/frontend/src/pages/settings.jsx
deleted file mode 100644
index 3092731940..0000000000
--- a/frontend/src/pages/settings.jsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import React from 'react'
-
-import { withRequireSignIn } from '@utils/authHandlers'
-import Page from '@components/Page'
-
-const Settings = () => {
-  return (
-    <Page title="Kitspace| Settings">
-      <h1>Settings</h1>
-    </Page>
-  )
-}
-
-export const getServerSideProps = withRequireSignIn('/settings')
-
-export default Settings
diff --git a/frontend/test/ConflictModal.test.tsx b/frontend/test/ConflictModal.test.tsx
deleted file mode 100644
index c546751017..0000000000
--- a/frontend/test/ConflictModal.test.tsx
+++ /dev/null
@@ -1,152 +0,0 @@
-import { afterEach, beforeAll, beforeEach, expect, it, vi } from 'vitest'
-import { cleanup, fireEvent, render, waitFor } from '@testing-library/react'
-
-import Sync from '@components/NewProject/Sync'
-import { SyncConflictModal } from '@components/NewProject/ConflictModal'
-import AuthProvider from '@contexts/AuthContext'
-
-import GetRepo from './fixtures/GetRepoRes.json'
-
-const SESSION = { user: { username: 'tester' } }
-
-beforeAll(() => {
-  vi.mock('next/config', () => ({
-    default: () => ({
-      publicRuntimeConfig: {
-        KITSPACE_GITEA_URL: 'https://gitea.kitspace.test',
-      },
-    }),
-  }))
-
-  vi.mock('next/router', () => require('next-router-mock'))
-})
-
-beforeEach(() => {
-  const GITEA_URL = 'https://gitea.kitspace.test'
-  fetchMock.mockResponse(req => {
-    switch (req.url) {
-      case `${GITEA_URL}/api/v1/repos/tester/test_repo`:
-        return JSON.stringify(GetRepo)
-      case `${GITEA_URL}/api/v1/repos/migrate`:
-        return { status: 409 }
-      case `${GITEA_URL}/api/v1/repos/tester/new_test_repo`:
-        return { status: 404 }
-      default:
-        throw new Error(`Unhandled request: ${req.url}`)
-    }
-  })
-})
-
-it('opens conflict modal if the project name conflict with existing project', async () => {
-  const setUserOp = vi.fn()
-  const screen = render(
-    <AuthProvider initialSession={SESSION}>
-      <Sync setUserOp={setUserOp} />
-    </AuthProvider>,
-  )
-
-  // Write the url in the input
-  const input = screen.getAllByRole('textbox')
-  fireEvent.change(input[0], {
-    target: { value: 'https://github.com/kitspace-test-repos/test_repo' },
-  })
-
-  // Click the Sync button
-  fireEvent.click(screen.getByText('Sync'))
-  // Wait the modal to appear
-  await screen.findByText('A project with that name already exists.')
-  // It should set the userOp to sync
-  expect(setUserOp).toHaveBeenCalled()
-
-  // The conflict modal form should have the project name
-  const conflictModalInput = screen.getAllByRole('textbox')[1] as HTMLInputElement
-  expect(conflictModalInput.value).toBe('test_repo')
-  // The button should say overwrite because we haven't changed the project name yet.
-  expect(screen.getByText('Overwrite')).toBeTruthy()
-})
-
-it('changes the overwrite button to OK if the new project name does not cause conflict', async () => {
-  const setUserOp = vi.fn()
-
-  const screen = render(
-    <AuthProvider initialSession={SESSION}>
-      <Sync setUserOp={setUserOp} />
-    </AuthProvider>,
-  )
-  // Write the url in the input
-  const input = screen.getAllByRole('textbox')
-  fireEvent.change(input[0], {
-    target: { value: 'https://github.com/kitspace-test-repos/test_repo' },
-  })
-
-  // Click the Sync button
-  fireEvent.click(screen.getByText('Sync'))
-  // Wait the modal to appear.
-  await screen.findByText('A project with that name already exists.')
-
-  const conflictModalInput = screen.getAllByRole('textbox')[1] as HTMLInputElement
-  // Change the project name.
-  fireEvent.change(conflictModalInput, {
-    target: { value: 'new_test_repo' },
-  })
-
-  // The button should say OK because we have changed the project name.
-  expect(screen.getByText('OK')).toBeTruthy()
-})
-
-it('overwrites the repo if the user clicks on `Overwrite`', () => {
-  const onClose = vi.fn()
-  const onDifferentName = vi.fn()
-  const onOverwrite = vi.fn()
-
-  const screen = render(
-    <AuthProvider initialSession={SESSION}>
-      <SyncConflictModal
-        conflictModalOpen={true}
-        originalProjectName="test_repo"
-        onClose={onClose}
-        onDifferentName={onDifferentName}
-        onOverwrite={onOverwrite}
-      />
-    </AuthProvider>,
-  )
-  fireEvent.click(screen.getByText('Overwrite'))
-  expect(onOverwrite).toHaveBeenCalled()
-})
-
-it('creates a repo with a different name if the user the conflicting name and clicks `OK`', async () => {
-  const onClose = vi.fn()
-  const onDifferentName = vi.fn()
-  const onOverwrite = vi.fn()
-
-  const screen = render(
-    <AuthProvider initialSession={SESSION}>
-      <SyncConflictModal
-        conflictModalOpen={true}
-        originalProjectName="test_repo"
-        onClose={onClose}
-        onDifferentName={onDifferentName}
-        onOverwrite={onOverwrite}
-      />
-    </AuthProvider>,
-  )
-
-  const conflictModalInput = screen.getAllByRole('textbox')[0]
-
-  fireEvent.change(conflictModalInput, {
-    target: { value: 'new_test_repo' },
-  })
-
-  // Wait for the button to be enabled
-  await waitFor(() =>
-    expect(screen.getByText('OK')).toHaveProperty('disabled', false),
-  )
-
-  fireEvent.click(screen.getByText('OK'))
-  expect(onDifferentName).toHaveBeenCalled()
-})
-
-afterEach(() => {
-  cleanup()
-  fetchMock.resetMocks()
-})
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index e84baca201..35dcc365cc 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1115,11 +1115,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
-attr-accept@^2.2.1:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b"
-  integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg==
-
 axe-core@^4.0.2:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.2.1.tgz#2e50bcf10ee5b819014f6e342e41e45096239e34"
@@ -2124,20 +2119,6 @@ file-loader@^6.0.0:
     loader-utils "^2.0.0"
     schema-utils "^2.6.5"
 
-file-selector@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.2.tgz#76186ac94ea01a18262a1e9ee36a8815911bc0b4"
-  integrity sha512-tMZc0lkFzhOGlZUAkQ5iljPORvDX+nWEI+9C5nj9KT7Ax8bAUUtI/GYM8JFIjyKfKlQkJRC84D0UgxwDqRGvRQ==
-  dependencies:
-    tslib "^2.0.3"
-
-file-selector@^0.2.4:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.2.4.tgz#7b98286f9dbb9925f420130ea5ed0a69238d4d80"
-  integrity sha512-ZDsQNbrv6qRi1YTDOEWzf5J2KjZ9KMI1Q2SGeTkCJmNNW25Jg4TW4UMcmoqcg4WrAyKRcpBXdbWRxkfrOzVRbA==
-  dependencies:
-    tslib "^2.0.3"
-
 fill-range@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
@@ -2313,12 +2294,17 @@ globrex@^0.1.2:
   resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
-goober@^2.0.15:
-  version "2.0.19"
-  resolved "https://registry.yarnpkg.com/goober/-/goober-2.0.19.tgz#9a17ca57f32f5009d013a85bbb44d67d2be6b596"
-  integrity sha512-ewW0g4H+CDIxneBEynuaiGiCIGhlKxo6APHMntnJBt/Qx5XMBLJXrgKdj6CDM/id0vSK9F2EtIPE++8bttCC9Q==
+graceful-fs@^4.1.2:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
+graceful-fs@^4.2.4:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
 
-graceful-fs@^4.1.2, graceful-fs@^4.2.4, graceful-fs@^4.2.9:
+graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
   integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
@@ -3414,27 +3400,11 @@ react-double-scrollbar@^0.0.15:
   resolved "https://registry.yarnpkg.com/react-double-scrollbar/-/react-double-scrollbar-0.0.15.tgz#e915ab8cb3b959877075f49436debfdb04288fe4"
   integrity sha1-6RWrjLO5WYdwdfSUNt6/2wQoj+Q=
 
-react-dropzone@^11.5.1:
-  version "11.5.1"
-  resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.5.1.tgz#f4d664437bf8af6acfccbf5040a9890c6780a49f"
-  integrity sha512-eNhttdq4ZDe3eKbXAe54Opt+sbtqmNK5NWTHf/l5d+1TdZqShJ8gMjBrya00qx5zkI//TYxRhu1d9pemTgaWwg==
-  dependencies:
-    attr-accept "^2.2.1"
-    file-selector "^0.2.2"
-    prop-types "^15.7.2"
-
 react-fast-compare@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
 
-react-hot-toast@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/react-hot-toast/-/react-hot-toast-1.0.1.tgz#1352a526545f157bc83fbc2b19ac3ad1d92e780e"
-  integrity sha512-og5MNzjNHa7BTjdThj3cwGoyD8tLoxMN9c8/Sme6bBLCnlrF54QrNOJW5gJkETTsuAHVsUK5z8Q6vvkc+9OfCg==
-  dependencies:
-    goober "^2.0.15"
-
 react-intersection-observer@^9.4.1:
   version "9.4.1"
   resolved "https://registry.yarnpkg.com/react-intersection-observer/-/react-intersection-observer-9.4.1.tgz#4ccb21e16acd0b9cf5b28d275af7055bef878f6b"
@@ -3463,11 +3433,6 @@ react-refresh@^0.14.0:
   resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.0.tgz#4e02825378a5f227079554d4284889354e5f553e"
   integrity sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==
 
-react-social-login-buttons@3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/react-social-login-buttons/-/react-social-login-buttons-3.1.2.tgz#ba99cc2c508e7abeb1afdacaf50c885d590f9e66"
-  integrity sha512-a8YinHatG28MUqLap5J5n6X6fvjXBVu8Zng++esZwLIUfCS3BoUVpn4cHaNR8FiTYLX5DKLPuKpzXTPHm8V7mw==
-
 react@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
@@ -4077,11 +4042,6 @@ tslib@^1.8.1, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
-
 tsutils@^3.21.0:
   version "3.21.0"
   resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
diff --git a/scripts/pre_e2e.sh b/scripts/pre_e2e.sh
index 3bb4066a33..24fc2d31d6 100755
--- a/scripts/pre_e2e.sh
+++ b/scripts/pre_e2e.sh
@@ -4,5 +4,18 @@ set -Eeuo pipefail
 # Generate big files which are used during testing
 # `uploadProject.spec.js` -> should reject files bigger than `MAX_FILE_SIZE`
 auto_gen_fixtures_path=e2e/cypress/fixtures/auto-gen
-mkdir $auto_gen_fixtures_path
+rm -rf $auto_gen_fixtures_path && mkdir $auto_gen_fixtures_path
 truncate -s "${MAX_FILE_SIZE}" "${auto_gen_fixtures_path}/big.txt"
+
+# generate admin token used for importing projects during e2e tests
+if [[ "${CI:-}" = "true" ]]; then
+    docker-compose -f docker-compose.yml -f docker-compose.deploy.yml up -d
+    until docker logs kitspace_gitea_1 | grep -q 'ORM engine initialization successful' ; do sleep 3s; done
+else
+    # The tests are running locally.
+    docker-compose up -d
+fi
+
+token="$(deno run --allow-env --allow-net --allow-run ./scripts/importBoardsTxt.ts --tokenOnly)"
+# reutrn the token so it can be used as $(./scripts/pre_e2e.sh)
+echo $token