diff --git a/.gitignore b/.gitignore
index 1cb9c00d0bc0ae0fb4e3154d7ac1f0c199e5cdb5..a1e149a9c68a3da39e6ead4e69224e2010e620b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
-values-local.yaml
 charts
 *.swp
 node_modules/
 cypress/videos/
 cypress/screenshots/
+# Ignore local dev files
+Taskfile.yaml
+values-stackspin.yaml
+values-local.yaml
diff --git a/templates/tests/cypress-test-nc-oo.yaml b/templates/tests/cypress-test-nc-oo.yaml
index 16395e85869bd4bac4a86d9ad8a1900940ee7d30..6d71211852addab5370d4bd7fc2bf342f994b579 100644
--- a/templates/tests/cypress-test-nc-oo.yaml
+++ b/templates/tests/cypress-test-nc-oo.yaml
@@ -49,10 +49,14 @@ spec:
         {{- end }}
         - name: CYPRESS_ONLYOFFICE_URL
           value: {{ .Values.onlyoffice.server_name }}
+        {{- if .Values.tests.cypress.projectId }}
         - name: CYPRESS_PROJECT_ID
           value: {{ .Values.tests.cypress.projectId }}
+        {{- end }}
+        {{- if .Values.tests.cypress.recordKey }}
         - name: CYPRESS_RECORD_KEY
           value: {{ .Values.tests.cypress.recordKey }}
+        {{- end }}
         {{- if .Values.tests.cypress.commitInfo }}
         {{- if .Values.tests.cypress.commitInfo.branch }}
         - name: COMMIT_INFO_BRANCH