diff --git a/manifests/init.pp b/manifests/init.pp
index 1a72b2f49..cb83c7e4a 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -53,19 +53,19 @@
 #   will move files prior to installation that are known to cause file locks.
 #
 class puppet_agent (
-  Pattern[/^x86$/,/^x64$/,/^i386$/,/^i86pc$/,/^amd64$/,/^x86_64$/,/^power$/,/^sun4[uv]$/, /^ppc64le$/, /^aarch64$/, /PowerPC_POWER/] $arch = $::architecture,
-  $collection                                                                                                                              = 'PC1',
-  $is_pe                                                                                                                                   = $::puppet_agent::params::_is_pe,
-  $manage_pki_dir                                                                                                                          = true,
-  $manage_repo                                                                                                                             = true,
-  $package_name                                                                                                                            = $::puppet_agent::params::package_name,
-  $package_version                                                                                                                         = $::puppet_agent::params::package_version,
-  $service_names                                                                                                                           = $::puppet_agent::params::service_names,
-  $source                                                                                                                                  = $::puppet_agent::params::_source,
-  $install_dir                                                                                                                             = $::puppet_agent::params::install_dir,
-  $disable_proxy                                                                                                                           = false,
-  $install_options                                                                                                                         = $::puppet_agent::params::install_options,
-  $msi_move_locked_files                                                                                                                   = false,
+  Puppet_agent::Arch $arch = $::architecture,
+  $collection              = 'PC1',
+  $is_pe                   = $::puppet_agent::params::_is_pe,
+  $manage_pki_dir          = true,
+  $manage_repo             = true,
+  $package_name            = $::puppet_agent::params::package_name,
+  $package_version         = $::puppet_agent::params::package_version,
+  $service_names           = $::puppet_agent::params::service_names,
+  $source                  = $::puppet_agent::params::_source,
+  $install_dir             = $::puppet_agent::params::install_dir,
+  $disable_proxy           = false,
+  $install_options         = $::puppet_agent::params::install_options,
+  $msi_move_locked_files   = false,
 ) inherits ::puppet_agent::params {
 
   if $::osfamily == 'windows' and $install_dir != undef {
diff --git a/types/arch.pp b/types/arch.pp
new file mode 100644
index 000000000..dbfddb202
--- /dev/null
+++ b/types/arch.pp
@@ -0,0 +1 @@
+type Puppet_agent::Arch = Pattern[/^x86$/,/^x64$/,/^i386$/,/^i86pc$/,/^amd64$/,/^x86_64$/,/^power$/,/^sun4[uv]$/, /^ppc64le$/, /^aarch64$/, /PowerPC_POWER/]