diff --git a/deployment_scripts/puppet/modules/gcs/manifests/config.pp b/deployment_scripts/puppet/modules/gcs/manifests/config.pp
index f82dcc0..067a272 100644
--- a/deployment_scripts/puppet/modules/gcs/manifests/config.pp
+++ b/deployment_scripts/puppet/modules/gcs/manifests/config.pp
@@ -12,44 +12,30 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-class gcs::config (
-  $backup_driver                       = $gcs::backup_driver,
-  $backup_gcs_bucket                   = $gcs::settings['backup_gcs_bucket'],
-  $backup_gcs_project_id               = $gcs::settings['backup_gcs_project_id'],
-  $backup_gcs_bucket_location          = $gcs::settings['backup_gcs_bucket_location'],
-  $backup_gcs_enable_progress_timer    = $gcs::settings['backup_gcs_enable_progress_timer'],
-  $backup_gcs_storage_class            = $gcs::settings['backup_gcs_storage_class'],
-  $backup_gcs_block_size               = $gcs::settings['backup_gcs_block_size'],
-  $backup_gcs_object_size              = $gcs::settings['backup_gcs_object_size'],
-  $backup_gcs_user_agent               = $gcs::settings['backup_gcs_user_agent'],
-  $backup_gcs_writer_chunk_size        = $gcs::settings['backup_gcs_writer_chunk_size'],
-  $backup_gcs_reader_chunk_size        = $gcs::settings['backup_gcs_reader_chunk_size'],
-  $backup_gcs_num_retries              = $gcs::settings['backup_gcs_num_retries'],
-  $backup_gcs_retry_error_codes        = $gcs::settings['backup_gcs_retry_error_codes'],
-  $backup_gcs_credential_file          = $gcs::credential_file,
-) {
+class gcs::config {
 
   cinder_config {
-    'DEFAULT/backup_driver':                    value   => $backup_driver;
-    'DEFAULT/backup_gcs_bucket':                value   => $backup_gcs_bucket;
-    'DEFAULT/backup_gcs_project_id':            value   => $backup_gcs_project_id;
-    'DEFAULT/backup_gcs_credentials_file':      value   => $backup_gcs_credentials_file;
-    'DEFAULT/backup_gcs_bucket_location':       value   => $backup_gcs_bucket_location;
-    'DEFAULT/backup_gcs_enable_progress_timer': value   => $backup_gcs_enable_progress_timer;
-    'DEFAULT/backup_gcs_storage_class':         value   => $backup_gcs_storage_class;
-    'DEFAULT/backup_gcs_user_agent':            value   => $backup_gcs_user_agent;
-    'DEFAULT/backup_gcs_credential_file':       value   => $backup_gcs_credential_file;
-    'DEFAULT/backup_gcs_block_size':            value   => $backup_gcs_block_size;
-    'DEFAULT/backup_gcs_object_size':           value   => $backup_gcs_object_size;
-    'DEFAULT/backup_gcs_writer_chunk_size':     value   => $backup_gcs_writer_chunk_size;
-    'DEFAULT/backup_gcs_reader_chunk_size':     value   => $backup_gcs_reader_chunk_size;
-    'DEFAULT/backup_gcs_retry_error_codes':     value   => $backup_gcs_retry_error_codes;
-    'DEFAULT/backup_gcs_num_retries':           value   => $backup_gcs_num_retries;
+    'DEFAULT/backup_driver':                    value   => $gcs::backup_driver;
+    'DEFAULT/backup_gcs_bucket':                value   => $gcs::settings['backup_gcs_bucket'];
+    'DEFAULT/backup_gcs_project_id':            value   => $gcs::settings['backup_gcs_project_id'];
+    'DEFAULT/backup_gcs_credentials_file':      value   => $gcs::settings['backup_gcs_credentials_file'];
+    'DEFAULT/backup_gcs_bucket_location':       value   => $gcs::settings['backup_gcs_bucket_location'];
+    'DEFAULT/backup_gcs_enable_progress_timer': value   => $gcs::settings['backup_gcs_enable_progress_timer'];
+    'DEFAULT/backup_gcs_storage_class':         value   => $gcs::settings['backup_gcs_storage_class'];
+    'DEFAULT/backup_gcs_user_agent':            value   => $gcs::settings['backup_gcs_user_agent'];
+    'DEFAULT/backup_gcs_credential_file':       value   => $gcs::settings['backup_gcs_credential_file'];
+    'DEFAULT/backup_gcs_block_size':            value   => $gcs::settings['backup_gcs_block_size'];
+    'DEFAULT/backup_gcs_object_size':           value   => $gcs::settings['backup_gcs_object_size'];
+    'DEFAULT/backup_gcs_writer_chunk_size':     value   => $gcs::settings['backup_gcs_writer_chunk_size'];
+    'DEFAULT/backup_gcs_reader_chunk_size':     value   => $gcs::settings['backup_gcs_reader_chunk_size'];
+    'DEFAULT/backup_gcs_retry_error_codes':     value   => $gcs::settings['backup_gcs_retry_error_codes'];
+    'DEFAULT/backup_gcs_num_retries':           value   => $gcs::settings['backup_gcs_num_retries'];
   }
-  file { $backup_gcs_credential_file:
+  file { $gcs::credential_file:
       owner => 'cinder',
       group => 'cinder',
       content => template('gcs/credentials.json.erb'),
       mode  => '0600',
   }
+
 }