diff --git a/.gitignore b/.gitignore
index 6e866be..d9f00d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ yarn-error.log*
 
 # cypress
 cypress/screenshots/*
+cypress/videos/*
 
 #storybook
 /storybook-static
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e72f7b8..927d589 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,42 @@
 stages:
-  - lint
-  - build
-  - test
+  - verify
+  - e2e
 
-image: vnglst/finding-nora:latest
+image: cypress/base:10
 
 lint:
-  stage: lint
+  stage: verify
   before_script:
     - yarn
-  cache:
-    untracked: true
   script:
     - yarn lint
 
-build:
-  stage: build
+jest-unit-tests:
+  stage: verify
+  before_script:
+    - yarn
+  script:
+    - yarn test
+
+check-build:
+  stage: verify
   before_script:
     - yarn
-  cache:
-    untracked: true
   script:
     - yarn build
 
-test:
-  stage: test
+cypress-e2e-tests:
+  image: cypress/base:10
+  stage: e2e
   before_script:
     - yarn
-  cache:
-    untracked: true
+    - npm install
+    - yarn start &
   script:
-    - yarn test
+    - yarn cypress:ci
+  artifacts:
+    expire_in: 1 day
+    when: always
+    paths:
+      - cypress/screenshots
+      - cypress/videos