diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56c91a9e..906687d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,12 +59,11 @@ build:
     # - pnpm i --prefer-offline
     # - pnpm build:full:skip || pnpm i -r --prefer-offline
     - pnpm install
-    # TODO: something doesn't work with git here...
+    # TODO: whats the benifit for CI? something doesn't work with git here...
     # "🦋  error Error: Failed to find where HEAD diverged from master. Does master exist?"
     # - pnpm changeset:status
     - pnpm build:full $TURBO_CACHE_BYPASS
-    # pretty sure this is deprecated?
-    # TODO: - .gitlab/ci/enableGitlabReviewToolbar.sh www/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS"
+    - .gitlab/ci/enableGitlabReviewToolbar.sh frontend/app/www/index.html "$CI_PROJECT_ID" "$CI_OPEN_MERGE_REQUESTS"
     - cp frontend/app/www/index.html frontend/app/www/200.html
     - pnpm dlx surge -p frontend/app/www -d https://$CI_PROJECT_NAME-$DEPLOY_ID.surge.sh/
   cache:
diff --git a/.gitlab/ci/enableGitlabReviewToolbar.sh b/.gitlab/ci/enableGitlabReviewToolbar.sh
old mode 100644
new mode 100755
index e99d5b2c..3d2d5d8b
--- a/.gitlab/ci/enableGitlabReviewToolbar.sh
+++ b/.gitlab/ci/enableGitlabReviewToolbar.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/env sh
+set -e
 
 # Adds a preedefined script tag including the merge current request id to the angular web app index.html.
 # This enables the interactive gitlab review toolbar.
@@ -9,7 +10,7 @@ if echo -n $3 | grep -Eq '[0-9]+$'; then
 fi
 
 INDEX_PATH=$(dirname $1)
-SCRIPT_TAG="<script defer data-project-id=\"$2\" data-project-path=\"openstapps/app\" data-merge-request-id=\"$MERGE_REQUEST_ID\" data-mr-url=\"https://gitlab.com\" id=\"review-app-toolbar-script\" src=\"visual_review_toolbar.js\"></script>"
+SCRIPT_TAG="<script defer data-project-id=\"$2\" data-project-path=\"openstapps/openstapps\" data-merge-request-id=\"$MERGE_REQUEST_ID\" data-mr-url=\"https://gitlab.com\" id=\"review-app-toolbar-script\" src=\"visual_review_toolbar.js\"></script>"
 
 curl https://gitlab.com/assets/webpack/visual_review_toolbar.js --output  "$INDEX_PATH/visual_review_toolbar.js" --silent
 sed -i -e "\@</head>@i\\$SCRIPT_TAG" $1
diff --git a/.gitlab/ci/getRegistryBranch.sh b/.gitlab/ci/getRegistryBranch.sh
old mode 100644
new mode 100755
diff --git a/.gitlab/ci/getRegistryTag.sh b/.gitlab/ci/getRegistryTag.sh
old mode 100644
new mode 100755
diff --git a/.gitlab/ci/install-for-turbo.sh b/.gitlab/ci/install-for-turbo.sh
old mode 100644
new mode 100755
diff --git a/.gitlab/ci/pushAsLatestVersion.sh b/.gitlab/ci/pushAsLatestVersion.sh
old mode 100644
new mode 100755
diff --git a/.gitlab/ci/setup_turbo_env.sh b/.gitlab/ci/setup_turbo_env.sh
old mode 100644
new mode 100755
diff --git a/.gitlab/ci/testCIScripts.sh b/.gitlab/ci/testCIScripts.sh
old mode 100644
new mode 100755
diff --git a/.gitlab/publishing.gitlab-ci.yml b/.gitlab/publishing.gitlab-ci.yml
index 04f072ff..1af725b4 100644
--- a/.gitlab/publishing.gitlab-ci.yml
+++ b/.gitlab/publishing.gitlab-ci.yml
@@ -10,7 +10,7 @@ deploy:
     - pnpm run deploy
   artifacts:
     paths:
-      - ./.deploy #TODO: split artifacts (keep frontend, fast expire .deploy)
+      - ./.deploy
       - ./frontend/app/www
   rules: !reference [.limit_publishing]
 
diff --git a/frontend/app/.gitlab-ci.yml b/frontend/app/.gitlab-ci.yml
index e1c9659e..8cf361df 100644
--- a/frontend/app/.gitlab-ci.yml
+++ b/frontend/app/.gitlab-ci.yml
@@ -6,7 +6,7 @@ e2e:
     - pnpm --filter=@openstapps/app exec cypress install
     - pnpm test:integration:app
   artifacts:
-    when: on_failure #TODO: expire artifacts / only keep if job failed etc.
+    when: on_failure
     paths:
       - frontend/app/cypress/videos
       - frontend/app/cypress/screenshots