diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e8fc2bc88e638ddb4916e5bb11d37eadbe661df2..9db018157fcec20136576b78b2738df2007c817b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -118,7 +118,9 @@ clean install:
   artifacts:
     paths:
       - images.txt
-    expire_in: 7 days
+      - "cypress-tests/*/tests/cypress/screenshots"
+      - "cypress-tests/*/tests/cypress/videos"
+    expire_in: 7 days 
 
 upgrade:
   stage: smoke tests
@@ -146,6 +148,12 @@ upgrade:
     - git checkout ${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}
     - *deploy_bigbang
     - *test_bigbang
+  artifacts:
+    paths:
+      - "cypress-tests/*/tests/cypress/screenshots"
+      - "cypress-tests/*/tests/cypress/videos"
+    expire_in: 7 days
+    when: always
 
 #-----------------------------------------------------------------------------------------------------------------------
 
diff --git a/chart/values.yaml b/chart/values.yaml
index 1aa6f6c44727d46c8d7b6a3b79b9735e1c1b7534..cd78cb73be8035692b1c66b7d1ee5b173cdf8ba1 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -217,7 +217,7 @@ monitoring:
   git:
     repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/monitoring.git
     path: "./chart"
-    tag: "11.0.0-bb.13"
+    tag: "11.0.0-bb.15"
 
   sso:
     # -- Toggle SSO for monitoring components on and off
@@ -276,7 +276,7 @@ addons:
     git:
       repo: https://repo1.dso.mil/platform-one/big-bang/apps/core/argocd.git
       path: "./chart"
-      tag: "2.14.7-bb.0"
+      tag: "2.14.7-bb.1"
     sso:
       # -- Toggle SSO for ArgoCD on and off
       enabled: false
diff --git a/tests/bash/03_cypress.sh b/tests/bash/03_cypress.sh
new file mode 100755
index 0000000000000000000000000000000000000000..5e33518a241cfa574829541db050aa8963ade83d
--- /dev/null
+++ b/tests/bash/03_cypress.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+# exit on error
+set -e
+
+mkdir -p cypress-tests/
+
+#Cloning core
+yq e '. | keys | .[] | ... comments=""' "tests/ci/k3d/values.yaml" | while IFS= read -r package; do
+  if [[ "$(yq e ".${package}.enabled" "tests/ci/k3d/values.yaml")" == "true" ]]; then
+    #Checking for branch not tag
+    if [ "$(yq e ".${package}.git.tag" "chart/values.yaml")" != null ]; then
+      echo "Cloning ${package} into cypress-tests"
+      git -C cypress-tests/ clone -b $(yq e ".${package}.git.tag" "chart/values.yaml") $(yq e ".${package}.git.repo" "chart/values.yaml")
+    else
+      echo "Cloning ${package} into cypress-tests"
+      git -C cypress-tests/ clone -b $(yq e ".${package}.git.branch" "chart/values.yaml") $(yq e ".${package}.git.repo" "chart/values.yaml")
+    fi
+  fi
+done
+
+#Cloning addons
+yq e '.addons | keys | .[] | ... comments=""' "tests/ci/k3d/values.yaml" | while IFS= read -r package; do
+  if [ "$(yq e ".addons.${package}.enabled" "tests/ci/k3d/values.yaml")" == "true" ]; then
+    #Checking for branch not tag
+    if [ "$(yq e ".addons.${package}.git.tag" "chart/values.yaml")" != null ]; then
+      echo "Cloning ${package} into cypress-tests"
+      git -C cypress-tests/ clone -b $(yq e ".addons.${package}.git.tag" "chart/values.yaml") $(yq e ".addons.${package}.git.repo" "chart/values.yaml")
+    else
+      echo "Cloning ${package} into cypress-tests"
+      git -C cypress-tests/ clone -b $(yq e ".addons.${package}.git.branch" "chart/values.yaml") $(yq e ".addons.${package}.git.repo" "chart/values.yaml")
+    fi
+  fi
+done
+
+#Running Cypress tests
+for dir in cypress-tests/*/
+do
+  if [ -f "${dir}tests/cypress.json" ]; then
+    echo "Running cypress tests in ${dir}"
+    cypress run --project "${dir}"tests
+  fi
+done
\ No newline at end of file