diff --git a/.github/workflows/recordScreenshots.yml b/.github/workflows/recordScreenshots.yml
index ef3630ee39..161e2ade89 100644
--- a/.github/workflows/recordScreenshots.yml
+++ b/.github/workflows/recordScreenshots.yml
@@ -7,7 +7,8 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-  GRADLE_OPTS: -Dorg.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC -Dkotlin.daemon.jvm.options=-Xmx4g -Dsonar.gradle.skipCompile=true --no-configuration-cache
+  GRADLE_OPTS: -Dorg.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC -Dkotlin.daemon.jvm.options=-Xmx4g -Dsonar.gradle.skipCompile=true
+  CI_GRADLE_ARG_PROPERTIES: --no-configuration-cache
 
 jobs:
   record:
@@ -48,3 +49,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN || secrets.GITHUB_TOKEN }}
           GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }}
+          GRADLE_ARGS: ${{ env.CI_GRADLE_ARG_PROPERTIES }}
diff --git a/.github/workflows/scripts/recordScreenshots.sh b/.github/workflows/scripts/recordScreenshots.sh
index 5af6d04e38..490eda4493 100755
--- a/.github/workflows/scripts/recordScreenshots.sh
+++ b/.github/workflows/scripts/recordScreenshots.sh
@@ -51,10 +51,10 @@ if [[ -z ${REPO} ]]; then
 fi
 
 echo "Deleting previous screenshots"
-./gradlew removeOldSnapshots --stacktrace --warn
+./gradlew removeOldSnapshots --stacktrace --warn $GRADLE_ARGS
 
 echo "Record screenshots"
-./gradlew recordPaparazziDebug --stacktrace
+./gradlew recordPaparazziDebug --stacktrace $GRADLE_ARGS
 
 echo "Committing changes"
 git config http.sslVerify false