diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index 9213c661c..22d89c231 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -301,4 +301,4 @@ run_stop: true
 
 # Saves the git hash in a file called git_hash.yml 
 # Set this to false if GIT is not installed on the local system (the system where the ansible command is run on)
-git_save_hash: true
\ No newline at end of file
+matrix_playbook_commit_hash_preservation_enabled: true
\ No newline at end of file
diff --git a/roles/matrix-base/tasks/setup_matrix_base.yml b/roles/matrix-base/tasks/setup_matrix_base.yml
index 5d3c5820f..d443fee8d 100644
--- a/roles/matrix-base/tasks/setup_matrix_base.yml
+++ b/roles/matrix-base/tasks/setup_matrix_base.yml
@@ -60,17 +60,17 @@
       ansible.builtin.debug:
         msg: >-
           Couldn't find GIT on the local machine. Continuing without saving the GIT hash.
-          You can disable saving the GIT hash by setting 'git_save_hash: false' in vars.yml
+          You can disable saving the GIT hash by setting 'matrix_playbook_commit_hash_preservation_enabled: false' in vars.yml
       when: "git_describe.stderr.find('not found') != -1"
 
     - name: GIT hash error
       ansible.builtin.fail:
         msg: >-
           Error when trying to get the GIT hash.
-          You can disable saving the GIT hash by setting 'git_save_hash: false' in vars.yml
+          You can disable saving the GIT hash by setting 'matrix_playbook_commit_hash_preservation_enabled: false' in vars.yml
       when: "git_describe.stderr.find('not found') == -1"
 
-  when: "matrix_vars_yml_snapshotting_enabled|bool and git_save_hash|bool"
+  when: "matrix_vars_yml_snapshotting_enabled|bool and matrix_playbook_commit_hash_preservation_enabled|bool"
 
 - name: Ensure Matrix network is created in Docker
   community.docker.docker_network: