diff --git a/manifests/backup/swift.pp b/manifests/backup/swift.pp
index f49baf6a..50df538f 100644
--- a/manifests/backup/swift.pp
+++ b/manifests/backup/swift.pp
@@ -19,7 +19,7 @@
 #
 # [*backup_swift_container*]
 #   (optional) The default Swift container to use.
-#   Defaults to 'volumes_backup'
+#   Defaults to 'volumebackups'
 #
 # [*backup_swift_object_size*]
 #   (optional) The size in bytes of Swift backup objects.
@@ -78,7 +78,7 @@ class cinder::backup::swift (
   $backup_driver                = 'cinder.backup.drivers.swift',
   $backup_swift_url             = $::os_service_default,
   $backup_swift_auth_url        = $::os_service_default,
-  $backup_swift_container       = 'volumes_backup',
+  $backup_swift_container       = 'volumebackups',
   $backup_swift_object_size     = $::os_service_default,
   $backup_swift_retry_attempts  = $::os_service_default,
   $backup_swift_retry_backoff   = $::os_service_default,
@@ -90,11 +90,6 @@ class cinder::backup::swift (
 
   include ::cinder::deps
 
-  if ($backup_swift_container == 'volumes_backup') {
-    warning("The OpenStack default value of backup_swift_container differs from the puppet module \
-default of \"volumes_backup\" and will be changed to the upstream OpenStack default in N-release.")
-  }
-
   cinder_config {
     'DEFAULT/backup_driver':                value => $backup_driver;
     'DEFAULT/backup_swift_url':             value => $backup_swift_url;
diff --git a/releasenotes/notes/change-backup-swift-container-4fa57507543fdda3.yaml b/releasenotes/notes/change-backup-swift-container-4fa57507543fdda3.yaml
new file mode 100644
index 00000000..a56832d8
--- /dev/null
+++ b/releasenotes/notes/change-backup-swift-container-4fa57507543fdda3.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    Changed the default value of cinder::backup::swift::backup_swift_container
+    to volumebackups. This matches the default from tht and removes a warning.
diff --git a/spec/classes/cinder_backup_swift_spec.rb b/spec/classes/cinder_backup_swift_spec.rb
index 5cdd0687..97b75158 100644
--- a/spec/classes/cinder_backup_swift_spec.rb
+++ b/spec/classes/cinder_backup_swift_spec.rb
@@ -25,7 +25,7 @@ describe 'cinder::backup::swift' do
   let :default_params do
     { :backup_swift_url             => '<SERVICE DEFAULT>',
       :backup_swift_auth_url        => '<SERVICE DEFAULT>',
-      :backup_swift_container       => 'volumes_backup',
+      :backup_swift_container       => 'volumebackups',
       :backup_swift_object_size     => '<SERVICE DEFAULT>',
       :backup_swift_retry_attempts  => '<SERVICE DEFAULT>',
       :backup_swift_retry_backoff   => '<SERVICE DEFAULT>',