diff --git a/.gitattributes b/.gitattributes
index 0b26d9772..dffe009c2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,3 +3,4 @@ common/.config/elia/config.toml filter=redact
 common/.config/nvim/lua/config/secrets.lua filter=redact
 common/.config/git/credentials filter=redact
 common/.local/bin/openproject_hours filter=redact
+common/.config/task/taskrc filter=taskwarrior-clean
diff --git a/common/.config/git/config b/common/.config/git/config
index 7268924b9..9508616d5 100644
--- a/common/.config/git/config
+++ b/common/.config/git/config
@@ -27,6 +27,8 @@
     clean = ~/.local/libexec/redact_git_filter clean
     smudge = ~/.local/libexec/redact_git_filter smudge
     required = true
+[filter "taskwarrior-clean"]
+    clean = sed 's/context=.*//'
 [diff]
     colorMoved = default
 [core]
diff --git a/common/.config/task/taskrc b/common/.config/task/taskrc
index 9c5acfe03..2e66401bd 100644
--- a/common/.config/task/taskrc
+++ b/common/.config/task/taskrc
@@ -3,4 +3,4 @@ include ~/.config/task/host
 
 # this file should be locally ignored in git to prevent context changes from creating diffs
 news.version=3.1.0
-context=ez_compose
+