diff --git a/metadata/security.pEp.yml b/metadata/security.pEp.yml
index 9aadf07790..ba7a45bf56 100644
--- a/metadata/security.pEp.yml
+++ b/metadata/security.pEp.yml
@@ -48,6 +48,7 @@ Repo: https://pep-security.lu/gitlab/android/pep.git
 Builds:
   - versionName: 1.1.008
     versionCode: 54
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.008
     subdir: k9mail
     sudo:
@@ -103,6 +104,7 @@ Builds:
 
   - versionName: 1.1.200
     versionCode: 67
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.200
     subdir: k9mail
     sudo:
@@ -160,6 +162,7 @@ Builds:
 
   - versionName: 1.1.205
     versionCode: 72
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.205
     subdir: k9mail
     sudo:
@@ -217,6 +220,7 @@ Builds:
 
   - versionName: 1.1.206
     versionCode: 73
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.206
     subdir: k9mail
     sudo:
@@ -274,6 +278,7 @@ Builds:
 
   - versionName: 1.1.207
     versionCode: 74
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.207
     subdir: k9mail
     sudo:
@@ -331,6 +336,7 @@ Builds:
 
   - versionName: 1.1.208
     versionCode: 75
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.208
     subdir: k9mail
     sudo:
@@ -388,6 +394,7 @@ Builds:
 
   - versionName: 1.1.209
     versionCode: 76
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.209
     subdir: k9mail
     sudo:
@@ -445,6 +452,7 @@ Builds:
 
   - versionName: 1.1.213
     versionCode: 80
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.213
     subdir: k9mail
     sudo:
@@ -502,6 +510,7 @@ Builds:
 
   - versionName: 1.1.214
     versionCode: 81
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.214
     subdir: k9mail
     sudo:
@@ -559,6 +568,7 @@ Builds:
 
   - versionName: 1.1.251
     versionCode: 83
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.251
     subdir: k9mail
     sudo:
@@ -613,6 +623,7 @@ Builds:
 
   - versionName: 1.1.264
     versionCode: 88
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.264
     subdir: k9mail
     sudo:
@@ -664,6 +675,7 @@ Builds:
 
   - versionName: 1.1.265
     versionCode: 89
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.265
     subdir: k9mail
     sudo:
@@ -715,6 +727,7 @@ Builds:
 
   - versionName: 1.1.271
     versionCode: 95
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.271
     subdir: k9mail
     sudo:
@@ -761,6 +774,7 @@ Builds:
 
   - versionName: v1.1.272
     versionCode: 469
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.272
     subdir: k9mail
     sudo:
@@ -807,6 +821,7 @@ Builds:
 
   - versionName: v1.1.273
     versionCode: 470
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.273
     subdir: k9mail
     sudo:
@@ -855,6 +870,7 @@ Builds:
 
   - versionName: v1.1.281
     versionCode: 473
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.281
     subdir: k9mail
     sudo:
@@ -903,6 +919,7 @@ Builds:
 
   - versionName: v1.1.273-1
     versionCode: 475
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.273-1
     subdir: k9mail
     sudo:
@@ -951,6 +968,7 @@ Builds:
 
   - versionName: v1.1.284
     versionCode: 476
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.284
     subdir: k9mail
     sudo:
@@ -998,6 +1016,7 @@ Builds:
 
   - versionName: v1.1.286
     versionCode: 478
+    disable: https://gitlab.com/fdroid/fdroidserver/-/issues/1004#note_1027749339
     commit: v1.1.286
     subdir: k9mail
     sudo: