diff --git a/modules/admin_manual/nav.adoc b/modules/admin_manual/nav.adoc
index 9f55548b34..1be278c56f 100644
--- a/modules/admin_manual/nav.adoc
+++ b/modules/admin_manual/nav.adoc
@@ -167,7 +167,6 @@
 **** xref:enterprise/external_storage/enterprise_only_auth.adoc[Enterprise Only Authentication]
 **** xref:enterprise/external_storage/ldap_home_connector_configuration.adoc[LDAP Home Connector Configuration]
 **** xref:enterprise/external_storage/onedrive.adoc[OneDrive]
-**** xref:enterprise/external_storage/s3_swift_as_primary_object_store_configuration.adoc[S3 Swift as Primary Object Store Configuration]
 **** xref:enterprise/external_storage/sharepoint-integration_configuration.adoc[Sharepoint integration Configuration]
 **** xref:enterprise/external_storage/windows-network-drive_configuration.adoc[Windows Network Drive Configuration]
 *** xref:enterprise/file_management/index.adoc[File Management]
diff --git a/modules/admin_manual/pages/configuration/server/occ_command.adoc b/modules/admin_manual/pages/configuration/server/occ_command.adoc
index baa05db1e0..f54f8165cc 100644
--- a/modules/admin_manual/pages/configuration/server/occ_command.adoc
+++ b/modules/admin_manual/pages/configuration/server/occ_command.adoc
@@ -1068,7 +1068,6 @@ The default is `plain`.
 | Amazon S3                | `amazons3`
 | Dropbox                  | `dropbox`
 | Google Drive             | `googledrive`
-| OpenStack Object Storage | `swift`
 | SMB / CIFS               | `smb`
 |===
 
@@ -1255,7 +1254,6 @@ files_external:create [options] [--] <mount_point> <storage_backend> <authentica
 | Amazon S3               | `amazons3`
 | Dropbox                 | `dropbox`
 | Google Drive            | `googledrive`
-| OpenStack Object Storage| `swift`
 | SMB / CIFS              | `smb`
 |===
 
diff --git a/modules/admin_manual/pages/enterprise/external_storage/s3_swift_as_primary_object_store_configuration.adoc b/modules/admin_manual/pages/enterprise/external_storage/s3_swift_as_primary_object_store_configuration.adoc
deleted file mode 100644
index 1225b8d3f7..0000000000
--- a/modules/admin_manual/pages/enterprise/external_storage/s3_swift_as_primary_object_store_configuration.adoc
+++ /dev/null
@@ -1,159 +0,0 @@
-= Configuring S3 as Primary Storage
-:toc: right
-:occ-files_transfer-ownership-link:
-xref:admin_manual:configuration/server/occ_command.adoc?highlight=transfer_ownership#the-files-transfer-ownership-command
-
-== Introduction
-Administrators can configure Amazon S3 objects as the primary ownCloud storage location.
-Doing this replaces the default ownCloud `owncloud/data` directory.
-However, if you use S3 objects as the primary storage, you *need* to keep the `owncloud/data` directory for
-the following reasons:
-
-* The ownCloud log file is saved in the data directory
-* Legacy apps may not support using anything but the `owncloud/data` directory
-
-NOTE: Even if the ownCloud log file is stored in an alternate location (by changing the location in `config.php`)
-`owncloud/data` may still be required for backward compatibility with some apps.
-
-That said, https://marketplace.owncloud.com/apps/objectstore[the Object Storage Support app]
-(`objectstore`) is still available, but https://marketplace.owncloud.com/apps/files_primary_s3[the S3 Object Storage app] (https://github.com/owncloud/files_primary_s3[files_primary_s3]) is the preferred way to provide S3
-storage support.
-
-NOTE: OpenStack Swift has been deprecated.
-
-When using `files_primary_s3`, the Amazon S3 bucket needs to be created manually https://docs.aws.amazon.com/AmazonS3/latest/gsg/CreatingABucket.html[according to the developer documentation], and versioning needs to be enabled.
-
-NOTE: ownCloud GmbH provides consulting for migrations from `objectstore` to `files_primary_s3`.
-
-[IMPORTANT]
-====
-**Implications**
-
-1. Apply this configuration before the first login of any user – including the admin user; otherwise, ownCloud can no longer find the user's files.
-2. ownCloud, in "object store" mode, expects exclusive access to the object store container, because it only stores the binary data for each file. While in this mode, ownCloud stores the metadata in the local database for performance reasons.
-3. The current implementation is incompatible with any app that uses direct file I/O (input/output) as it circumvents the ownCloud virtual filesystem. An excellent example is the Encryption app, which fetches critical files in addition to any requested file, which results in significant overhead.
-4. When using S3 primary storage with multiple buckets, it is not recommended to use the command to transfer file ownership between users ({occ-files_transfer-ownership-link}[occ files:transfer-ownership]) as shares on the files can get lost.
-The reason for this is that file ids are changed during such cross-storage move operations.
-====
-
-== Configuration
-
-Look in `config.sample.php` for example configurations.
-Copy the relevant part to your `config.php` file.
-Any object store needs to implement `\\OCP\\Files\\ObjectStore\\IObjectStore`, and can be passed parameters in the constructor with the `arguments` key, as in the following example:
-
-[source,php]
-----
-<?php
-
-$CONFIG = [
-    'objectstore' => [
-        'class' => 'Implementation\\Of\\OCP\\Files\\ObjectStore\\IObjectStore',
-        'arguments' => [
-            ...
-        ],
-    ],
-]
-----
-
-=== Amazon S3
-
-The S3 backend mounts a bucket of the Amazon S3 object store into the virtual filesystem.
-The class to be used is `OCA\Files_Primary_S3\S3Storage`, as in the following example:
-
-[source,php]
-----
-<?php
-
-$CONFIG = [
-    'objectstore' => [
-        'class' => 'OCA\Files_Primary_S3\S3Storage',
-        'arguments' => [
-            // replace with your bucket
-            'bucket' => 'owncloud',
-            // uncomment to enable server side encryption
-            //'serversideencryption' => 'AES256',
-            'options' => [
-                // version and region are required
-                'version' => '2006-03-01',
-                // change to your region
-                'region'  => 'eu-central-1',
-                'credentials' => [
-                    // replace key and secret with your credentials
-                    'key' => 'owncloud123456',
-                    'secret' => 'secret123456',
-                ],
-            ],
-        ],
-    ],
-],
-----
-
-=== Ceph S3
-
-The S3 backend can also be used to mount the bucket of a Ceph S3 object store via the Amazon S3 API into the virtual filesystem.
-The class to be used is `OCA\Files_Primary_S3\S3Storage`:
-
-[source,php]
-----
-<?php
-
-$CONFIG = [
-    'objectstore' => [
-        'class' => 'OCA\Files_Primary_S3\S3Storage',
-        'arguments' => [
-            // replace with your bucket
-            'bucket' => 'owncloud',
-            'options' => [
-                // version and region are required
-                'version' => '2006-03-01',
-                'region'  => '',
-                // replace key, secret and bucket with your credentials
-                'credentials' => [
-                    // replace key and secret with your credentials
-                    'key'    => 'owncloud123456',
-                    'secret' => 'secret123456',
-                ],
-                // replace the ceph endpoint with your rgw url
-                'endpoint' => 'http://ceph:80/',
-                // Use path style when talking to ceph
-                'use_path_style_endpoint' => true,
-            ],
-        ],
-    ],
-],
-----
-
-=== Scality S3
-
-The S3 backend can also be used to mount the bucket of a Scality S3 object store via the Amazon S3
-API into the virtual filesystem. The class to be used is `OCA\Files_Primary_S3\S3Storage`:
-
-[source,php]
-----
-<?php
-
-$CONFIG = [
-    'objectstore' => [
-        'class' => 'OCA\Files_Primary_S3\S3Storage',
-        'arguments' => [
-            // replace with your bucket
-            'bucket' => 'owncloud',
-            // uncomment to enable server side encryption
-            //'serversideencryption' => 'AES256',
-            'options' => [
-                // version and region are required
-                'version' => '2006-03-01',
-                'region'  => 'us-east-1',
-                'credentials' => [
-                    // replace key and secret with your credentials
-                    'key' => 'owncloud123456',
-                    'secret' => 'secret123456',
-                ],
-                'use_path_style_endpoint' => true,
-                'endpoint' => 'http://scality:8000/',
-            ],
-        ],
-    ],
-],
-----
diff --git a/modules/admin_manual/pages/installation/apps_supported.adoc b/modules/admin_manual/pages/installation/apps_supported.adoc
index 7d7dfe8fdf..3cde33cd6f 100644
--- a/modules/admin_manual/pages/installation/apps_supported.adoc
+++ b/modules/admin_manual/pages/installation/apps_supported.adoc
@@ -25,7 +25,6 @@ NOTE: The _Gallery_ and _Files VideoPlayer_ apps need to be uninstalled before i
 * Files Versions
 * First Run Wizard
 * Notifications
-* Object Storage (Swift)
 * Provisioning API
 * Template Editor (for notification emails)
 * Update Notifications
diff --git a/modules/user_manual/pages/files/access_webdav.adoc b/modules/user_manual/pages/files/access_webdav.adoc
index 1af68161b2..42dc0105fe 100644
--- a/modules/user_manual/pages/files/access_webdav.adoc
+++ b/modules/user_manual/pages/files/access_webdav.adoc
@@ -305,7 +305,7 @@ Windows Explorer maps the network drive, making your ownCloud instance available
 == Accessing Files Using Cyberduck
 
 https://cyberduck.io/?l=en[Cyberduck] is an open source FTP and SFTP,
-WebDAV, OpenStack Swift, and Amazon S3 browser designed for file transfers on Mac OS X and Windows.
+WebDAV, and Amazon S3 browser designed for file transfers on Mac OS X and Windows.
 
 NOTE: This example uses Cyberduck version 4.2.1.