diff --git a/.github/workflows/ftp.yml b/.github/workflows/ftp.yml
index 1caaa9a93ff66..aade252472fbf 100644
--- a/.github/workflows/ftp.yml
+++ b/.github/workflows/ftp.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         php-versions: ['7.4', '8.0']
-        ftpd: ['proftpd', 'vsftpd', 'pure-ftpd']
+        ftpd: ['vsftpd', 'pure-ftpd']
 
     name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
 
@@ -38,7 +38,6 @@ jobs:
         run: |
           sudo mkdir /tmp/ftp
           sudo chown -R 0777 /tmp/ftp
-          if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then docker run --name ftp -d --net host -e FTP_USERNAME=test -e FTP_PASSWORD=test -v /tmp/ftp:/home/test hauptmedia/proftpd; fi
           if [[ "${{ matrix.ftpd }}" == 'vsftpd' ]]; then docker run --name ftp -d --net host -e FTP_USER=test -e FTP_PASS=test -e PASV_ADDRESS=127.0.0.1 -v /tmp/ftp:/home/vsftpd/test fauria/vsftpd; fi
           if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp2:/home/test -v /tmp/ftp2:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi
       - name: Set up php ${{ matrix.php-versions }}
diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml
index 4d70fe29f2368..5ac7acf584569 100644
--- a/.github/workflows/s3-external.yml
+++ b/.github/workflows/s3-external.yml
@@ -32,7 +32,7 @@ jobs:
         env:
           MINIO_ACCESS_KEY: minio
           MINIO_SECRET_KEY: minio123
-        image: bitnami/minio:2021.10.6
+        image: bitnamilegacy/minio:2021.10.6
         ports:
           - "9000:9000"
 
diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php
index 300b9f3f60457..b2e6b3b5e3515 100644
--- a/apps/files_external/tests/Storage/SmbTest.php
+++ b/apps/files_external/tests/Storage/SmbTest.php
@@ -96,6 +96,8 @@ public function testStorageId() {
 	}
 
 	public function testNotifyGetChanges() {
+		$this->markTestSkipped('This test fails too frequently');
+
 		$notifyHandler = $this->instance->notify('');
 		sleep(1); //give time for the notify to start
 		$this->instance->file_put_contents('/newfile.txt', 'test content');
diff --git a/resources/codesigning/root.crl b/resources/codesigning/root.crl
index 9db33f41dca01..2cc4fc92df933 100644
--- a/resources/codesigning/root.crl
+++ b/resources/codesigning/root.crl
@@ -1,8 +1,8 @@
 -----BEGIN X509 CRL-----
-MIIKBTCCCO0CAQEwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCREUxGzAZBgNV
+MIIKGjCCCQICAQEwDQYJKoZIhvcNAQELBQAwezELMAkGA1UEBhMCREUxGzAZBgNV
 BAgMEkJhZGVuLVd1ZXJ0dGVtYmVyZzEXMBUGA1UECgwOTmV4dGNsb3VkIEdtYkgx
 NjA0BgNVBAMMLU5leHRjbG91ZCBDb2RlIFNpZ25pbmcgSW50ZXJtZWRpYXRlIEF1
-dGhvcml0eRcNMjUwOTMwMTUyMDU5WhcNMzUwODA5MTUyMDU5WjCCCAowEwICEAIX
+dGhvcml0eRcNMjUxMTA0MDgwODMzWhcNMzUwOTEzMDgwODMzWjCCCB8wEwICEAIX
 DTIxMDQxOTA5NTI0NVowEwICEBAXDTE2MTAxNzEyMDkxOVowEwICEBYXDTE3MTEy
 MzE3MzUyOVowEwICEBcXDTE3MDIyMDEwMDIzOFowEwICEBgXDTE5MDEzMDEzMDEy
 NVowEwICEBwXDTE4MDIwMjEwNTIzOVowEwICEB8XDTE5MDEzMDEzMDEzM1owEwIC
@@ -45,12 +45,12 @@ EjoXDTIzMTIxMTA4MzAxNVowEwICEksXDTI0MDEwMzE3NDkxMFowEwICElAXDTI0
 MDEyMzA3NTQ0MVowEwICElgXDTI0MDIwOTA4MzI1OVowEwICEloXDTI0MDkxODEz
 MjI1NVowEwICEl4XDTI0MDMyNzE3MDU0OFowEwICEoMXDTI1MDYwMzE2NDYzMVow
 EwICEo8XDTI1MDQwNDA3MjgwNlowEwICEqcXDTI1MDUyNzEwMTA0N1owEwICErkX
-DTI1MDkxMTE0MTIwOFowEwICEr8XDTI1MDkzMDE1MjA1N1qgMDAuMB8GA1UdIwQY
-MBaAFG3qbqqpNyw8iS0XPv1G7sOeeO10MAsGA1UdFAQEAgIQUTANBgkqhkiG9w0B
-AQsFAAOCAQEABG3Qs/ovEtWdPtUtnclBJnrbGRDr4FxtHezlZFoDBOFopt/oiAQ0
-SfyBX4kokYs2Uxau4tovjNztHXl2UeNNt52gARFTl0OYjE3w3oNMJwIi5d30Vv1b
-73taPWWDE34VEQ6mnl0M1/6AJGCZCGxsEqWmxy7ft+gmi97KPKxnls6NXGN/lyNe
-z/ayn++ZWHgrVD2lwAreQka3WGfyElsNZeryBSXxdKLdob3XLwA/aX2G8D6s7+Gg
-XPzpahVuSKrgauNelQjDNAxynj4inrlq+HxN04YHZw2irqKja9W4nZotiz/xr9C1
-+pZQtE2Ox1Ge4lZBq115CqYLWCVafu5gfQ==
+DTI1MDkxMTE0MTIwOFowEwICEr8XDTI1MDkzMDE1MjA1N1owEwICEsgXDTI1MTEw
+NDA4MDgzMlqgMDAuMB8GA1UdIwQYMBaAFG3qbqqpNyw8iS0XPv1G7sOeeO10MAsG
+A1UdFAQEAgIQUjANBgkqhkiG9w0BAQsFAAOCAQEAZfJKK0HjelsSDlysIOrARtFD
+0p1clpPXzgAXGA2MadOZdy1ezHVeyZmkXCd0UpDmG3SdF6Wkdd0MxQeXoqrG1nL5
+FLLdvz9VlWyhehuAGWw0FnooV5QumIfrZBl40HIOMl8xCoIeR/487+MZk9NzE1mM
+mWCL0I5mtSw7oHb9K3NAeD/j8YbAE+4SBHUJXtu/BzktHDCNu5jyG68P1//uWEwf
+bvyP/0At2Z5Qf2fNLhckO1v2t2O2sELgH8n2eQVcnhqacJid+EseEQne6prKN5F7
+Mdtav0QytZmixIQxi8eU8tv4/URSQz9AUxLv1jp2CJPPJuJXrqKNZ1RmBlgmtw==
 -----END X509 CRL-----