diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 71f86e553..7acea7daf 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -259,7 +259,7 @@ does not attempt to track the latest version for each dependency.
 #### Code generation
 
 Packer relies on `go generate` to generate a [peg parser for boot
-commands](https://github.com/hashicorp/packer/blob/master/common/bootcommand/boot_command.go),
+commands](https://github.com/hashicorp/packer/blob/master/packer-plugin-sdk/bootcommand/boot_command.go),
 [docs](https://github.com/hashicorp/packer/blob/master/website/pages/partials/builder/amazon/chroot/_Config-not-required.mdx)
 and HCL2's bridging code. Packer's testing suite will run `make check-generate`
 to check that all the generated files Packer needs are what they should be.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f8dc86e4..f320c681c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,30 @@
 ## 1.6.6 (Upcoming)
 
 ### FEATURES:
+* **New command** `fmt` allows users to format existing HCL2 configuration
+    files into a canonical style. Please see [fmt command
+    docs](https://packer.io/docs/commands/fmt) for more details. [GH-10225]
+* **New function** `env` allows users to set the default value of a variable to
+    the value of an environment variable. Please see [env function
+    docs](https://www.packer.io/docs/from-1.5/functions/contextual/env") for
+    more details. [GH-10240]
+* builder/azure-arm: Create keyvaults with SoftDelete enabled [GH-10210]
 * builder/outscale: Add x509 certificate support [GH-10161]
-* post-processor/yandex-export: Verify the access to a specific bucket [GH-10188]
+* post-processor/yandex-export: Verify the access to a specific bucket
+    [GH-10188]
+
+### IMPROVEMENTS
+* builder/amazon-ebs: Add tags to launch templates. [GH-10203]
+* builder/azure-arm: Add Azure CLI authentication support to builder.
+    [GH-10157]
+* core/hcl: Update to `hcl2_upgrade` command to support complex variable
+    values and packer version blocks. [GH-10221]
+* post-processor/vagrant-cloud: Add support for uploading directly to storage
+    on Vagrant Cloud. [GH-10193]
+
+### BUG FIXES
+* builder/amazon: Fix single `tag` interpolation to allow for templating engine
+    usage. [GH-10224]
 
 ## 1.6.5 (October 30, 2020)
 
diff --git a/Makefile b/Makefile
index 589dde035..3a50eaf44 100644
--- a/Makefile
+++ b/Makefile
@@ -123,9 +123,9 @@ generate: install-gen-deps ## Generate dynamically generated code
 	@echo "==> removing autogenerated markdown..."
 	@find website/pages/ -type f | xargs grep -l '^<!-- Code generated' | xargs rm -f
 	@echo "==> removing autogenerated code..."
-	@find post-processor common helper template builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
+	@find post-processor packer-plugin-sdk helper builder provisioner -type f | xargs grep -l '^// Code generated' | xargs rm -f
 	go generate ./...
-	go fmt common/bootcommand/boot_command.go
+	go fmt packer-plugin-sdk/bootcommand/boot_command.go
 	go run ./cmd/generate-fixer-deprecations
 
 generate-check: generate ## Check go code generation is on par
diff --git a/README.md b/README.md
index 0bbdc3263..de3007a4e 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ from a single source configuration.
 Packer is lightweight, runs on every major operating system, and is highly
 performant, creating machine images for multiple platforms in parallel. Packer
 comes out of the box with support for many platforms, the full list of which can
-be found at https://www.packer.io/docs/builders/index.html.
+be found at https://www.packer.io/docs/builders.
 
 Support for other platforms can be added via plugins.
 
diff --git a/builder/alicloud/ecs/access_config.go b/builder/alicloud/ecs/access_config.go
index 516b521ff..222f1ce12 100644
--- a/builder/alicloud/ecs/access_config.go
+++ b/builder/alicloud/ecs/access_config.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/template/interpolate"
-	"github.com/hashicorp/packer/version"
+	"github.com/hashicorp/packer/builder/alicloud/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/go-homedir"
 )
 
@@ -78,7 +78,7 @@ func (c *AlicloudAccessConfig) Client() (*ClientWrapper, error) {
 		return nil, err
 	}
 
-	client.AppendUserAgent(Packer, version.FormattedVersion())
+	client.AppendUserAgent(Packer, version.AlicloudPluginVersion.FormattedVersion())
 	client.SetReadTimeout(DefaultRequestReadTimeout)
 	c.client = &ClientWrapper{client}
 
diff --git a/builder/alicloud/ecs/builder.go b/builder/alicloud/ecs/builder.go
index 95091ad98..9fc5f679f 100644
--- a/builder/alicloud/ecs/builder.go
+++ b/builder/alicloud/ecs/builder.go
@@ -9,12 +9,13 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -164,8 +165,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHPrivateIp),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&stepStopAlicloudInstance{
@@ -206,7 +207,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		})
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/alicloud/ecs/builder.hcl2spec.go b/builder/alicloud/ecs/builder.hcl2spec.go
index 7a56371f8..86546392c 100644
--- a/builder/alicloud/ecs/builder.hcl2spec.go
+++ b/builder/alicloud/ecs/builder.hcl2spec.go
@@ -3,7 +3,7 @@ package ecs
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -47,108 +47,109 @@ func (*FlatAlicloudDiskDevice) HCL2Spec() map[string]hcldec.Spec {
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName                   *string                     `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
-	PackerBuilderType                 *string                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug                       *bool                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce                       *bool                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError                     *string                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars                    map[string]string           `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars               []string                    `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AlicloudAccessKey                 *string                     `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
-	AlicloudSecretKey                 *string                     `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	AlicloudRegion                    *string                     `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	AlicloudSkipValidation            *bool                       `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	AlicloudSkipImageValidation       *bool                       `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation" hcl:"skip_image_validation"`
-	AlicloudProfile                   *string                     `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
-	AlicloudSharedCredentialsFile     *string                     `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
-	SecurityToken                     *string                     `mapstructure:"security_token" required:"false" cty:"security_token" hcl:"security_token"`
-	AlicloudImageName                 *string                     `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
-	AlicloudImageVersion              *string                     `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"`
-	AlicloudImageDescription          *string                     `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
-	AlicloudImageShareAccounts        []string                    `mapstructure:"image_share_account" required:"false" cty:"image_share_account" hcl:"image_share_account"`
-	AlicloudImageUNShareAccounts      []string                    `mapstructure:"image_unshare_account" cty:"image_unshare_account" hcl:"image_unshare_account"`
-	AlicloudImageDestinationRegions   []string                    `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"`
-	AlicloudImageDestinationNames     []string                    `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names" hcl:"image_copy_names"`
-	ImageEncrypted                    *bool                       `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted" hcl:"image_encrypted"`
-	AlicloudImageForceDelete          *bool                       `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete" hcl:"image_force_delete"`
-	AlicloudImageForceDeleteSnapshots *bool                       `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots" hcl:"image_force_delete_snapshots"`
-	AlicloudImageForceDeleteInstances *bool                       `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"`
-	AlicloudImageIgnoreDataDisks      *bool                       `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"`
-	AlicloudImageTags                 map[string]string           `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AlicloudImageTag                  []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
-	ECSSystemDiskMapping              *FlatAlicloudDiskDevice     `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"`
-	ECSImagesDiskMappings             []FlatAlicloudDiskDevice    `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"`
-	AssociatePublicIpAddress          *bool                       `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	ZoneId                            *string                     `mapstructure:"zone_id" required:"false" cty:"zone_id" hcl:"zone_id"`
-	IOOptimized                       *bool                       `mapstructure:"io_optimized" required:"false" cty:"io_optimized" hcl:"io_optimized"`
-	InstanceType                      *string                     `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	Description                       *string                     `mapstructure:"description" cty:"description" hcl:"description"`
-	AlicloudSourceImage               *string                     `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"`
-	ForceStopInstance                 *bool                       `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance" hcl:"force_stop_instance"`
-	DisableStopInstance               *bool                       `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
-	SecurityGroupId                   *string                     `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupName                 *string                     `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"`
-	UserData                          *string                     `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile                      *string                     `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	VpcId                             *string                     `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	VpcName                           *string                     `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"`
-	CidrBlock                         *string                     `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block" hcl:"vpc_cidr_block"`
-	VSwitchId                         *string                     `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id" hcl:"vswitch_id"`
-	VSwitchName                       *string                     `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name" hcl:"vswitch_name"`
-	InstanceName                      *string                     `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"`
-	InternetChargeType                *string                     `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type" hcl:"internet_charge_type"`
-	InternetMaxBandwidthOut           *int                        `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"`
-	WaitSnapshotReadyTimeout          *int                        `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout" hcl:"wait_snapshot_ready_timeout"`
-	Type                              *string                     `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect                *string                     `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                           *string                     `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                           *int                        `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername                       *string                     `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword                       *string                     `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName                    *string                     `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName           *string                     `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	SSHTemporaryKeyPairType           *string                     `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits           *int                        `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                        []string                    `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys            *bool                       `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos                       []string                    `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile                 *string                     `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile                *string                     `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                            *bool                       `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                        *string                     `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout                    *string                     `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth                      *bool                       `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding         *bool                       `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts              *int                        `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost                    *string                     `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort                    *int                        `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth               *bool                       `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername                *string                     `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword                *string                     `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive             *bool                       `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile          *string                     `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile         *string                     `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod             *string                     `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost                      *string                     `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort                      *int                        `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername                  *string                     `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword                  *string                     `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval              *string                     `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout               *string                     `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels                  []string                    `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels                   []string                    `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey                      []byte                      `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey                     []byte                      `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                         *string                     `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword                     *string                     `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                         *string                     `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy                      *bool                       `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                         *int                        `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout                      *string                     `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL                       *bool                       `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure                     *bool                       `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM                      *bool                       `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHPrivateIp                      *bool                       `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip" hcl:"ssh_private_ip"`
+	PackerBuildName                   *string                  `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
+	PackerBuilderType                 *string                  `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                 *string                  `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
+	PackerDebug                       *bool                    `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
+	PackerForce                       *bool                    `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
+	PackerOnError                     *string                  `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
+	PackerUserVars                    map[string]string        `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
+	PackerSensitiveVars               []string                 `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
+	AlicloudAccessKey                 *string                  `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
+	AlicloudSecretKey                 *string                  `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
+	AlicloudRegion                    *string                  `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
+	AlicloudSkipValidation            *bool                    `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
+	AlicloudSkipImageValidation       *bool                    `mapstructure:"skip_image_validation" required:"false" cty:"skip_image_validation" hcl:"skip_image_validation"`
+	AlicloudProfile                   *string                  `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
+	AlicloudSharedCredentialsFile     *string                  `mapstructure:"shared_credentials_file" required:"false" cty:"shared_credentials_file" hcl:"shared_credentials_file"`
+	SecurityToken                     *string                  `mapstructure:"security_token" required:"false" cty:"security_token" hcl:"security_token"`
+	AlicloudImageName                 *string                  `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
+	AlicloudImageVersion              *string                  `mapstructure:"image_version" required:"false" cty:"image_version" hcl:"image_version"`
+	AlicloudImageDescription          *string                  `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
+	AlicloudImageShareAccounts        []string                 `mapstructure:"image_share_account" required:"false" cty:"image_share_account" hcl:"image_share_account"`
+	AlicloudImageUNShareAccounts      []string                 `mapstructure:"image_unshare_account" cty:"image_unshare_account" hcl:"image_unshare_account"`
+	AlicloudImageDestinationRegions   []string                 `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"`
+	AlicloudImageDestinationNames     []string                 `mapstructure:"image_copy_names" required:"false" cty:"image_copy_names" hcl:"image_copy_names"`
+	ImageEncrypted                    *bool                    `mapstructure:"image_encrypted" required:"false" cty:"image_encrypted" hcl:"image_encrypted"`
+	AlicloudImageForceDelete          *bool                    `mapstructure:"image_force_delete" required:"false" cty:"image_force_delete" hcl:"image_force_delete"`
+	AlicloudImageForceDeleteSnapshots *bool                    `mapstructure:"image_force_delete_snapshots" required:"false" cty:"image_force_delete_snapshots" hcl:"image_force_delete_snapshots"`
+	AlicloudImageForceDeleteInstances *bool                    `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"`
+	AlicloudImageIgnoreDataDisks      *bool                    `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"`
+	AlicloudImageTags                 map[string]string        `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
+	AlicloudImageTag                  []config.FlatKeyValue    `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	ECSSystemDiskMapping              *FlatAlicloudDiskDevice  `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"`
+	ECSImagesDiskMappings             []FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"`
+	AssociatePublicIpAddress          *bool                    `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
+	ZoneId                            *string                  `mapstructure:"zone_id" required:"false" cty:"zone_id" hcl:"zone_id"`
+	IOOptimized                       *bool                    `mapstructure:"io_optimized" required:"false" cty:"io_optimized" hcl:"io_optimized"`
+	InstanceType                      *string                  `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
+	Description                       *string                  `mapstructure:"description" cty:"description" hcl:"description"`
+	AlicloudSourceImage               *string                  `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"`
+	ForceStopInstance                 *bool                    `mapstructure:"force_stop_instance" required:"false" cty:"force_stop_instance" hcl:"force_stop_instance"`
+	DisableStopInstance               *bool                    `mapstructure:"disable_stop_instance" required:"false" cty:"disable_stop_instance" hcl:"disable_stop_instance"`
+	SecurityGroupId                   *string                  `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
+	SecurityGroupName                 *string                  `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"`
+	UserData                          *string                  `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
+	UserDataFile                      *string                  `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
+	VpcId                             *string                  `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
+	VpcName                           *string                  `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"`
+	CidrBlock                         *string                  `mapstructure:"vpc_cidr_block" required:"false" cty:"vpc_cidr_block" hcl:"vpc_cidr_block"`
+	VSwitchId                         *string                  `mapstructure:"vswitch_id" required:"false" cty:"vswitch_id" hcl:"vswitch_id"`
+	VSwitchName                       *string                  `mapstructure:"vswitch_name" required:"false" cty:"vswitch_name" hcl:"vswitch_name"`
+	InstanceName                      *string                  `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"`
+	InternetChargeType                *string                  `mapstructure:"internet_charge_type" required:"false" cty:"internet_charge_type" hcl:"internet_charge_type"`
+	InternetMaxBandwidthOut           *int                     `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"`
+	WaitSnapshotReadyTimeout          *int                     `mapstructure:"wait_snapshot_ready_timeout" required:"false" cty:"wait_snapshot_ready_timeout" hcl:"wait_snapshot_ready_timeout"`
+	Type                              *string                  `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
+	PauseBeforeConnect                *string                  `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
+	SSHHost                           *string                  `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
+	SSHPort                           *int                     `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
+	SSHUsername                       *string                  `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
+	SSHPassword                       *string                  `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
+	SSHKeyPairName                    *string                  `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName           *string                  `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
+	SSHTemporaryKeyPairType           *string                  `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
+	SSHTemporaryKeyPairBits           *int                     `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
+	SSHCiphers                        []string                 `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
+	SSHClearAuthorizedKeys            *bool                    `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
+	SSHKEXAlgos                       []string                 `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
+	SSHPrivateKeyFile                 *string                  `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
+	SSHCertificateFile                *string                  `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
+	SSHPty                            *bool                    `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
+	SSHTimeout                        *string                  `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
+	SSHWaitTimeout                    *string                  `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
+	SSHAgentAuth                      *bool                    `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
+	SSHDisableAgentForwarding         *bool                    `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
+	SSHHandshakeAttempts              *int                     `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
+	SSHBastionHost                    *string                  `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
+	SSHBastionPort                    *int                     `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
+	SSHBastionAgentAuth               *bool                    `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
+	SSHBastionUsername                *string                  `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
+	SSHBastionPassword                *string                  `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
+	SSHBastionInteractive             *bool                    `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
+	SSHBastionPrivateKeyFile          *string                  `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
+	SSHBastionCertificateFile         *string                  `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
+	SSHFileTransferMethod             *string                  `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
+	SSHProxyHost                      *string                  `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
+	SSHProxyPort                      *int                     `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
+	SSHProxyUsername                  *string                  `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
+	SSHProxyPassword                  *string                  `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
+	SSHKeepAliveInterval              *string                  `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
+	SSHReadWriteTimeout               *string                  `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
+	SSHRemoteTunnels                  []string                 `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
+	SSHLocalTunnels                   []string                 `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
+	SSHPublicKey                      []byte                   `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
+	SSHPrivateKey                     []byte                   `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
+	WinRMUser                         *string                  `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
+	WinRMPassword                     *string                  `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
+	WinRMHost                         *string                  `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
+	WinRMNoProxy                      *bool                    `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
+	WinRMPort                         *int                     `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
+	WinRMTimeout                      *string                  `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
+	WinRMUseSSL                       *bool                    `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
+	WinRMInsecure                     *bool                    `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
+	WinRMUseNTLM                      *bool                    `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
+	SSHPrivateIp                      *bool                    `mapstructure:"ssh_private_ip" required:"false" cty:"ssh_private_ip" hcl:"ssh_private_ip"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -165,6 +166,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -191,7 +193,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"image_force_delete_instances": &hcldec.AttrSpec{Name: "image_force_delete_instances", Type: cty.Bool, Required: false},
 		"image_ignore_data_disks":      &hcldec.AttrSpec{Name: "image_ignore_data_disks", Type: cty.Bool, Required: false},
 		"tags":                         &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"system_disk_mapping":          &hcldec.BlockSpec{TypeName: "system_disk_mapping", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())},
 		"image_disk_mappings":          &hcldec.BlockListSpec{TypeName: "image_disk_mappings", Nested: hcldec.ObjectSpec((*FlatAlicloudDiskDevice)(nil).HCL2Spec())},
 		"associate_public_ip_address":  &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
diff --git a/builder/alicloud/ecs/builder_test.go b/builder/alicloud/ecs/builder_test.go
index 9a691de77..9b92a5c5d 100644
--- a/builder/alicloud/ecs/builder_test.go
+++ b/builder/alicloud/ecs/builder_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	helperconfig "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	helperconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 func testBuilderConfig() map[string]interface{} {
diff --git a/builder/alicloud/ecs/image_config.go b/builder/alicloud/ecs/image_config.go
index ef3c5292c..77d7547f9 100644
--- a/builder/alicloud/ecs/image_config.go
+++ b/builder/alicloud/ecs/image_config.go
@@ -7,9 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer/hcl2template"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The "AlicloudDiskDevice" object us used for the `ECSSystemDiskMapping` and
@@ -156,7 +155,7 @@ type AlicloudImageConfig struct {
 	// containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	AlicloudImageTag    hcl2template.KeyValues `mapstructure:"tag" required:"false"`
+	AlicloudImageTag    config.KeyValues `mapstructure:"tag" required:"false"`
 	AlicloudDiskDevices `mapstructure:",squash"`
 }
 
diff --git a/builder/alicloud/ecs/packer_helper.go b/builder/alicloud/ecs/packer_helper.go
index 5ea704278..4074d7ad7 100644
--- a/builder/alicloud/ecs/packer_helper.go
+++ b/builder/alicloud/ecs/packer_helper.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func cleanUpMessage(state multistep.StateBag, module string) {
diff --git a/builder/alicloud/ecs/run_config.go b/builder/alicloud/ecs/run_config.go
index 7381e6294..f9450ed15 100644
--- a/builder/alicloud/ecs/run_config.go
+++ b/builder/alicloud/ecs/run_config.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type RunConfig struct {
diff --git a/builder/alicloud/ecs/ssh_helper.go b/builder/alicloud/ecs/ssh_helper.go
index 21354d017..d400b9347 100644
--- a/builder/alicloud/ecs/ssh_helper.go
+++ b/builder/alicloud/ecs/ssh_helper.go
@@ -3,7 +3,7 @@ package ecs
 import (
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 var (
diff --git a/builder/alicloud/ecs/step_attach_keypair.go b/builder/alicloud/ecs/step_attach_keypair.go
index d2a2a9c02..16596eef1 100644
--- a/builder/alicloud/ecs/step_attach_keypair.go
+++ b/builder/alicloud/ecs/step_attach_keypair.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepAttachKeyPair struct {
diff --git a/builder/alicloud/ecs/step_check_source_image.go b/builder/alicloud/ecs/step_check_source_image.go
index 3eedec595..66c26dc96 100644
--- a/builder/alicloud/ecs/step_check_source_image.go
+++ b/builder/alicloud/ecs/step_check_source_image.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCheckAlicloudSourceImage struct {
diff --git a/builder/alicloud/ecs/step_config_eip.go b/builder/alicloud/ecs/step_config_eip.go
index 468e1ecab..4053a6bcd 100644
--- a/builder/alicloud/ecs/step_config_eip.go
+++ b/builder/alicloud/ecs/step_config_eip.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepConfigAlicloudEIP struct {
diff --git a/builder/alicloud/ecs/step_config_key_pair.go b/builder/alicloud/ecs/step_config_key_pair.go
index 767c50aa1..428198bec 100644
--- a/builder/alicloud/ecs/step_config_key_pair.go
+++ b/builder/alicloud/ecs/step_config_key_pair.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepConfigAlicloudKeyPair struct {
diff --git a/builder/alicloud/ecs/step_config_public_ip.go b/builder/alicloud/ecs/step_config_public_ip.go
index a83b55115..8d8c7403e 100644
--- a/builder/alicloud/ecs/step_config_public_ip.go
+++ b/builder/alicloud/ecs/step_config_public_ip.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepConfigAlicloudPublicIP struct {
diff --git a/builder/alicloud/ecs/step_config_security_group.go b/builder/alicloud/ecs/step_config_security_group.go
index 8dfbcdc60..694a10817 100644
--- a/builder/alicloud/ecs/step_config_security_group.go
+++ b/builder/alicloud/ecs/step_config_security_group.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepConfigAlicloudSecurityGroup struct {
diff --git a/builder/alicloud/ecs/step_config_vpc.go b/builder/alicloud/ecs/step_config_vpc.go
index 3b8f9574b..53ecb8476 100644
--- a/builder/alicloud/ecs/step_config_vpc.go
+++ b/builder/alicloud/ecs/step_config_vpc.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepConfigAlicloudVPC struct {
diff --git a/builder/alicloud/ecs/step_config_vswitch.go b/builder/alicloud/ecs/step_config_vswitch.go
index 4f2541b89..38e51a346 100644
--- a/builder/alicloud/ecs/step_config_vswitch.go
+++ b/builder/alicloud/ecs/step_config_vswitch.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepConfigAlicloudVSwitch struct {
diff --git a/builder/alicloud/ecs/step_create_image.go b/builder/alicloud/ecs/step_create_image.go
index 9c8c45ec6..a1f47b61a 100644
--- a/builder/alicloud/ecs/step_create_image.go
+++ b/builder/alicloud/ecs/step_create_image.go
@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepCreateAlicloudImage struct {
diff --git a/builder/alicloud/ecs/step_create_instance.go b/builder/alicloud/ecs/step_create_instance.go
index 24d3acf27..0d9958d40 100644
--- a/builder/alicloud/ecs/step_create_instance.go
+++ b/builder/alicloud/ecs/step_create_instance.go
@@ -7,14 +7,14 @@ import (
 	"io/ioutil"
 	"strconv"
 
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type stepCreateAlicloudInstance struct {
diff --git a/builder/alicloud/ecs/step_create_snapshot.go b/builder/alicloud/ecs/step_create_snapshot.go
index 32f155e08..056a4ba87 100644
--- a/builder/alicloud/ecs/step_create_snapshot.go
+++ b/builder/alicloud/ecs/step_create_snapshot.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateAlicloudSnapshot struct {
diff --git a/builder/alicloud/ecs/step_create_tags.go b/builder/alicloud/ecs/step_create_tags.go
index fd6b2b712..f374dcba4 100644
--- a/builder/alicloud/ecs/step_create_tags.go
+++ b/builder/alicloud/ecs/step_create_tags.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateTags struct {
diff --git a/builder/alicloud/ecs/step_delete_images_snapshots.go b/builder/alicloud/ecs/step_delete_images_snapshots.go
index cd79229bd..bffbb5068 100644
--- a/builder/alicloud/ecs/step_delete_images_snapshots.go
+++ b/builder/alicloud/ecs/step_delete_images_snapshots.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepDeleteAlicloudImageSnapshots struct {
diff --git a/builder/alicloud/ecs/step_pre_validate.go b/builder/alicloud/ecs/step_pre_validate.go
index 283a6b334..8481f34f4 100644
--- a/builder/alicloud/ecs/step_pre_validate.go
+++ b/builder/alicloud/ecs/step_pre_validate.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepPreValidate struct {
diff --git a/builder/alicloud/ecs/step_region_copy_image.go b/builder/alicloud/ecs/step_region_copy_image.go
index ae5ebc693..6905b179d 100644
--- a/builder/alicloud/ecs/step_region_copy_image.go
+++ b/builder/alicloud/ecs/step_region_copy_image.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type stepRegionCopyAlicloudImage struct {
diff --git a/builder/alicloud/ecs/step_run_instance.go b/builder/alicloud/ecs/step_run_instance.go
index 559dfff63..d84d2028c 100644
--- a/builder/alicloud/ecs/step_run_instance.go
+++ b/builder/alicloud/ecs/step_run_instance.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepRunAlicloudInstance struct {
diff --git a/builder/alicloud/ecs/step_share_image.go b/builder/alicloud/ecs/step_share_image.go
index 7a4f6b675..552f41de4 100644
--- a/builder/alicloud/ecs/step_share_image.go
+++ b/builder/alicloud/ecs/step_share_image.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepShareAlicloudImage struct {
diff --git a/builder/alicloud/ecs/step_stop_instance.go b/builder/alicloud/ecs/step_stop_instance.go
index f7d561cf9..7b6daaaab 100644
--- a/builder/alicloud/ecs/step_stop_instance.go
+++ b/builder/alicloud/ecs/step_stop_instance.go
@@ -8,8 +8,8 @@ import (
 	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
 
 	"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepStopAlicloudInstance struct {
diff --git a/examples/alicloud/basic/alicloud.json b/builder/alicloud/examples/basic/alicloud.json
similarity index 100%
rename from examples/alicloud/basic/alicloud.json
rename to builder/alicloud/examples/basic/alicloud.json
diff --git a/examples/alicloud/basic/alicloud_windows.json b/builder/alicloud/examples/basic/alicloud_windows.json
similarity index 100%
rename from examples/alicloud/basic/alicloud_windows.json
rename to builder/alicloud/examples/basic/alicloud_windows.json
diff --git a/examples/alicloud/basic/alicloud_with_data_disk.json b/builder/alicloud/examples/basic/alicloud_with_data_disk.json
similarity index 100%
rename from examples/alicloud/basic/alicloud_with_data_disk.json
rename to builder/alicloud/examples/basic/alicloud_with_data_disk.json
diff --git a/examples/alicloud/basic/winrm_enable_userdata.ps1 b/builder/alicloud/examples/basic/winrm_enable_userdata.ps1
similarity index 100%
rename from examples/alicloud/basic/winrm_enable_userdata.ps1
rename to builder/alicloud/examples/basic/winrm_enable_userdata.ps1
diff --git a/examples/alicloud/chef/alicloud.json b/builder/alicloud/examples/chef/alicloud.json
similarity index 100%
rename from examples/alicloud/chef/alicloud.json
rename to builder/alicloud/examples/chef/alicloud.json
diff --git a/examples/alicloud/chef/chef.sh b/builder/alicloud/examples/chef/chef.sh
similarity index 100%
rename from examples/alicloud/chef/chef.sh
rename to builder/alicloud/examples/chef/chef.sh
diff --git a/examples/alicloud/chef/user_data.sh b/builder/alicloud/examples/chef/user_data.sh
similarity index 100%
rename from examples/alicloud/chef/user_data.sh
rename to builder/alicloud/examples/chef/user_data.sh
diff --git a/examples/alicloud/jenkins/alicloud.json b/builder/alicloud/examples/jenkins/alicloud.json
similarity index 100%
rename from examples/alicloud/jenkins/alicloud.json
rename to builder/alicloud/examples/jenkins/alicloud.json
diff --git a/examples/alicloud/jenkins/jenkins.sh b/builder/alicloud/examples/jenkins/jenkins.sh
similarity index 100%
rename from examples/alicloud/jenkins/jenkins.sh
rename to builder/alicloud/examples/jenkins/jenkins.sh
diff --git a/examples/alicloud/local/centos.json b/builder/alicloud/examples/local/centos.json
similarity index 100%
rename from examples/alicloud/local/centos.json
rename to builder/alicloud/examples/local/centos.json
diff --git a/examples/alicloud/local/http/centos-6.8/ks.cfg b/builder/alicloud/examples/local/http/centos-6.8/ks.cfg
similarity index 100%
rename from examples/alicloud/local/http/centos-6.8/ks.cfg
rename to builder/alicloud/examples/local/http/centos-6.8/ks.cfg
diff --git a/builder/alicloud/version/version.go b/builder/alicloud/version/version.go
new file mode 100644
index 000000000..5be3ed32d
--- /dev/null
+++ b/builder/alicloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AlicloudPluginVersion *version.PluginVersion
+
+func init() {
+	AlicloudPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/amazon/chroot/builder.go b/builder/amazon/chroot/builder.go
index 9fb431583..a6c750aca 100644
--- a/builder/amazon/chroot/builder.go
+++ b/builder/amazon/chroot/builder.go
@@ -14,15 +14,15 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/hcl2template"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -168,7 +168,7 @@ type Config struct {
 	// singular block containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	RootVolumeTag hcl2template.KeyValues `mapstructure:"root_volume_tag" required:"false"`
+	RootVolumeTag config.KeyValues `mapstructure:"root_volume_tag" required:"false"`
 	// what architecture to use when registering the final AMI; valid options
 	// are "x86_64" or "arm64". Defaults to "x86_64".
 	Architecture string `mapstructure:"ami_architecture" required:"false"`
@@ -201,8 +201,11 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 			Exclude: []string{
 				"ami_description",
 				"snapshot_tags",
+				"snapshot_tag",
 				"tags",
+				"tag",
 				"root_volume_tags",
+				"root_volume_tag",
 				"command_wrapper",
 				"post_mount_commands",
 				"pre_mount_commands",
@@ -369,7 +372,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("hook", hook)
 	state.Put("ui", ui)
 	state.Put("wrappedCommand", common.CommandWrapper(wrappedCommand))
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	// Build the steps
 	steps := []multistep.Step{
@@ -475,7 +478,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	)
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/amazon/chroot/builder.hcl2spec.go b/builder/amazon/chroot/builder.hcl2spec.go
index 4a2647a34..572ec8a2d 100644
--- a/builder/amazon/chroot/builder.hcl2spec.go
+++ b/builder/amazon/chroot/builder.hcl2spec.go
@@ -4,7 +4,7 @@ package chroot
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -13,6 +13,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName         *string                           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType       *string                           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion       *string                           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug             *bool                             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce             *bool                             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError           *string                           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -27,7 +28,7 @@ type FlatConfig struct {
 	AMIRegions              []string                          `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
 	AMISkipRegionValidation *bool                             `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	AMITags                 map[string]string                 `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                  []hcl2template.FlatKeyValue       `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	AMITag                  []config.FlatKeyValue             `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
 	AMIENASupport           *bool                             `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
 	AMISriovNetSupport      *bool                             `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
 	AMIForceDeregister      *bool                             `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
@@ -37,7 +38,7 @@ type FlatConfig struct {
 	AMIRegionKMSKeyIDs      map[string]string                 `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
 	AMISkipBuildRegion      *bool                             `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
 	SnapshotTags            map[string]string                 `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag             []hcl2template.FlatKeyValue       `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
+	SnapshotTag             []config.FlatKeyValue             `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
 	SnapshotUsers           []string                          `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
 	SnapshotGroups          []string                          `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
 	AccessKey               *string                           `mapstructure:"access_key" required:"true" cty:"access_key" hcl:"access_key"`
@@ -74,7 +75,7 @@ type FlatConfig struct {
 	SourceAmi               *string                           `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
 	SourceAmiFilter         *common.FlatAmiFilterOptions      `mapstructure:"source_ami_filter" required:"false" cty:"source_ami_filter" hcl:"source_ami_filter"`
 	RootVolumeTags          map[string]string                 `mapstructure:"root_volume_tags" required:"false" cty:"root_volume_tags" hcl:"root_volume_tags"`
-	RootVolumeTag           []hcl2template.FlatKeyValue       `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag" hcl:"root_volume_tag"`
+	RootVolumeTag           []config.FlatKeyValue             `mapstructure:"root_volume_tag" required:"false" cty:"root_volume_tag" hcl:"root_volume_tag"`
 	Architecture            *string                           `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture" hcl:"ami_architecture"`
 }
 
@@ -92,6 +93,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -106,7 +108,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
 		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
@@ -116,7 +118,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
 		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
 		"snapshot_tags":                 &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"access_key":                    &hcldec.AttrSpec{Name: "access_key", Type: cty.String, Required: false},
@@ -153,7 +155,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"source_ami":                    &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
 		"source_ami_filter":             &hcldec.BlockSpec{TypeName: "source_ami_filter", Nested: hcldec.ObjectSpec((*common.FlatAmiFilterOptions)(nil).HCL2Spec())},
 		"root_volume_tags":              &hcldec.AttrSpec{Name: "root_volume_tags", Type: cty.Map(cty.String), Required: false},
-		"root_volume_tag":               &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"root_volume_tag":               &hcldec.BlockListSpec{TypeName: "root_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"ami_architecture":              &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s
diff --git a/builder/amazon/chroot/copy_files_test.go b/builder/amazon/chroot/copy_files_test.go
index 409bbfb9b..2924e1193 100644
--- a/builder/amazon/chroot/copy_files_test.go
+++ b/builder/amazon/chroot/copy_files_test.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 )
 
 func TestCopyFile(t *testing.T) {
diff --git a/builder/amazon/chroot/step_attach_volume.go b/builder/amazon/chroot/step_attach_volume.go
index 651a2ff8a..d87b03ca0 100644
--- a/builder/amazon/chroot/step_attach_volume.go
+++ b/builder/amazon/chroot/step_attach_volume.go
@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepAttachVolume attaches the previously created volume to an
diff --git a/builder/amazon/chroot/step_attach_volume_test.go b/builder/amazon/chroot/step_attach_volume_test.go
index 3d3cc135e..cfc3dad76 100644
--- a/builder/amazon/chroot/step_attach_volume_test.go
+++ b/builder/amazon/chroot/step_attach_volume_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 func TestAttachVolumeCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
diff --git a/builder/amazon/chroot/step_check_root_device.go b/builder/amazon/chroot/step_check_root_device.go
index 3933680e3..cb1d06d8e 100644
--- a/builder/amazon/chroot/step_check_root_device.go
+++ b/builder/amazon/chroot/step_check_root_device.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCheckRootDevice makes sure the root device on the AMI is EBS-backed.
diff --git a/builder/amazon/chroot/step_create_volume.go b/builder/amazon/chroot/step_create_volume.go
index 7b01eced3..f59bf689d 100644
--- a/builder/amazon/chroot/step_create_volume.go
+++ b/builder/amazon/chroot/step_create_volume.go
@@ -9,9 +9,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // StepCreateVolume creates a new volume from the snapshot of the root
diff --git a/builder/amazon/chroot/step_early_unflock.go b/builder/amazon/chroot/step_early_unflock.go
index bae757f8a..a5378557f 100644
--- a/builder/amazon/chroot/step_early_unflock.go
+++ b/builder/amazon/chroot/step_early_unflock.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepEarlyUnflock unlocks the flock.
diff --git a/builder/amazon/chroot/step_flock.go b/builder/amazon/chroot/step_flock.go
index f3fd9d29e..5465a72fe 100644
--- a/builder/amazon/chroot/step_flock.go
+++ b/builder/amazon/chroot/step_flock.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepFlock provisions the instance within a chroot.
diff --git a/builder/amazon/chroot/step_flock_test.go b/builder/amazon/chroot/step_flock_test.go
index 698a4906d..8c20aefbd 100644
--- a/builder/amazon/chroot/step_flock_test.go
+++ b/builder/amazon/chroot/step_flock_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 func TestFlockCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
diff --git a/builder/amazon/chroot/step_instance_info.go b/builder/amazon/chroot/step_instance_info.go
index 01b0d0ac7..618577146 100644
--- a/builder/amazon/chroot/step_instance_info.go
+++ b/builder/amazon/chroot/step_instance_info.go
@@ -8,8 +8,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws/ec2metadata"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepInstanceInfo verifies that this builder is running on an EC2 instance.
diff --git a/builder/amazon/chroot/step_mount_device.go b/builder/amazon/chroot/step_mount_device.go
index dffd35854..d167e73eb 100644
--- a/builder/amazon/chroot/step_mount_device.go
+++ b/builder/amazon/chroot/step_mount_device.go
@@ -10,11 +10,11 @@ import (
 	"strings"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type mountPathData struct {
@@ -31,7 +31,7 @@ type StepMountDevice struct {
 	MountPartition string
 
 	mountPath     string
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func (s *StepMountDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
diff --git a/builder/amazon/chroot/step_mount_device_test.go b/builder/amazon/chroot/step_mount_device_test.go
index 88418451b..0ae140af0 100644
--- a/builder/amazon/chroot/step_mount_device_test.go
+++ b/builder/amazon/chroot/step_mount_device_test.go
@@ -3,7 +3,7 @@ package chroot
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
 )
 
 func TestMountDeviceCleanupFunc_ImplementsCleanupFunc(t *testing.T) {
diff --git a/builder/amazon/chroot/step_prepare_device.go b/builder/amazon/chroot/step_prepare_device.go
index 098d83858..970c29b13 100644
--- a/builder/amazon/chroot/step_prepare_device.go
+++ b/builder/amazon/chroot/step_prepare_device.go
@@ -6,14 +6,14 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 // StepPrepareDevice finds an available device and sets it.
 type StepPrepareDevice struct {
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func (s *StepPrepareDevice) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
diff --git a/builder/amazon/chroot/step_register_ami.go b/builder/amazon/chroot/step_register_ami.go
index f7e85dc07..74f10e271 100644
--- a/builder/amazon/chroot/step_register_ami.go
+++ b/builder/amazon/chroot/step_register_ami.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 // StepRegisterAMI creates the AMI.
diff --git a/builder/amazon/chroot/step_register_ami_test.go b/builder/amazon/chroot/step_register_ami_test.go
index 6a9de18f6..861fd4ca7 100644
--- a/builder/amazon/chroot/step_register_ami_test.go
+++ b/builder/amazon/chroot/step_register_ami_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	amazon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
diff --git a/builder/amazon/chroot/step_snapshot.go b/builder/amazon/chroot/step_snapshot.go
index 408c1f0c5..ba7391516 100644
--- a/builder/amazon/chroot/step_snapshot.go
+++ b/builder/amazon/chroot/step_snapshot.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepSnapshot creates a snapshot of the created volume.
diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go
index cd6aafb44..ed08b5a67 100644
--- a/builder/amazon/common/access_config.go
+++ b/builder/amazon/common/access_config.go
@@ -18,7 +18,7 @@ import (
 	awsbase "github.com/hashicorp/aws-sdk-go-base"
 	cleanhttp "github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	vaultapi "github.com/hashicorp/vault/api"
 )
 
@@ -141,11 +141,8 @@ type AccessConfig struct {
 	// The secret key used to communicate with AWS. [Learn how to set
 	// this](/docs/builders/amazon#specifying-amazon-credentials). This is not required
 	// if you are using `use_vault_aws_engine` for authentication instead.
-	SecretKey string `mapstructure:"secret_key" required:"true"`
-	// Set to true if you want to skip
-	// validation of the ami_regions configuration option. Default false.
-	SkipValidation       bool `mapstructure:"skip_region_validation" required:"false"`
-	SkipMetadataApiCheck bool `mapstructure:"skip_metadata_api_check"`
+	SecretKey            string `mapstructure:"secret_key" required:"true"`
+	SkipMetadataApiCheck bool   `mapstructure:"skip_metadata_api_check"`
 	// Set to true if you want to skip validating AWS credentials before runtime.
 	SkipCredsValidation bool `mapstructure:"skip_credential_validation"`
 	// The access token to use. This is different from the
diff --git a/builder/amazon/common/access_config_test.go b/builder/amazon/common/access_config_test.go
index 57e5fd92c..61449cbde 100644
--- a/builder/amazon/common/access_config_test.go
+++ b/builder/amazon/common/access_config_test.go
@@ -37,20 +37,6 @@ func TestAccessConfigPrepare_Region(t *testing.T) {
 	if err == nil {
 		t.Fatalf("should have region validation err: %s", c.RawRegion)
 	}
-
-	c.RawRegion = "custom"
-	c.SkipValidation = true
-	// testing whole prepare func here; this is checking that validation is
-	// skipped, so we don't need a mock connection
-	if err := c.Prepare(nil); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
-
-	c.SkipValidation = false
-	c.RawRegion = ""
-	if err := c.Prepare(nil); err != nil {
-		t.Fatalf("shouldn't have err: %s", err)
-	}
 }
 
 func TestAccessConfigPrepare_RegionRestricted(t *testing.T) {
diff --git a/builder/amazon/common/ami_config.go b/builder/amazon/common/ami_config.go
index e498ebbaa..d224b91df 100644
--- a/builder/amazon/common/ami_config.go
+++ b/builder/amazon/common/ami_config.go
@@ -7,9 +7,8 @@ import (
 	"log"
 	"regexp"
 
-	"github.com/hashicorp/packer/hcl2template"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // AMIConfig is for common configuration related to creating AMIs.
@@ -55,7 +54,7 @@ type AMIConfig struct {
 	// containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	AMITag hcl2template.KeyValues `mapstructure:"tag" required:"false"`
+	AMITag config.KeyValues `mapstructure:"tag" required:"false"`
 	// Enable enhanced networking (ENA but not SriovNetSupport) on
 	// HVM-compatible AMIs. If set, add `ec2:ModifyInstanceAttribute` to your
 	// AWS IAM policy.
@@ -140,7 +139,7 @@ type AMIConfig struct {
 	// repeatable block containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	SnapshotTag hcl2template.KeyValues `mapstructure:"snapshot_tag" required:"false"`
+	SnapshotTag config.KeyValues `mapstructure:"snapshot_tag" required:"false"`
 	// A list of account IDs that have
 	// access to create volumes from the snapshot(s). By default no additional
 	// users other than the user creating the AMI has permissions to create
diff --git a/builder/amazon/common/ami_config_test.go b/builder/amazon/common/ami_config_test.go
index 2448965db..5764a6045 100644
--- a/builder/amazon/common/ami_config_test.go
+++ b/builder/amazon/common/ami_config_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer/helper/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 func testAMIConfig() *AMIConfig {
diff --git a/builder/amazon/common/block_device.go b/builder/amazon/common/block_device.go
index 48d2a089a..3f1a31cdf 100644
--- a/builder/amazon/common/block_device.go
+++ b/builder/amazon/common/block_device.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const (
diff --git a/builder/amazon/common/block_device_test.go b/builder/amazon/common/block_device_test.go
index 2e909117a..d54ec5cca 100644
--- a/builder/amazon/common/block_device_test.go
+++ b/builder/amazon/common/block_device_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+  "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestBlockDevice(t *testing.T) {
diff --git a/builder/amazon/common/helper_funcs.go b/builder/amazon/common/helper_funcs.go
index 12dfe715e..cf7fec1f1 100644
--- a/builder/amazon/common/helper_funcs.go
+++ b/builder/amazon/common/helper_funcs.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // DestroyAMIs deregisters the AWS machine images in imageids from an active AWS account
diff --git a/builder/amazon/common/interpolate_build_info.go b/builder/amazon/common/interpolate_build_info.go
index 21647eaa0..5617db61f 100644
--- a/builder/amazon/common/interpolate_build_info.go
+++ b/builder/amazon/common/interpolate_build_info.go
@@ -3,8 +3,8 @@ package common
 import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 type BuildInfoTemplate struct {
@@ -17,7 +17,7 @@ type BuildInfoTemplate struct {
 	SourceAMITags         map[string]string
 }
 
-func extractBuildInfo(region string, state multistep.StateBag, generatedData *builder.GeneratedData) *BuildInfoTemplate {
+func extractBuildInfo(region string, state multistep.StateBag, generatedData *packerbuilderdata.GeneratedData) *BuildInfoTemplate {
 	rawSourceAMI, hasSourceAMI := state.GetOk("source_image")
 	if !hasSourceAMI {
 		return &BuildInfoTemplate{
diff --git a/builder/amazon/common/interpolate_build_info_test.go b/builder/amazon/common/interpolate_build_info_test.go
index a29f82dac..ea98bb417 100644
--- a/builder/amazon/common/interpolate_build_info_test.go
+++ b/builder/amazon/common/interpolate_build_info_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 func testImage() *ec2.Image {
@@ -17,6 +17,7 @@ func testImage() *ec2.Image {
 		Name:            aws.String("ami_test_name"),
 		OwnerId:         aws.String("ami_test_owner_id"),
 		ImageOwnerAlias: aws.String("ami_test_owner_alias"),
+		RootDeviceType:  aws.String("ebs"),
 		Tags: []*ec2.Tag{
 			{
 				Key:   aws.String("key-1"),
@@ -35,8 +36,8 @@ func testState() multistep.StateBag {
 	return state
 }
 
-func testGeneratedData(state multistep.StateBag) builder.GeneratedData {
-	generatedData := builder.GeneratedData{State: state}
+func testGeneratedData(state multistep.StateBag) packerbuilderdata.GeneratedData {
+	generatedData := packerbuilderdata.GeneratedData{State: state}
 	return generatedData
 }
 
diff --git a/builder/amazon/common/run_config.go b/builder/amazon/common/run_config.go
index 3e57d3a57..351f907ee 100644
--- a/builder/amazon/common/run_config.go
+++ b/builder/amazon/common/run_config.go
@@ -11,18 +11,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
 
 type AmiFilterOptions struct {
-	hcl2template.KeyValueFilter `mapstructure:",squash"`
-	Owners                      []string
-	MostRecent                  bool `mapstructure:"most_recent"`
+	config.KeyValueFilter `mapstructure:",squash"`
+	Owners                []string
+	MostRecent            bool `mapstructure:"most_recent"`
 }
 
 func (d *AmiFilterOptions) GetOwners() []*string {
@@ -43,13 +43,13 @@ func (d *AmiFilterOptions) NoOwner() bool {
 }
 
 type SubnetFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
-	MostFree                     bool `mapstructure:"most_free"`
-	Random                       bool `mapstructure:"random"`
+	config.NameValueFilter `mapstructure:",squash"`
+	MostFree               bool `mapstructure:"most_free"`
+	Random                 bool `mapstructure:"random"`
 }
 
 type VpcFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
+	config.NameValueFilter `mapstructure:",squash"`
 }
 
 type Statement struct {
@@ -64,7 +64,7 @@ type PolicyDocument struct {
 }
 
 type SecurityGroupFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
+	config.NameValueFilter `mapstructure:",squash"`
 }
 
 // RunConfig contains configuration for running an instance from a source
@@ -206,7 +206,7 @@ type RunConfig struct {
 	// block containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	RunTag hcl2template.KeyValues `mapstructure:"run_tag" required:"false"`
+	RunTag config.KeyValues `mapstructure:"run_tag" required:"false"`
 	// The ID (not the name) of the security
 	// group to assign to the instance. By default this is not set and Packer will
 	// automatically create a new temporary security group to allow SSH access.
@@ -321,7 +321,7 @@ type RunConfig struct {
 	// containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	SpotTag hcl2template.KeyValues `mapstructure:"spot_tag" required:"false"`
+	SpotTag config.KeyValues `mapstructure:"spot_tag" required:"false"`
 	// Filters used to populate the `subnet_id` field.
 	// JSON Example:
 	//
@@ -382,10 +382,6 @@ type RunConfig struct {
 	// The default is "default", meaning shared tenancy. Allowed values are "default",
 	// "dedicated" and "host".
 	Tenancy string `mapstructure:"tenancy" required:"false"`
-	// The name of the temporary key pair to
-	// generate. By default, Packer generates a name that looks like
-	// `packer_<UUID>`, where &lt;UUID&gt; is a 36 character unique identifier.
-	TemporaryKeyPairName string `mapstructure:"temporary_key_pair_name" required:"false"`
 	// A list of IPv4 CIDR blocks to be authorized access to the instance, when
 	// packer is creating a temporary security group.
 	//
diff --git a/builder/amazon/common/run_config.hcl2spec.go b/builder/amazon/common/run_config.hcl2spec.go
index 12b9a4482..49ad3950b 100644
--- a/builder/amazon/common/run_config.hcl2spec.go
+++ b/builder/amazon/common/run_config.hcl2spec.go
@@ -3,17 +3,17 @@ package common
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatAmiFilterOptions is an auto-generated flat version of AmiFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatAmiFilterOptions struct {
-	Filters    map[string]string           `cty:"filters" hcl:"filters"`
-	Filter     []hcl2template.FlatKeyValue `cty:"filter" hcl:"filter"`
-	Owners     []string                    `cty:"owners" hcl:"owners"`
-	MostRecent *bool                       `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"`
+	Filters    map[string]string     `cty:"filters" hcl:"filters"`
+	Filter     []config.FlatKeyValue `cty:"filter" hcl:"filter"`
+	Owners     []string              `cty:"owners" hcl:"owners"`
+	MostRecent *bool                 `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"`
 }
 
 // FlatMapstructure returns a new FlatAmiFilterOptions.
@@ -29,7 +29,7 @@ func (*AmiFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 func (*FlatAmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters":     &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":      &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"filter":      &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"owners":      &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false},
 		"most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false},
 	}
@@ -64,8 +64,8 @@ func (*FlatPolicyDocument) HCL2Spec() map[string]hcldec.Spec {
 // FlatSecurityGroupFilterOptions is an auto-generated flat version of SecurityGroupFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSecurityGroupFilterOptions struct {
-	Filters map[string]string            `cty:"filters" hcl:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string      `cty:"filters" hcl:"filters"`
+	Filter  []config.FlatNameValue `cty:"filter" hcl:"filter"`
 }
 
 // FlatMapstructure returns a new FlatSecurityGroupFilterOptions.
@@ -81,7 +81,7 @@ func (*SecurityGroupFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[
 func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -116,10 +116,10 @@ func (*FlatStatement) HCL2Spec() map[string]hcldec.Spec {
 // FlatSubnetFilterOptions is an auto-generated flat version of SubnetFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSubnetFilterOptions struct {
-	Filters  map[string]string            `cty:"filters" hcl:"filters"`
-	Filter   []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
-	MostFree *bool                        `mapstructure:"most_free" cty:"most_free" hcl:"most_free"`
-	Random   *bool                        `mapstructure:"random" cty:"random" hcl:"random"`
+	Filters  map[string]string      `cty:"filters" hcl:"filters"`
+	Filter   []config.FlatNameValue `cty:"filter" hcl:"filter"`
+	MostFree *bool                  `mapstructure:"most_free" cty:"most_free" hcl:"most_free"`
+	Random   *bool                  `mapstructure:"random" cty:"random" hcl:"random"`
 }
 
 // FlatMapstructure returns a new FlatSubnetFilterOptions.
@@ -135,7 +135,7 @@ func (*SubnetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]
 func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters":   &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"most_free": &hcldec.AttrSpec{Name: "most_free", Type: cty.Bool, Required: false},
 		"random":    &hcldec.AttrSpec{Name: "random", Type: cty.Bool, Required: false},
 	}
@@ -145,8 +145,8 @@ func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatVpcFilterOptions is an auto-generated flat version of VpcFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatVpcFilterOptions struct {
-	Filters map[string]string            `cty:"filters" hcl:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string      `cty:"filters" hcl:"filters"`
+	Filter  []config.FlatNameValue `cty:"filter" hcl:"filter"`
 }
 
 // FlatMapstructure returns a new FlatVpcFilterOptions.
@@ -162,7 +162,7 @@ func (*VpcFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 func (*FlatVpcFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }
diff --git a/builder/amazon/common/run_config_test.go b/builder/amazon/common/run_config_test.go
index 452cdab22..7be00a47a 100644
--- a/builder/amazon/common/run_config_test.go
+++ b/builder/amazon/common/run_config_test.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 func init() {
@@ -87,7 +87,7 @@ func TestRunConfigPrepare_SourceAmiFilterGood(t *testing.T) {
 	filter_value := "foo"
 	goodFilter := AmiFilterOptions{
 		Owners: []string{owner},
-		KeyValueFilter: hcl2template.KeyValueFilter{
+		KeyValueFilter: config.KeyValueFilter{
 			Filters: map[string]string{filter_key: filter_value},
 		},
 	}
diff --git a/builder/amazon/common/ssh.go b/builder/amazon/common/ssh.go
index 959f3ce2c..add5308ec 100644
--- a/builder/amazon/common/ssh.go
+++ b/builder/amazon/common/ssh.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type ec2Describer interface {
diff --git a/builder/amazon/common/ssh_test.go b/builder/amazon/common/ssh_test.go
index f098613a0..73099b7ef 100644
--- a/builder/amazon/common/ssh_test.go
+++ b/builder/amazon/common/ssh_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const (
diff --git a/builder/amazon/common/ssm/session.go b/builder/amazon/common/ssm/session.go
index 2c90233e8..8e3f0fa84 100644
--- a/builder/amazon/common/ssm/session.go
+++ b/builder/amazon/common/ssm/session.go
@@ -13,9 +13,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ssm"
 	"github.com/aws/aws-sdk-go/service/ssm/ssmiface"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/builder/localexec"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
 )
 
 type Session struct {
diff --git a/builder/amazon/common/state.go b/builder/amazon/common/state.go
index 113a36ab8..07ad956fe 100644
--- a/builder/amazon/common/state.go
+++ b/builder/amazon/common/state.go
@@ -14,7 +14,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StateRefreshFunc is a function type used for StateChangeConf that is
diff --git a/builder/amazon/common/step_ami_region_copy.go b/builder/amazon/common/step_ami_region_copy.go
index c38db6771..1395b3f80 100644
--- a/builder/amazon/common/step_ami_region_copy.go
+++ b/builder/amazon/common/step_ami_region_copy.go
@@ -8,9 +8,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type StepAMIRegionCopy struct {
diff --git a/builder/amazon/common/step_ami_region_copy_test.go b/builder/amazon/common/step_ami_region_copy_test.go
index 9fc636519..a9f511a61 100644
--- a/builder/amazon/common/step_ami_region_copy_test.go
+++ b/builder/amazon/common/step_ami_region_copy_test.go
@@ -11,9 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 // Define a mock struct to be used in unit tests for common aws steps.
diff --git a/builder/amazon/common/step_cleanup_volumes.go b/builder/amazon/common/step_cleanup_volumes.go
index cfe7a7574..67c0a7939 100644
--- a/builder/amazon/common/step_cleanup_volumes.go
+++ b/builder/amazon/common/step_cleanup_volumes.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepCleanupVolumes cleans up any orphaned volumes that were not designated to
diff --git a/builder/amazon/common/step_create_ssm_tunnel.go b/builder/amazon/common/step_create_ssm_tunnel.go
index aad0fab4f..2b1de42af 100644
--- a/builder/amazon/common/step_create_ssm_tunnel.go
+++ b/builder/amazon/common/step_create_ssm_tunnel.go
@@ -10,9 +10,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ssm"
 	pssm "github.com/hashicorp/packer/builder/amazon/common/ssm"
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 type StepCreateSSMTunnel struct {
diff --git a/builder/amazon/common/step_create_tags.go b/builder/amazon/common/step_create_tags.go
index 4805b1255..c875f5e49 100644
--- a/builder/amazon/common/step_create_tags.go
+++ b/builder/amazon/common/step_create_tags.go
@@ -9,10 +9,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type StepCreateTags struct {
diff --git a/builder/amazon/common/step_deregister_ami.go b/builder/amazon/common/step_deregister_ami.go
index c593862e0..8ab5685c7 100644
--- a/builder/amazon/common/step_deregister_ami.go
+++ b/builder/amazon/common/step_deregister_ami.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDeregisterAMI struct {
diff --git a/builder/amazon/common/step_get_password.go b/builder/amazon/common/step_get_password.go
index a2d741af6..007f8c5f2 100644
--- a/builder/amazon/common/step_get_password.go
+++ b/builder/amazon/common/step_get_password.go
@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // StepGetPassword reads the password from a Windows server and sets it
diff --git a/builder/amazon/common/step_iam_instance_profile.go b/builder/amazon/common/step_iam_instance_profile.go
index 3ef72e9ee..91a6ec2b0 100644
--- a/builder/amazon/common/step_iam_instance_profile.go
+++ b/builder/amazon/common/step_iam_instance_profile.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/iam"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type StepIamInstanceProfile struct {
diff --git a/builder/amazon/common/step_key_pair.go b/builder/amazon/common/step_key_pair.go
index 631226ab3..a477524de 100644
--- a/builder/amazon/common/step_key_pair.go
+++ b/builder/amazon/common/step_key_pair.go
@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepKeyPair struct {
diff --git a/builder/amazon/common/step_modify_ami_attributes.go b/builder/amazon/common/step_modify_ami_attributes.go
index 057650a51..b60caff4c 100644
--- a/builder/amazon/common/step_modify_ami_attributes.go
+++ b/builder/amazon/common/step_modify_ami_attributes.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type StepModifyAMIAttributes struct {
@@ -22,7 +22,7 @@ type StepModifyAMIAttributes struct {
 	Description    string
 	Ctx            interpolate.Context
 
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func (s *StepModifyAMIAttributes) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
diff --git a/builder/amazon/common/step_modify_ebs_instance.go b/builder/amazon/common/step_modify_ebs_instance.go
index 6b2492b7a..a578bcb24 100644
--- a/builder/amazon/common/step_modify_ebs_instance.go
+++ b/builder/amazon/common/step_modify_ebs_instance.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type StepModifyEBSBackedInstance struct {
diff --git a/builder/amazon/common/step_network_info.go b/builder/amazon/common/step_network_info.go
index 89d63590d..b66bef233 100644
--- a/builder/amazon/common/step_network_info.go
+++ b/builder/amazon/common/step_network_info.go
@@ -8,8 +8,8 @@ import (
 	"sort"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepNetworkInfo queries AWS for information about
diff --git a/builder/amazon/common/step_pre_validate.go b/builder/amazon/common/step_pre_validate.go
index 94ea7af57..993b4d940 100644
--- a/builder/amazon/common/step_pre_validate.go
+++ b/builder/amazon/common/step_pre_validate.go
@@ -10,9 +10,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // StepPreValidate provides an opportunity to pre-validate any configuration for
diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index ed228a128..10a5f4af8 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -12,11 +12,11 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type StepRunSourceInstance struct {
diff --git a/builder/amazon/common/step_run_spot_instance.go b/builder/amazon/common/step_run_spot_instance.go
index 75ec401e9..039198f78 100644
--- a/builder/amazon/common/step_run_spot_instance.go
+++ b/builder/amazon/common/step_run_spot_instance.go
@@ -11,13 +11,14 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/random"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type EC2BlockDeviceMappingsBuilder interface {
@@ -35,6 +36,7 @@ type StepRunSpotInstance struct {
 	ExpectedRootDevice                string
 	InstanceInitiatedShutdownBehavior string
 	InstanceType                      string
+	Region                            string
 	SourceAMI                         string
 	SpotPrice                         string
 	SpotTags                          map[string]string
@@ -158,7 +160,7 @@ func (s *StepRunSpotInstance) LoadUserData() (string, error) {
 }
 
 func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
-	ec2conn := state.Get("ec2").(*ec2.EC2)
+	ec2conn := state.Get("ec2").(ec2iface.EC2API)
 	ui := state.Get("ui").(packer.Ui)
 
 	ui.Say("Launching a spot AWS instance...")
@@ -197,7 +199,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	}
 
 	// Convert tags from the tag map provided by the user into *ec2.Tag s
-	ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+	ec2Tags, err := TagMap(s.Tags).EC2Tags(s.Ctx, s.Region, state)
 	if err != nil {
 		err := fmt.Errorf("Error generating tags for source instance: %s", err)
 		state.Put("error", err)
@@ -221,6 +223,14 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	}
 	marketOptions.SetMarketType(ec2.MarketTypeSpot)
 
+	spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, s.Region, state)
+	if err != nil {
+		err := fmt.Errorf("Error generating tags for spot request: %s", err)
+		state.Put("error", err)
+		ui.Error(err.Error())
+		return multistep.ActionHalt
+	}
+
 	// Create a launch template for the instance
 	ui.Message("Loading User Data File...")
 
@@ -243,6 +253,14 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 		LaunchTemplateName: aws.String(launchTemplateName),
 		VersionDescription: aws.String("template generated by packer for launching spot instances"),
 	}
+	if len(spotTags) > 0 {
+		launchTemplate.TagSpecifications = []*ec2.TagSpecification{
+			{
+				ResourceType: aws.String("launch-template"),
+				Tags:         spotTags,
+			},
+		}
+	}
 
 	// Tell EC2 to create the template
 	_, err = ec2conn.CreateLaunchTemplate(launchTemplate)
@@ -361,14 +379,6 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	instance := describeOutput.Reservations[0].Instances[0]
 
 	// Tag the spot instance request (not the eventual spot instance)
-	spotTags, err := TagMap(s.SpotTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
-	if err != nil {
-		err := fmt.Errorf("Error generating tags for spot request: %s", err)
-		state.Put("error", err)
-		ui.Error(err.Error())
-		return multistep.ActionHalt
-	}
-
 	if len(spotTags) > 0 && len(s.SpotTags) > 0 {
 		spotTags.Report(ui)
 		// Use the instance ID to find out the SIR, so that we can tag the spot
@@ -428,7 +438,7 @@ func (s *StepRunSpotInstance) Run(ctx context.Context, state multistep.StateBag)
 	if len(volumeIds) > 0 && len(s.VolumeTags) > 0 {
 		ui.Say("Adding tags to source EBS Volumes")
 
-		volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, *ec2conn.Config.Region, state)
+		volumeTags, err := TagMap(s.VolumeTags).EC2Tags(s.Ctx, s.Region, state)
 		if err != nil {
 			err := fmt.Errorf("Error tagging source EBS Volumes on %s: %s", *instance.InstanceId, err)
 			state.Put("error", err)
diff --git a/builder/amazon/common/step_run_spot_instance_test.go b/builder/amazon/common/step_run_spot_instance_test.go
index 89fa53f01..5df8070f1 100644
--- a/builder/amazon/common/step_run_spot_instance_test.go
+++ b/builder/amazon/common/step_run_spot_instance_test.go
@@ -2,14 +2,16 @@ package common
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
+	"github.com/aws/aws-sdk-go/service/ec2/ec2iface"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Create statebag for running test
@@ -43,6 +45,7 @@ func getBasicStep() *StepRunSpotInstance {
 		ExpectedRootDevice:                "ebs",
 		InstanceInitiatedShutdownBehavior: "stop",
 		InstanceType:                      "t2.micro",
+		Region:                            "us-east-1",
 		SourceAMI:                         "",
 		SpotPrice:                         "auto",
 		SpotTags:                          nil,
@@ -134,3 +137,226 @@ func TestCreateTemplateData_NoEphemeral(t *testing.T) {
 	// 	t.Fatalf("Should have created 26 mappings to keep ephemeral drives from appearing.")
 	// }
 }
+
+type runSpotEC2ConnMock struct {
+	ec2iface.EC2API
+
+	CreateLaunchTemplateParams []*ec2.CreateLaunchTemplateInput
+	CreateLaunchTemplateFn     func(*ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error)
+
+	CreateFleetParams []*ec2.CreateFleetInput
+	CreateFleetFn     func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error)
+
+	CreateTagsParams []*ec2.CreateTagsInput
+	CreateTagsFn     func(*ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error)
+
+	DescribeInstancesParams []*ec2.DescribeInstancesInput
+	DescribeInstancesFn     func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error)
+}
+
+func (m *runSpotEC2ConnMock) CreateLaunchTemplate(req *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
+	m.CreateLaunchTemplateParams = append(m.CreateLaunchTemplateParams, req)
+	resp, err := m.CreateLaunchTemplateFn(req)
+	return resp, err
+}
+
+func (m *runSpotEC2ConnMock) CreateFleet(req *ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
+	m.CreateFleetParams = append(m.CreateFleetParams, req)
+	if m.CreateFleetFn != nil {
+		resp, err := m.CreateFleetFn(req)
+		return resp, err
+	} else {
+		return nil, nil
+	}
+}
+
+func (m *runSpotEC2ConnMock) DescribeInstances(req *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
+	m.DescribeInstancesParams = append(m.DescribeInstancesParams, req)
+	if m.DescribeInstancesFn != nil {
+		resp, err := m.DescribeInstancesFn(req)
+		return resp, err
+	} else {
+		return nil, nil
+	}
+}
+
+func (m *runSpotEC2ConnMock) CreateTags(req *ec2.CreateTagsInput) (*ec2.CreateTagsOutput, error) {
+	m.CreateTagsParams = append(m.CreateTagsParams, req)
+	if m.CreateTagsFn != nil {
+		resp, err := m.CreateTagsFn(req)
+		return resp, err
+	} else {
+		return nil, nil
+	}
+}
+
+func defaultEc2Mock(instanceId, spotRequestId, volumeId *string) *runSpotEC2ConnMock {
+	instance := &ec2.Instance{
+		InstanceId:            instanceId,
+		SpotInstanceRequestId: spotRequestId,
+		BlockDeviceMappings: []*ec2.InstanceBlockDeviceMapping{
+			{
+				Ebs: &ec2.EbsInstanceBlockDevice{
+					VolumeId: volumeId,
+				},
+			},
+		},
+	}
+	return &runSpotEC2ConnMock{
+		CreateLaunchTemplateFn: func(in *ec2.CreateLaunchTemplateInput) (*ec2.CreateLaunchTemplateOutput, error) {
+			return &ec2.CreateLaunchTemplateOutput{
+				LaunchTemplate: nil,
+				Warning:        nil,
+			}, nil
+		},
+		CreateFleetFn: func(*ec2.CreateFleetInput) (*ec2.CreateFleetOutput, error) {
+			return &ec2.CreateFleetOutput{
+				Errors:  nil,
+				FleetId: nil,
+				Instances: []*ec2.CreateFleetInstance{
+					{
+						InstanceIds: []*string{instanceId},
+					},
+				},
+			}, nil
+		},
+		DescribeInstancesFn: func(input *ec2.DescribeInstancesInput) (*ec2.DescribeInstancesOutput, error) {
+			return &ec2.DescribeInstancesOutput{
+				NextToken: nil,
+				Reservations: []*ec2.Reservation{
+					{
+						Instances: []*ec2.Instance{instance},
+					},
+				},
+			}, nil
+		},
+	}
+}
+
+func TestRun(t *testing.T) {
+	instanceId := aws.String("test-instance-id")
+	spotRequestId := aws.String("spot-id")
+	volumeId := aws.String("volume-id")
+	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId)
+
+	uiMock := packer.TestUi(t)
+
+	state := tStateSpot()
+	state.Put("ec2", ec2Mock)
+	state.Put("ui", uiMock)
+	state.Put("source_image", testImage())
+
+	stepRunSpotInstance := getBasicStep()
+	stepRunSpotInstance.Tags["Name"] = "Packer Builder"
+	stepRunSpotInstance.Tags["test-tag"] = "test-value"
+	stepRunSpotInstance.SpotTags = map[string]string{
+		"spot-tag": "spot-tag-value",
+	}
+	stepRunSpotInstance.VolumeTags = map[string]string{
+		"volume-tag": "volume-tag-value",
+	}
+
+	ctx := context.TODO()
+	action := stepRunSpotInstance.Run(ctx, state)
+
+	if err := state.Get("error"); err != nil {
+		t.Fatalf("should not error, but: %v", err)
+	}
+
+	if action != multistep.ActionContinue {
+		t.Fatalf("shoul continue, but: %v", action)
+	}
+
+	if len(ec2Mock.CreateLaunchTemplateParams) != 1 {
+		t.Fatalf("createLaunchTemplate should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams))
+	}
+	launchTemplateName := ec2Mock.CreateLaunchTemplateParams[0].LaunchTemplateName
+
+	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 1 {
+		t.Fatalf("exactly one launch template tag specification expected")
+	}
+	if *ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].ResourceType != "launch-template" {
+		t.Fatalf("resource type 'launch-template' expected")
+	}
+	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags) != 1 {
+		t.Fatalf("1 launch template tag expected")
+	}
+
+	nameTag := ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications[0].Tags[0]
+	if *nameTag.Key != "spot-tag" || *nameTag.Value != "spot-tag-value" {
+		t.Fatalf("expected spot-tag: spot-tag-value")
+	}
+
+	if len(ec2Mock.CreateFleetParams) != 1 {
+		t.Fatalf("createFleet should be invoked once, but invoked %v", len(ec2Mock.CreateLaunchTemplateParams))
+	}
+	if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.DefaultTargetCapacityType != "spot" {
+		t.Fatalf("capacity type should be spot")
+	}
+	if *ec2Mock.CreateFleetParams[0].TargetCapacitySpecification.TotalTargetCapacity != 1 {
+		t.Fatalf("target capacity should be 1")
+	}
+	if len(ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs) != 1 {
+		t.Fatalf("exactly one launch config template expected")
+	}
+	if *ec2Mock.CreateFleetParams[0].LaunchTemplateConfigs[0].LaunchTemplateSpecification.LaunchTemplateName != *launchTemplateName {
+		t.Fatalf("launchTemplateName should match in createLaunchTemplate and createFleet requests")
+	}
+
+	if len(ec2Mock.DescribeInstancesParams) != 1 {
+		t.Fatalf("describeInstancesParams should be invoked once, but invoked %v", len(ec2Mock.DescribeInstancesParams))
+	}
+	if *ec2Mock.DescribeInstancesParams[0].InstanceIds[0] != *instanceId {
+		t.Fatalf("instanceId should match from createFleet response")
+	}
+
+	uiMock.Say(fmt.Sprintf("%v", ec2Mock.CreateTagsParams))
+	if len(ec2Mock.CreateTagsParams) != 3 {
+		t.Fatalf("createTags should be invoked 3 times")
+	}
+	if len(ec2Mock.CreateTagsParams[0].Resources) != 1 || *ec2Mock.CreateTagsParams[0].Resources[0] != *spotRequestId {
+		t.Fatalf("should create tags for spot request")
+	}
+	if len(ec2Mock.CreateTagsParams[1].Resources) != 1 || *ec2Mock.CreateTagsParams[1].Resources[0] != *instanceId {
+		t.Fatalf("should create tags for instance")
+	}
+	if len(ec2Mock.CreateTagsParams[2].Resources) != 1 || ec2Mock.CreateTagsParams[2].Resources[0] != volumeId {
+		t.Fatalf("should create tags for volume")
+	}
+}
+
+func TestRun_NoSpotTags(t *testing.T) {
+	instanceId := aws.String("test-instance-id")
+	spotRequestId := aws.String("spot-id")
+	volumeId := aws.String("volume-id")
+	ec2Mock := defaultEc2Mock(instanceId, spotRequestId, volumeId)
+
+	uiMock := packer.TestUi(t)
+
+	state := tStateSpot()
+	state.Put("ec2", ec2Mock)
+	state.Put("ui", uiMock)
+	state.Put("source_image", testImage())
+
+	stepRunSpotInstance := getBasicStep()
+	stepRunSpotInstance.Tags["Name"] = "Packer Builder"
+	stepRunSpotInstance.Tags["test-tag"] = "test-value"
+	stepRunSpotInstance.VolumeTags = map[string]string{
+		"volume-tag": "volume-tag-value",
+	}
+
+	ctx := context.TODO()
+	action := stepRunSpotInstance.Run(ctx, state)
+
+	if err := state.Get("error"); err != nil {
+		t.Fatalf("should not error, but: %v", err)
+	}
+
+	if action != multistep.ActionContinue {
+		t.Fatalf("shoul continue, but: %v", action)
+	}
+
+	if len(ec2Mock.CreateLaunchTemplateParams[0].TagSpecifications) != 0 {
+		t.Fatalf("0 launch template tags expected")
+	}
+}
diff --git a/builder/amazon/common/step_security_group.go b/builder/amazon/common/step_security_group.go
index 2b5ddaf7e..d77f4bfb4 100644
--- a/builder/amazon/common/step_security_group.go
+++ b/builder/amazon/common/step_security_group.go
@@ -10,10 +10,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/request"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type StepSecurityGroup struct {
diff --git a/builder/amazon/common/step_set_generated_data.go b/builder/amazon/common/step_set_generated_data.go
index e364390b0..f90b669b2 100644
--- a/builder/amazon/common/step_set_generated_data.go
+++ b/builder/amazon/common/step_set_generated_data.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 // &awscommon.StepSetGeneratedData{
@@ -13,7 +13,7 @@ import (
 // },
 
 type StepSetGeneratedData struct {
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func (s *StepSetGeneratedData) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
diff --git a/builder/amazon/common/step_source_ami_info.go b/builder/amazon/common/step_source_ami_info.go
index a3e4de37f..3c387a1c0 100644
--- a/builder/amazon/common/step_source_ami_info.go
+++ b/builder/amazon/common/step_source_ami_info.go
@@ -8,9 +8,9 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 // StepSourceAMIInfo extracts critical information from the source AMI
diff --git a/builder/amazon/common/step_stop_ebs_instance.go b/builder/amazon/common/step_stop_ebs_instance.go
index f3ed58473..db0591e44 100644
--- a/builder/amazon/common/step_stop_ebs_instance.go
+++ b/builder/amazon/common/step_stop_ebs_instance.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepStopEBSBackedInstance struct {
diff --git a/builder/amazon/common/tags.go b/builder/amazon/common/tags.go
index 5b0a4d276..299574c25 100644
--- a/builder/amazon/common/tags.go
+++ b/builder/amazon/common/tags.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type TagMap map[string]string
@@ -23,7 +23,7 @@ func (t EC2Tags) Report(ui packer.Ui) {
 
 func (t TagMap) EC2Tags(ictx interpolate.Context, region string, state multistep.StateBag) (EC2Tags, error) {
 	var ec2Tags []*ec2.Tag
-	generatedData := builder.GeneratedData{State: state}
+	generatedData := packerbuilderdata.GeneratedData{State: state}
 	ictx.Data = extractBuildInfo(region, state, &generatedData)
 
 	for key, value := range t {
diff --git a/builder/amazon/ebs/builder.go b/builder/amazon/ebs/builder.go
index 4d4934c43..a7be359c2 100644
--- a/builder/amazon/ebs/builder.go
+++ b/builder/amazon/ebs/builder.go
@@ -15,15 +15,15 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -60,7 +60,7 @@ type Config struct {
 	// block containing a `name` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](https://packer.io/docs/configuration/from-1.5/expressions.html#dynamic-blocks)
 	// will allow you to create those programatically.
-	VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag" required:"false"`
+	VolumeRunTag config.NameValues `mapstructure:"run_volume_tag" required:"false"`
 	// Relevant only to Windows guests: If you set this flag, we'll add clauses
 	// to the launch_block_device_mappings that make sure ephemeral drives
 	// don't show up in the EC2 console. If you launched from the EC2 console,
@@ -92,10 +92,15 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 			Exclude: []string{
 				"ami_description",
 				"run_tags",
+				"run_tag",
 				"run_volume_tags",
+				"run_volume_tag",
 				"spot_tags",
+				"spot_tag",
 				"snapshot_tags",
+				"snapshot_tag",
 				"tags",
+				"tag",
 			},
 		},
 	}, raws...)
@@ -164,7 +169,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
@@ -181,6 +186,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ExpectedRootDevice:                "ebs",
 			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 			InstanceType:                      b.config.InstanceType,
+			Region:                            *ec2conn.Config.Region,
 			SourceAMI:                         b.config.SourceAmi,
 			SpotPrice:                         b.config.SpotPrice,
 			SpotTags:                          b.config.SpotTags,
@@ -292,8 +298,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&awscommon.StepSetGeneratedData{
 			GeneratedData: generatedData,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&awscommon.StepStopEBSBackedInstance{
@@ -344,7 +350,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 	// If there was an error, return that
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/amazon/ebs/builder.hcl2spec.go b/builder/amazon/ebs/builder.hcl2spec.go
index c02289228..c89a030d6 100644
--- a/builder/amazon/ebs/builder.hcl2spec.go
+++ b/builder/amazon/ebs/builder.hcl2spec.go
@@ -4,7 +4,7 @@ package ebs
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -13,6 +13,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                           *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                         *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -29,7 +30,6 @@ type FlatConfig struct {
 	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
 	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
 	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
 	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
 	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
@@ -42,8 +42,9 @@ type FlatConfig struct {
 	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
 	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
 	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
+	AMISkipRegionValidation                   *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                                    []hcl2template.FlatKeyValue            `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	AMITag                                    []config.FlatKeyValue                  `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
 	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
@@ -53,7 +54,7 @@ type FlatConfig struct {
 	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
 	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
 	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatKeyValue            `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
+	SnapshotTag                               []config.FlatKeyValue                  `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
 	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
 	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
 	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
@@ -69,7 +70,7 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
+	RunTag                                    []config.FlatKeyValue                  `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
@@ -78,11 +79,10 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
+	SpotTag                                   []config.FlatKeyValue                  `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
 	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
 	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
 	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
@@ -96,6 +96,7 @@ type FlatConfig struct {
 	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
 	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
 	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName                   *string                                `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
 	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
 	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
@@ -143,7 +144,7 @@ type FlatConfig struct {
 	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"`
 	LaunchMappings                            []common.FlatBlockDevice               `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"`
 	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatNameValue           `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"`
+	VolumeRunTag                              []config.FlatNameValue                 `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"`
 	NoEphemeral                               *bool                                  `mapstructure:"no_ephemeral" required:"false" cty:"no_ephemeral" hcl:"no_ephemeral"`
 }
 
@@ -161,6 +162,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -177,7 +179,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"profile":                       &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
 		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
-		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
 		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
@@ -190,8 +191,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_groups":                    &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
 		"ami_product_codes":             &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
+		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
@@ -201,7 +203,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
 		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
 		"snapshot_tags":                 &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"associate_public_ip_address":   &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
@@ -217,7 +219,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
 		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -226,11 +228,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
 		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
-		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
 		"user_data_file":                        &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false},
@@ -244,6 +245,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
+		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
 		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
 		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
@@ -291,7 +293,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_block_device_mappings":             &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
 		"launch_block_device_mappings":          &hcldec.BlockListSpec{TypeName: "launch_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
 		"run_volume_tags":                       &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false},
-		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"no_ephemeral":                          &hcldec.AttrSpec{Name: "no_ephemeral", Type: cty.Bool, Required: false},
 	}
 	return s
diff --git a/builder/amazon/ebs/builder_test.go b/builder/amazon/ebs/builder_test.go
index 8e255b868..341a57988 100644
--- a/builder/amazon/ebs/builder_test.go
+++ b/builder/amazon/ebs/builder_test.go
@@ -47,7 +47,6 @@ func TestBuilderPrepare_AMIName(t *testing.T) {
 
 	// Test good
 	config["ami_name"] = "foo"
-	config["skip_region_validation"] = true
 	_, warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
@@ -100,7 +99,6 @@ func TestBuilderPrepare_InvalidShutdownBehavior(t *testing.T) {
 
 	// Test good
 	config["shutdown_behavior"] = "terminate"
-	config["skip_region_validation"] = true
 	_, warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
diff --git a/builder/amazon/ebs/step_create_ami.go b/builder/amazon/ebs/step_create_ami.go
index 5cbbc5ca8..25efa7666 100644
--- a/builder/amazon/ebs/step_create_ami.go
+++ b/builder/amazon/ebs/step_create_ami.go
@@ -10,10 +10,10 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
 	"github.com/hashicorp/packer/builder/amazon/common/awserrors"
-	"github.com/hashicorp/packer/common/random"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type stepCreateAMI struct {
diff --git a/builder/amazon/ebssurrogate/block_device.go b/builder/amazon/ebssurrogate/block_device.go
index 18e442f22..dc00d4d00 100644
--- a/builder/amazon/ebssurrogate/block_device.go
+++ b/builder/amazon/ebssurrogate/block_device.go
@@ -5,7 +5,7 @@ package ebssurrogate
 import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type BlockDevice struct {
diff --git a/builder/amazon/ebssurrogate/builder.go b/builder/amazon/ebssurrogate/builder.go
index c70026b3e..a6036bd76 100644
--- a/builder/amazon/ebssurrogate/builder.go
+++ b/builder/amazon/ebssurrogate/builder.go
@@ -13,15 +13,15 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "mitchellh.amazon.ebssurrogate"
@@ -66,7 +66,7 @@ type Config struct {
 	// block containing a `name` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](https://packer.io/docs/configuration/from-1.5/expressions.html#dynamic-blocks)
 	// will allow you to create those programatically.
-	VolumeRunTag hcl2template.NameValues `mapstructure:"run_volume_tag" required:"false"`
+	VolumeRunTag config.NameValues `mapstructure:"run_volume_tag" required:"false"`
 	// what architecture to use when registering the
 	// final AMI; valid options are "x86_64" or "arm64". Defaults to "x86_64".
 	Architecture string `mapstructure:"ami_architecture" required:"false"`
@@ -91,10 +91,15 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 			Exclude: []string{
 				"ami_description",
 				"run_tags",
+				"run_tag",
 				"run_volume_tags",
+				"run_volume_tag",
 				"snapshot_tags",
+				"snapshot_tag",
 				"spot_tags",
+				"spot_tag",
 				"tags",
+				"tag",
 			},
 		},
 	}, raws...)
@@ -187,7 +192,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
@@ -204,6 +209,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ExpectedRootDevice:                "ebs",
 			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 			InstanceType:                      b.config.InstanceType,
+			Region:                            *ec2conn.Config.Region,
 			SourceAMI:                         b.config.SourceAmi,
 			SpotPrice:                         b.config.SpotPrice,
 			SpotInstanceTypes:                 b.config.SpotInstanceTypes,
@@ -316,8 +322,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&awscommon.StepSetGeneratedData{
 			GeneratedData: generatedData,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&awscommon.StepStopEBSBackedInstance{
@@ -383,7 +389,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/amazon/ebssurrogate/builder.hcl2spec.go b/builder/amazon/ebssurrogate/builder.hcl2spec.go
index e8fb81726..3cdaf6b98 100644
--- a/builder/amazon/ebssurrogate/builder.hcl2spec.go
+++ b/builder/amazon/ebssurrogate/builder.hcl2spec.go
@@ -4,7 +4,7 @@ package ebssurrogate
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -56,6 +56,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 type FlatConfig struct {
 	PackerBuildName                           *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                         *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -72,7 +73,6 @@ type FlatConfig struct {
 	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
 	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
 	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
 	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
 	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
@@ -91,7 +91,7 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
+	RunTag                                    []config.FlatKeyValue                  `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
@@ -100,11 +100,10 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
+	SpotTag                                   []config.FlatKeyValue                  `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
 	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
 	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
 	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
@@ -118,6 +117,7 @@ type FlatConfig struct {
 	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
 	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
 	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName                   *string                                `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
 	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
 	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
@@ -169,8 +169,9 @@ type FlatConfig struct {
 	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
 	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
 	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
+	AMISkipRegionValidation                   *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                                    []hcl2template.FlatKeyValue            `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	AMITag                                    []config.FlatKeyValue                  `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
 	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
@@ -180,14 +181,14 @@ type FlatConfig struct {
 	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
 	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
 	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatKeyValue            `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
+	SnapshotTag                               []config.FlatKeyValue                  `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
 	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
 	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
 	AMIMappings                               []common.FlatBlockDevice               `mapstructure:"ami_block_device_mappings" required:"false" cty:"ami_block_device_mappings" hcl:"ami_block_device_mappings"`
 	LaunchMappings                            []FlatBlockDevice                      `mapstructure:"launch_block_device_mappings" required:"false" cty:"launch_block_device_mappings" hcl:"launch_block_device_mappings"`
 	RootDevice                                *FlatRootBlockDevice                   `mapstructure:"ami_root_device" required:"true" cty:"ami_root_device" hcl:"ami_root_device"`
 	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatNameValue           `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"`
+	VolumeRunTag                              []config.FlatNameValue                 `mapstructure:"run_volume_tag" required:"false" cty:"run_volume_tag" hcl:"run_volume_tag"`
 	Architecture                              *string                                `mapstructure:"ami_architecture" required:"false" cty:"ami_architecture" hcl:"ami_architecture"`
 }
 
@@ -205,6 +206,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -221,7 +223,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"profile":                       &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
 		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
-		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
 		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
@@ -240,7 +241,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
 		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -249,11 +250,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
 		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
-		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
 		"user_data_file":                        &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false},
@@ -267,6 +267,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
+		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
 		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
 		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
@@ -318,8 +319,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_groups":                            &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
 		"ami_product_codes":                     &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                           &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
+		"skip_region_validation":                &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"tags":                                  &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"ena_support":                           &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                         &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":                      &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
@@ -329,14 +331,14 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":                    &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
 		"skip_save_build_region":                &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
 		"snapshot_tags":                         &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                          &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                          &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"snapshot_users":                        &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":                       &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"ami_block_device_mappings":             &hcldec.BlockListSpec{TypeName: "ami_block_device_mappings", Nested: hcldec.ObjectSpec((*common.FlatBlockDevice)(nil).HCL2Spec())},
 		"launch_block_device_mappings":          &hcldec.BlockListSpec{TypeName: "launch_block_device_mappings", Nested: hcldec.ObjectSpec((*FlatBlockDevice)(nil).HCL2Spec())},
 		"ami_root_device":                       &hcldec.BlockSpec{TypeName: "ami_root_device", Nested: hcldec.ObjectSpec((*FlatRootBlockDevice)(nil).HCL2Spec())},
 		"run_volume_tags":                       &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false},
-		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"ami_architecture":                      &hcldec.AttrSpec{Name: "ami_architecture", Type: cty.String, Required: false},
 	}
 	return s
diff --git a/builder/amazon/ebssurrogate/root_block_device.go b/builder/amazon/ebssurrogate/root_block_device.go
index 146803a09..2a52b37ba 100644
--- a/builder/amazon/ebssurrogate/root_block_device.go
+++ b/builder/amazon/ebssurrogate/root_block_device.go
@@ -5,7 +5,7 @@ package ebssurrogate
 import (
 	"errors"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type RootBlockDevice struct {
diff --git a/builder/amazon/ebssurrogate/step_register_ami.go b/builder/amazon/ebssurrogate/step_register_ami.go
index 7d6f05fbf..66865250f 100644
--- a/builder/amazon/ebssurrogate/step_register_ami.go
+++ b/builder/amazon/ebssurrogate/step_register_ami.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 // StepRegisterAMI creates the AMI.
diff --git a/builder/amazon/ebssurrogate/step_snapshot_volumes.go b/builder/amazon/ebssurrogate/step_snapshot_volumes.go
index 543b9edb5..3888fddce 100644
--- a/builder/amazon/ebssurrogate/step_snapshot_volumes.go
+++ b/builder/amazon/ebssurrogate/step_snapshot_volumes.go
@@ -10,9 +10,9 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	multierror "github.com/hashicorp/go-multierror"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // StepSnapshotVolumes creates snapshots of the created volumes.
diff --git a/builder/amazon/ebsvolume/block_device.go b/builder/amazon/ebsvolume/block_device.go
index 2d7166373..111be84bb 100644
--- a/builder/amazon/ebsvolume/block_device.go
+++ b/builder/amazon/ebsvolume/block_device.go
@@ -5,8 +5,8 @@ package ebsvolume
 import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type BlockDevice struct {
@@ -19,7 +19,7 @@ type BlockDevice struct {
 	// containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	Tag hcl2template.KeyValues `mapstructure:"tag" required:"false"`
+	Tag config.KeyValues `mapstructure:"tag" required:"false"`
 }
 
 type BlockDevices []BlockDevice
diff --git a/builder/amazon/ebsvolume/builder.go b/builder/amazon/ebsvolume/builder.go
index d3fb1a03f..d5d5bddb1 100644
--- a/builder/amazon/ebsvolume/builder.go
+++ b/builder/amazon/ebsvolume/builder.go
@@ -12,15 +12,15 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "mitchellh.amazon.ebsvolume"
@@ -72,7 +72,7 @@ type Config struct {
 	// the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	VolumeRunTag hcl2template.KeyValues `mapstructure:"run_volume_tag"`
+	VolumeRunTag config.KeyValues `mapstructure:"run_volume_tag"`
 
 	launchBlockDevices BlockDevices
 
@@ -103,6 +103,18 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 		PluginType:         BuilderId,
 		Interpolate:        true,
 		InterpolateContext: &b.config.ctx,
+		InterpolateFilter: &interpolate.RenderFilter{
+			Exclude: []string{
+				"run_tags",
+				"run_tag",
+				"run_volume_tags",
+				"run_volume_tag",
+				"spot_tags",
+				"spot_tag",
+				"tags",
+				"tag",
+			},
+		},
 	}, raws...)
 	if err != nil {
 		return nil, nil, err
@@ -168,7 +180,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("iam", iam)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
@@ -185,6 +197,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ExpectedRootDevice:                "ebs",
 			InstanceInitiatedShutdownBehavior: b.config.InstanceInitiatedShutdownBehavior,
 			InstanceType:                      b.config.InstanceType,
+			Region:                            *ec2conn.Config.Region,
 			SourceAMI:                         b.config.SourceAmi,
 			SpotInstanceTypes:                 b.config.SpotInstanceTypes,
 			SpotPrice:                         b.config.SpotPrice,
@@ -286,8 +299,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&awscommon.StepSetGeneratedData{
 			GeneratedData: generatedData,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&awscommon.StepStopEBSBackedInstance{
@@ -302,7 +315,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/amazon/ebsvolume/builder.hcl2spec.go b/builder/amazon/ebsvolume/builder.hcl2spec.go
index 2d821e8a2..156f21aaa 100644
--- a/builder/amazon/ebsvolume/builder.hcl2spec.go
+++ b/builder/amazon/ebsvolume/builder.hcl2spec.go
@@ -4,25 +4,25 @@ package ebsvolume
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatBlockDevice is an auto-generated flat version of BlockDevice.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatBlockDevice struct {
-	DeleteOnTermination *bool                       `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination" hcl:"delete_on_termination"`
-	DeviceName          *string                     `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"`
-	Encrypted           *bool                       `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"`
-	IOPS                *int64                      `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"`
-	NoDevice            *bool                       `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"`
-	SnapshotId          *string                     `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"`
-	VirtualName         *string                     `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"`
-	VolumeType          *string                     `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"`
-	VolumeSize          *int64                      `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"`
-	KmsKeyId            *string                     `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
-	Tags                map[string]string           `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	Tag                 []hcl2template.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	DeleteOnTermination *bool                 `mapstructure:"delete_on_termination" required:"false" cty:"delete_on_termination" hcl:"delete_on_termination"`
+	DeviceName          *string               `mapstructure:"device_name" required:"false" cty:"device_name" hcl:"device_name"`
+	Encrypted           *bool                 `mapstructure:"encrypted" required:"false" cty:"encrypted" hcl:"encrypted"`
+	IOPS                *int64                `mapstructure:"iops" required:"false" cty:"iops" hcl:"iops"`
+	NoDevice            *bool                 `mapstructure:"no_device" required:"false" cty:"no_device" hcl:"no_device"`
+	SnapshotId          *string               `mapstructure:"snapshot_id" required:"false" cty:"snapshot_id" hcl:"snapshot_id"`
+	VirtualName         *string               `mapstructure:"virtual_name" required:"false" cty:"virtual_name" hcl:"virtual_name"`
+	VolumeType          *string               `mapstructure:"volume_type" required:"false" cty:"volume_type" hcl:"volume_type"`
+	VolumeSize          *int64                `mapstructure:"volume_size" required:"false" cty:"volume_size" hcl:"volume_size"`
+	KmsKeyId            *string               `mapstructure:"kms_key_id" required:"false" cty:"kms_key_id" hcl:"kms_key_id"`
+	Tags                map[string]string     `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
+	Tag                 []config.FlatKeyValue `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
 }
 
 // FlatMapstructure returns a new FlatBlockDevice.
@@ -48,7 +48,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 		"volume_size":           &hcldec.AttrSpec{Name: "volume_size", Type: cty.Number, Required: false},
 		"kms_key_id":            &hcldec.AttrSpec{Name: "kms_key_id", Type: cty.String, Required: false},
 		"tags":                  &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                   &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -58,6 +58,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 type FlatConfig struct {
 	PackerBuildName                           *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                         *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -74,7 +75,6 @@ type FlatConfig struct {
 	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
 	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
 	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
 	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
 	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
@@ -93,7 +93,7 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
+	RunTag                                    []config.FlatKeyValue                  `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
@@ -102,11 +102,10 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
+	SpotTag                                   []config.FlatKeyValue                  `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
 	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
 	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
 	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
@@ -120,6 +119,7 @@ type FlatConfig struct {
 	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
 	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
 	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName                   *string                                `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
 	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
 	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
@@ -168,7 +168,7 @@ type FlatConfig struct {
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
 	VolumeMappings                            []FlatBlockDevice                      `mapstructure:"ebs_volumes" required:"false" cty:"ebs_volumes" hcl:"ebs_volumes"`
 	VolumeRunTags                             map[string]string                      `mapstructure:"run_volume_tags" cty:"run_volume_tags" hcl:"run_volume_tags"`
-	VolumeRunTag                              []hcl2template.FlatKeyValue            `mapstructure:"run_volume_tag" cty:"run_volume_tag" hcl:"run_volume_tag"`
+	VolumeRunTag                              []config.FlatKeyValue                  `mapstructure:"run_volume_tag" cty:"run_volume_tag" hcl:"run_volume_tag"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -185,6 +185,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -201,7 +202,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"profile":                       &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
 		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
-		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
 		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
@@ -220,7 +220,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
 		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -229,11 +229,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
 		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
-		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
 		"user_data_file":                        &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false},
@@ -247,6 +246,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
+		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
 		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
 		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
@@ -295,7 +295,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"sriov_support":                         &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"ebs_volumes":                           &hcldec.BlockListSpec{TypeName: "ebs_volumes", Nested: hcldec.ObjectSpec((*FlatBlockDevice)(nil).HCL2Spec())},
 		"run_volume_tags":                       &hcldec.AttrSpec{Name: "run_volume_tags", Type: cty.Map(cty.String), Required: false},
-		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"run_volume_tag":                        &hcldec.BlockListSpec{TypeName: "run_volume_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 	}
 	return s
 }
diff --git a/builder/amazon/ebsvolume/builder_test.go b/builder/amazon/ebsvolume/builder_test.go
index 7b8d20438..7b3865390 100644
--- a/builder/amazon/ebsvolume/builder_test.go
+++ b/builder/amazon/ebsvolume/builder_test.go
@@ -61,7 +61,6 @@ func TestBuilderPrepare_InvalidShutdownBehavior(t *testing.T) {
 
 	// Test good
 	config["shutdown_behavior"] = "terminate"
-	config["skip_region_validation"] = true
 	_, warnings, err := b.Prepare(config)
 	if len(warnings) > 0 {
 		t.Fatalf("bad: %#v", warnings)
diff --git a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
index 5d8bea217..911b2c138 100644
--- a/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
+++ b/builder/amazon/ebsvolume/step_tag_ebs_volumes.go
@@ -8,9 +8,9 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type stepTagEBSVolumes struct {
diff --git a/examples/amazon/apache_server/README.Md b/builder/amazon/examples/apache_server/README.Md
similarity index 100%
rename from examples/amazon/apache_server/README.Md
rename to builder/amazon/examples/apache_server/README.Md
diff --git a/examples/amazon/apache_server/apache.json b/builder/amazon/examples/apache_server/apache.json
similarity index 95%
rename from examples/amazon/apache_server/apache.json
rename to builder/amazon/examples/apache_server/apache.json
index 331f21138..ddba2e18e 100644
--- a/examples/amazon/apache_server/apache.json
+++ b/builder/amazon/examples/apache_server/apache.json
@@ -1,7 +1,4 @@
-
-
-
-{   
+{
     "variables":
         {
             "accesskey": "",
@@ -22,13 +19,13 @@
               "OS_Version": "Ubuntu",
               "Release": "Latest"
             }
-        }   
+        }
     ],
    "provisioners":[
        {
        "type": "shell",
        "script": "{{user `shellpath`}}"
-       }  
+       }
     ]
 
 }
diff --git a/examples/amazon/apache_server/packages.sh b/builder/amazon/examples/apache_server/packages.sh
similarity index 100%
rename from examples/amazon/apache_server/packages.sh
rename to builder/amazon/examples/apache_server/packages.sh
diff --git a/examples/amazon/nginx_server/README.Md b/builder/amazon/examples/nginx_server/README.Md
similarity index 100%
rename from examples/amazon/nginx_server/README.Md
rename to builder/amazon/examples/nginx_server/README.Md
diff --git a/examples/amazon/nginx_server/nginx.json b/builder/amazon/examples/nginx_server/nginx.json
similarity index 100%
rename from examples/amazon/nginx_server/nginx.json
rename to builder/amazon/examples/nginx_server/nginx.json
diff --git a/examples/amazon/nginx_server/packages.sh b/builder/amazon/examples/nginx_server/packages.sh
similarity index 100%
rename from examples/amazon/nginx_server/packages.sh
rename to builder/amazon/examples/nginx_server/packages.sh
diff --git a/builder/amazon/instance/builder.go b/builder/amazon/instance/builder.go
index 7c050b88e..6a706b0ae 100644
--- a/builder/amazon/instance/builder.go
+++ b/builder/amazon/instance/builder.go
@@ -15,14 +15,15 @@ import (
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/iam"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -250,7 +251,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("awsSession", session)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	var instanceStep multistep.Step
 
@@ -265,6 +266,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Debug:                    b.config.PackerDebug,
 			EbsOptimized:             b.config.EbsOptimized,
 			InstanceType:             b.config.InstanceType,
+			Region:                   *ec2conn.Config.Region,
 			SourceAMI:                b.config.SourceAmi,
 			SpotPrice:                b.config.SpotPrice,
 			SpotInstanceTypes:        b.config.SpotInstanceTypes,
@@ -368,8 +370,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&awscommon.StepSetGeneratedData{
 			GeneratedData: generatedData,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&StepUploadX509Cert{},
@@ -419,7 +421,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/amazon/instance/builder.hcl2spec.go b/builder/amazon/instance/builder.hcl2spec.go
index 26ea13940..0f146f05a 100644
--- a/builder/amazon/instance/builder.hcl2spec.go
+++ b/builder/amazon/instance/builder.hcl2spec.go
@@ -4,7 +4,7 @@ package instance
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -13,6 +13,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                           *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                         *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                         *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                               *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                               *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                             *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -29,7 +30,6 @@ type FlatConfig struct {
 	ProfileName                               *string                                `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
 	RawRegion                                 *string                                `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
 	SecretKey                                 *string                                `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation                            *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	SkipMetadataApiCheck                      *bool                                  `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
 	SkipCredsValidation                       *bool                                  `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
 	Token                                     *string                                `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
@@ -42,8 +42,9 @@ type FlatConfig struct {
 	AMIGroups                                 []string                               `mapstructure:"ami_groups" required:"false" cty:"ami_groups" hcl:"ami_groups"`
 	AMIProductCodes                           []string                               `mapstructure:"ami_product_codes" required:"false" cty:"ami_product_codes" hcl:"ami_product_codes"`
 	AMIRegions                                []string                               `mapstructure:"ami_regions" required:"false" cty:"ami_regions" hcl:"ami_regions"`
+	AMISkipRegionValidation                   *bool                                  `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	AMITags                                   map[string]string                      `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AMITag                                    []hcl2template.FlatKeyValue            `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	AMITag                                    []config.FlatKeyValue                  `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
 	AMIENASupport                             *bool                                  `mapstructure:"ena_support" required:"false" cty:"ena_support" hcl:"ena_support"`
 	AMISriovNetSupport                        *bool                                  `mapstructure:"sriov_support" required:"false" cty:"sriov_support" hcl:"sriov_support"`
 	AMIForceDeregister                        *bool                                  `mapstructure:"force_deregister" required:"false" cty:"force_deregister" hcl:"force_deregister"`
@@ -53,7 +54,7 @@ type FlatConfig struct {
 	AMIRegionKMSKeyIDs                        map[string]string                      `mapstructure:"region_kms_key_ids" required:"false" cty:"region_kms_key_ids" hcl:"region_kms_key_ids"`
 	AMISkipBuildRegion                        *bool                                  `mapstructure:"skip_save_build_region" cty:"skip_save_build_region" hcl:"skip_save_build_region"`
 	SnapshotTags                              map[string]string                      `mapstructure:"snapshot_tags" required:"false" cty:"snapshot_tags" hcl:"snapshot_tags"`
-	SnapshotTag                               []hcl2template.FlatKeyValue            `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
+	SnapshotTag                               []config.FlatKeyValue                  `mapstructure:"snapshot_tag" required:"false" cty:"snapshot_tag" hcl:"snapshot_tag"`
 	SnapshotUsers                             []string                               `mapstructure:"snapshot_users" required:"false" cty:"snapshot_users" hcl:"snapshot_users"`
 	SnapshotGroups                            []string                               `mapstructure:"snapshot_groups" required:"false" cty:"snapshot_groups" hcl:"snapshot_groups"`
 	AssociatePublicIpAddress                  *bool                                  `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
@@ -69,7 +70,7 @@ type FlatConfig struct {
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter" hcl:"security_group_filter"`
 	RunTags                                   map[string]string                      `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                                    []hcl2template.FlatKeyValue            `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
+	RunTag                                    []config.FlatKeyValue                  `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
 	SecurityGroupId                           *string                                `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
 	SecurityGroupIds                          []string                               `mapstructure:"security_group_ids" required:"false" cty:"security_group_ids" hcl:"security_group_ids"`
 	SourceAmi                                 *string                                `mapstructure:"source_ami" required:"true" cty:"source_ami" hcl:"source_ami"`
@@ -78,11 +79,10 @@ type FlatConfig struct {
 	SpotPrice                                 *string                                `mapstructure:"spot_price" required:"false" cty:"spot_price" hcl:"spot_price"`
 	SpotPriceAutoProduct                      *string                                `mapstructure:"spot_price_auto_product" required:"false" undocumented:"true" cty:"spot_price_auto_product" hcl:"spot_price_auto_product"`
 	SpotTags                                  map[string]string                      `mapstructure:"spot_tags" required:"false" cty:"spot_tags" hcl:"spot_tags"`
-	SpotTag                                   []hcl2template.FlatKeyValue            `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
+	SpotTag                                   []config.FlatKeyValue                  `mapstructure:"spot_tag" required:"false" cty:"spot_tag" hcl:"spot_tag"`
 	SubnetFilter                              *common.FlatSubnetFilterOptions        `mapstructure:"subnet_filter" required:"false" cty:"subnet_filter" hcl:"subnet_filter"`
 	SubnetId                                  *string                                `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
 	Tenancy                                   *string                                `mapstructure:"tenancy" required:"false" cty:"tenancy" hcl:"tenancy"`
-	TemporaryKeyPairName                      *string                                `mapstructure:"temporary_key_pair_name" required:"false" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	TemporarySGSourceCidrs                    []string                               `mapstructure:"temporary_security_group_source_cidrs" required:"false" cty:"temporary_security_group_source_cidrs" hcl:"temporary_security_group_source_cidrs"`
 	UserData                                  *string                                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
 	UserDataFile                              *string                                `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
@@ -96,6 +96,7 @@ type FlatConfig struct {
 	SSHUsername                               *string                                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
 	SSHPassword                               *string                                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
 	SSHKeyPairName                            *string                                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName                   *string                                `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
 	SSHTemporaryKeyPairType                   *string                                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
 	SSHTemporaryKeyPairBits                   *int                                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
 	SSHCiphers                                []string                               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
@@ -167,6 +168,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -183,7 +185,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"profile":                       &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
 		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
-		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
 		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
@@ -196,8 +197,9 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ami_groups":                    &hcldec.AttrSpec{Name: "ami_groups", Type: cty.List(cty.String), Required: false},
 		"ami_product_codes":             &hcldec.AttrSpec{Name: "ami_product_codes", Type: cty.List(cty.String), Required: false},
 		"ami_regions":                   &hcldec.AttrSpec{Name: "ami_regions", Type: cty.List(cty.String), Required: false},
+		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"tags":                          &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                           &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"ena_support":                   &hcldec.AttrSpec{Name: "ena_support", Type: cty.Bool, Required: false},
 		"sriov_support":                 &hcldec.AttrSpec{Name: "sriov_support", Type: cty.Bool, Required: false},
 		"force_deregister":              &hcldec.AttrSpec{Name: "force_deregister", Type: cty.Bool, Required: false},
@@ -207,7 +209,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"region_kms_key_ids":            &hcldec.AttrSpec{Name: "region_kms_key_ids", Type: cty.Map(cty.String), Required: false},
 		"skip_save_build_region":        &hcldec.AttrSpec{Name: "skip_save_build_region", Type: cty.Bool, Required: false},
 		"snapshot_tags":                 &hcldec.AttrSpec{Name: "snapshot_tags", Type: cty.Map(cty.String), Required: false},
-		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"snapshot_tag":                  &hcldec.BlockListSpec{TypeName: "snapshot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"snapshot_users":                &hcldec.AttrSpec{Name: "snapshot_users", Type: cty.List(cty.String), Required: false},
 		"snapshot_groups":               &hcldec.AttrSpec{Name: "snapshot_groups", Type: cty.List(cty.String), Required: false},
 		"associate_public_ip_address":   &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
@@ -223,7 +225,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},
 		"run_tags":                              &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                               &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"security_group_id":                     &hcldec.AttrSpec{Name: "security_group_id", Type: cty.String, Required: false},
 		"security_group_ids":                    &hcldec.AttrSpec{Name: "security_group_ids", Type: cty.List(cty.String), Required: false},
 		"source_ami":                            &hcldec.AttrSpec{Name: "source_ami", Type: cty.String, Required: false},
@@ -232,11 +234,10 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"spot_price":                            &hcldec.AttrSpec{Name: "spot_price", Type: cty.String, Required: false},
 		"spot_price_auto_product":               &hcldec.AttrSpec{Name: "spot_price_auto_product", Type: cty.String, Required: false},
 		"spot_tags":                             &hcldec.AttrSpec{Name: "spot_tags", Type: cty.Map(cty.String), Required: false},
-		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"spot_tag":                              &hcldec.BlockListSpec{TypeName: "spot_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"subnet_filter":                         &hcldec.BlockSpec{TypeName: "subnet_filter", Nested: hcldec.ObjectSpec((*common.FlatSubnetFilterOptions)(nil).HCL2Spec())},
 		"subnet_id":                             &hcldec.AttrSpec{Name: "subnet_id", Type: cty.String, Required: false},
 		"tenancy":                               &hcldec.AttrSpec{Name: "tenancy", Type: cty.String, Required: false},
-		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_security_group_source_cidrs": &hcldec.AttrSpec{Name: "temporary_security_group_source_cidrs", Type: cty.List(cty.String), Required: false},
 		"user_data":                             &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
 		"user_data_file":                        &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false},
@@ -250,6 +251,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ssh_username":                          &hcldec.AttrSpec{Name: "ssh_username", Type: cty.String, Required: false},
 		"ssh_password":                          &hcldec.AttrSpec{Name: "ssh_password", Type: cty.String, Required: false},
 		"ssh_keypair_name":                      &hcldec.AttrSpec{Name: "ssh_keypair_name", Type: cty.String, Required: false},
+		"temporary_key_pair_name":               &hcldec.AttrSpec{Name: "temporary_key_pair_name", Type: cty.String, Required: false},
 		"temporary_key_pair_type":               &hcldec.AttrSpec{Name: "temporary_key_pair_type", Type: cty.String, Required: false},
 		"temporary_key_pair_bits":               &hcldec.AttrSpec{Name: "temporary_key_pair_bits", Type: cty.Number, Required: false},
 		"ssh_ciphers":                           &hcldec.AttrSpec{Name: "ssh_ciphers", Type: cty.List(cty.String), Required: false},
diff --git a/builder/amazon/instance/step_bundle_volume.go b/builder/amazon/instance/step_bundle_volume.go
index fe8f291ab..6bcee9b43 100644
--- a/builder/amazon/instance/step_bundle_volume.go
+++ b/builder/amazon/instance/step_bundle_volume.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type bundleCmdData struct {
diff --git a/builder/amazon/instance/step_register_ami.go b/builder/amazon/instance/step_register_ami.go
index 3aba13dc2..10992c1cc 100644
--- a/builder/amazon/instance/step_register_ami.go
+++ b/builder/amazon/instance/step_register_ami.go
@@ -7,10 +7,10 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common/random"
-	confighelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type StepRegisterAMI struct {
diff --git a/builder/amazon/instance/step_upload_bundle.go b/builder/amazon/instance/step_upload_bundle.go
index b19a1a3d7..8ff2d18c4 100644
--- a/builder/amazon/instance/step_upload_bundle.go
+++ b/builder/amazon/instance/step_upload_bundle.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type uploadCmdData struct {
diff --git a/builder/amazon/instance/step_upload_x509_cert.go b/builder/amazon/instance/step_upload_x509_cert.go
index 9295d50df..37cf4ae6a 100644
--- a/builder/amazon/instance/step_upload_x509_cert.go
+++ b/builder/amazon/instance/step_upload_x509_cert.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUploadX509Cert struct{}
diff --git a/builder/amazon/version/version.go b/builder/amazon/version/version.go
new file mode 100644
index 000000000..d5ab83e6a
--- /dev/null
+++ b/builder/amazon/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AWSPluginVersion *version.PluginVersion
+
+func init() {
+	AWSPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/azure/arm/azure_client.go b/builder/azure/arm/azure_client.go
index 22e61f11e..87b07139c 100644
--- a/builder/azure/arm/azure_client.go
+++ b/builder/azure/arm/azure_client.go
@@ -22,7 +22,8 @@ import (
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/hashicorp/packer/builder/azure/common"
-	"github.com/hashicorp/packer/helper/useragent"
+	"github.com/hashicorp/packer/builder/azure/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
 )
 
 const (
@@ -140,97 +141,97 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.DeploymentsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DeploymentsClient.RequestInspector = withInspection(maxlen)
 	azureClient.DeploymentsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.DeploymentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DeploymentsClient.UserAgent)
+	azureClient.DeploymentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DeploymentsClient.UserAgent)
 	azureClient.DeploymentsClient.Client.PollingDuration = pollingDuration
 
 	azureClient.DeploymentOperationsClient = resources.NewDeploymentOperationsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DeploymentOperationsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DeploymentOperationsClient.RequestInspector = withInspection(maxlen)
 	azureClient.DeploymentOperationsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.DeploymentOperationsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DeploymentOperationsClient.UserAgent)
+	azureClient.DeploymentOperationsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DeploymentOperationsClient.UserAgent)
 	azureClient.DeploymentOperationsClient.Client.PollingDuration = pollingDuration
 
 	azureClient.DisksClient = compute.NewDisksClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DisksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DisksClient.RequestInspector = withInspection(maxlen)
 	azureClient.DisksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.DisksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DisksClient.UserAgent)
+	azureClient.DisksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DisksClient.UserAgent)
 	azureClient.DisksClient.Client.PollingDuration = pollingDuration
 
 	azureClient.GroupsClient = resources.NewGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GroupsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GroupsClient.RequestInspector = withInspection(maxlen)
 	azureClient.GroupsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.GroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GroupsClient.UserAgent)
+	azureClient.GroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GroupsClient.UserAgent)
 	azureClient.GroupsClient.Client.PollingDuration = pollingDuration
 
 	azureClient.ImagesClient = compute.NewImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.ImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.ImagesClient.RequestInspector = withInspection(maxlen)
 	azureClient.ImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.ImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.ImagesClient.UserAgent)
+	azureClient.ImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.ImagesClient.UserAgent)
 	azureClient.ImagesClient.Client.PollingDuration = pollingDuration
 
 	azureClient.InterfacesClient = network.NewInterfacesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.InterfacesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.InterfacesClient.RequestInspector = withInspection(maxlen)
 	azureClient.InterfacesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.InterfacesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.InterfacesClient.UserAgent)
+	azureClient.InterfacesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.InterfacesClient.UserAgent)
 	azureClient.InterfacesClient.Client.PollingDuration = pollingDuration
 
 	azureClient.SubnetsClient = network.NewSubnetsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.SubnetsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.SubnetsClient.RequestInspector = withInspection(maxlen)
 	azureClient.SubnetsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.SubnetsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SubnetsClient.UserAgent)
+	azureClient.SubnetsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.SubnetsClient.UserAgent)
 	azureClient.SubnetsClient.Client.PollingDuration = pollingDuration
 
 	azureClient.VirtualNetworksClient = network.NewVirtualNetworksClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.VirtualNetworksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.VirtualNetworksClient.RequestInspector = withInspection(maxlen)
 	azureClient.VirtualNetworksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.VirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VirtualNetworksClient.UserAgent)
+	azureClient.VirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VirtualNetworksClient.UserAgent)
 	azureClient.VirtualNetworksClient.Client.PollingDuration = pollingDuration
 
 	azureClient.SecurityGroupsClient = network.NewSecurityGroupsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.SecurityGroupsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.SecurityGroupsClient.RequestInspector = withInspection(maxlen)
 	azureClient.SecurityGroupsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.SecurityGroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SecurityGroupsClient.UserAgent)
+	azureClient.SecurityGroupsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.SecurityGroupsClient.UserAgent)
 
 	azureClient.PublicIPAddressesClient = network.NewPublicIPAddressesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.PublicIPAddressesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.PublicIPAddressesClient.RequestInspector = withInspection(maxlen)
 	azureClient.PublicIPAddressesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.PublicIPAddressesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.PublicIPAddressesClient.UserAgent)
+	azureClient.PublicIPAddressesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.PublicIPAddressesClient.UserAgent)
 	azureClient.PublicIPAddressesClient.Client.PollingDuration = pollingDuration
 
 	azureClient.VirtualMachinesClient = compute.NewVirtualMachinesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.VirtualMachinesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.VirtualMachinesClient.RequestInspector = withInspection(maxlen)
 	azureClient.VirtualMachinesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
-	azureClient.VirtualMachinesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VirtualMachinesClient.UserAgent)
+	azureClient.VirtualMachinesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VirtualMachinesClient.UserAgent)
 	azureClient.VirtualMachinesClient.Client.PollingDuration = pollingDuration
 
 	azureClient.SnapshotsClient = compute.NewSnapshotsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.SnapshotsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.SnapshotsClient.RequestInspector = withInspection(maxlen)
 	azureClient.SnapshotsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.SnapshotsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.SnapshotsClient.UserAgent)
+	azureClient.SnapshotsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.SnapshotsClient.UserAgent)
 	azureClient.SnapshotsClient.Client.PollingDuration = pollingDuration
 
 	azureClient.AccountsClient = armStorage.NewAccountsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.AccountsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.AccountsClient.RequestInspector = withInspection(maxlen)
 	azureClient.AccountsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.AccountsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.AccountsClient.UserAgent)
+	azureClient.AccountsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.AccountsClient.UserAgent)
 	azureClient.AccountsClient.Client.PollingDuration = pollingDuration
 
 	azureClient.GalleryImageVersionsClient = newCompute.NewGalleryImageVersionsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GalleryImageVersionsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GalleryImageVersionsClient.RequestInspector = withInspection(maxlen)
 	azureClient.GalleryImageVersionsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImageVersionsClient.UserAgent)
+	azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImageVersionsClient.UserAgent)
 	azureClient.GalleryImageVersionsClient.Client.PollingDuration = sharedGalleryTimeout
 	azureClient.GalleryImageVersionsClient.SubscriptionID = sigSubscriptionID
 
@@ -238,7 +239,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.GalleryImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GalleryImagesClient.RequestInspector = withInspection(maxlen)
 	azureClient.GalleryImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImagesClient.UserAgent)
+	azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImagesClient.UserAgent)
 	azureClient.GalleryImagesClient.Client.PollingDuration = pollingDuration
 	azureClient.GalleryImagesClient.SubscriptionID = sigSubscriptionID
 
@@ -251,7 +252,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.VaultClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalTokenVault)
 	azureClient.VaultClient.RequestInspector = withInspection(maxlen)
 	azureClient.VaultClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.VaultClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClient.UserAgent)
+	azureClient.VaultClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VaultClient.UserAgent)
 	azureClient.VaultClient.Client.PollingDuration = pollingDuration
 
 	// This client is different than the above because it manages the vault
@@ -260,7 +261,7 @@ func NewAzureClient(subscriptionID, sigSubscriptionID, resourceGroupName, storag
 	azureClient.VaultClientDelete.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.VaultClientDelete.RequestInspector = withInspection(maxlen)
 	azureClient.VaultClientDelete.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.VaultClientDelete.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.VaultClientDelete.UserAgent)
+	azureClient.VaultClientDelete.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.VaultClientDelete.UserAgent)
 	azureClient.VaultClientDelete.Client.PollingDuration = pollingDuration
 
 	// If this is a managed disk build, this should be ignored.
diff --git a/builder/azure/arm/azure_error_response_test.go b/builder/azure/arm/azure_error_response_test.go
index d27c2192a..130353c8b 100644
--- a/builder/azure/arm/azure_error_response_test.go
+++ b/builder/azure/arm/azure_error_response_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	approvaltests "github.com/approvals/go-approval-tests"
-	"github.com/hashicorp/packer/common/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 )
 
 const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found."}}`
diff --git a/builder/azure/arm/builder.go b/builder/azure/arm/builder.go
index 90bbcc413..bee0539a1 100644
--- a/builder/azure/arm/builder.go
+++ b/builder/azure/arm/builder.go
@@ -18,10 +18,10 @@ import (
 	packerAzureCommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/common/lin"
-	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type Builder struct {
@@ -211,8 +211,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				Host:      lin.SSHHost,
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&packerCommon.StepProvision{},
-			&packerCommon.StepCleanupTempKeys{
+			&commonsteps.StepProvision{},
+			&commonsteps.StepCleanupTempKeys{
 				Comm: &b.config.Comm,
 			},
 			NewStepGetOSDisk(azureClient, ui),
@@ -254,7 +254,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 					}, nil
 				},
 			},
-			&packerCommon.StepProvision{},
+			&commonsteps.StepProvision{},
 			NewStepGetOSDisk(azureClient, ui),
 			NewStepGetAdditionalDisks(azureClient, ui),
 			NewStepPowerOffCompute(azureClient, ui),
@@ -279,7 +279,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	}
 
-	b.runner = packerCommon.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, b.stateBag)
 
 	// Report any errors.
diff --git a/builder/azure/arm/builder_acc_test.go b/builder/azure/arm/builder_acc_test.go
index 1837bf5b0..42e518cf4 100644
--- a/builder/azure/arm/builder_acc_test.go
+++ b/builder/azure/arm/builder_acc_test.go
@@ -90,6 +90,19 @@ func TestBuilderAcc_ManagedDisk_Linux_DeviceLogin(t *testing.T) {
 	})
 }
 
+func TestBuilderAcc_ManagedDisk_Linux_AzureCLI(t *testing.T) {
+	if os.Getenv("AZURE_CLI_AUTH") == "" {
+		t.Skip("Azure CLI Acceptance tests skipped unless env 'AZURE_CLI_AUTH' is set, and an active `az login` session has been established")
+		return
+	}
+
+	builderT.Test(t, builderT.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Builder:  &Builder{},
+		Template: testBuilderAccManagedDiskLinuxAzureCLI,
+	})
+}
+
 func TestBuilderAcc_Blob_Windows(t *testing.T) {
 	builderT.Test(t, builderT.TestCase{
 		PreCheck: func() { testAccPreCheck(t) },
@@ -366,3 +379,27 @@ const testBuilderAccBlobLinux = `
 	}]
 }
 `
+const testBuilderAccManagedDiskLinuxAzureCLI = `
+{
+	"builders": [{
+	  "type": "test",
+
+	  "use_azure_cli_auth": true,
+
+	  "managed_image_resource_group_name": "packer-acceptance-test",
+	  "managed_image_name": "testBuilderAccManagedDiskLinuxAzureCLI-{{timestamp}}",
+
+	  "os_type": "Linux",
+	  "image_publisher": "Canonical",
+	  "image_offer": "UbuntuServer",
+	  "image_sku": "16.04-LTS",
+
+	  "location": "South Central US",
+	  "vm_size": "Standard_DS2_v2",
+	  "azure_tags": {
+	    "env": "testing",
+	    "builder": "packer"
+	   }
+	}]
+}
+`
diff --git a/builder/azure/arm/config.go b/builder/azure/arm/config.go
index 799ae51f2..9ec804fd8 100644
--- a/builder/azure/arm/config.go
+++ b/builder/azure/arm/config.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
@@ -28,12 +28,11 @@ import (
 	"github.com/hashicorp/packer/builder/azure/common/client"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/pkcs12"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 	"golang.org/x/crypto/ssh"
 )
@@ -293,7 +292,7 @@ type Config struct {
 	// containing a `name` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	AzureTag hcl2template.NameValues `mapstructure:"azure_tag" required:"false"`
+	AzureTag config.NameValues `mapstructure:"azure_tag" required:"false"`
 	// Resource group under which the final artifact will be stored.
 	ResourceGroupName string `mapstructure:"resource_group_name"`
 	// Storage account under which the final artifact will be stored.
diff --git a/builder/azure/arm/config.hcl2spec.go b/builder/azure/arm/config.hcl2spec.go
index 8c7241f3f..29d725f7d 100644
--- a/builder/azure/arm/config.hcl2spec.go
+++ b/builder/azure/arm/config.hcl2spec.go
@@ -3,7 +3,7 @@ package arm
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                            *string                            `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                          *string                            `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                          *string                            `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                                *bool                              `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                                *bool                              `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                              *string                            `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -25,6 +26,7 @@ type FlatConfig struct {
 	ObjectID                                   *string                            `mapstructure:"object_id" cty:"object_id" hcl:"object_id"`
 	TenantID                                   *string                            `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"`
 	SubscriptionID                             *string                            `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"`
+	UseAzureCLIAuth                            *bool                              `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"`
 	UserAssignedManagedIdentities              []string                           `mapstructure:"user_assigned_managed_identities" required:"false" cty:"user_assigned_managed_identities" hcl:"user_assigned_managed_identities"`
 	CaptureNamePrefix                          *string                            `mapstructure:"capture_name_prefix" cty:"capture_name_prefix" hcl:"capture_name_prefix"`
 	CaptureContainerName                       *string                            `mapstructure:"capture_container_name" cty:"capture_container_name" hcl:"capture_container_name"`
@@ -50,7 +52,7 @@ type FlatConfig struct {
 	ManagedImageDataDiskSnapshotPrefix         *string                            `mapstructure:"managed_image_data_disk_snapshot_prefix" required:"false" cty:"managed_image_data_disk_snapshot_prefix" hcl:"managed_image_data_disk_snapshot_prefix"`
 	ManagedImageZoneResilient                  *bool                              `mapstructure:"managed_image_zone_resilient" required:"false" cty:"managed_image_zone_resilient" hcl:"managed_image_zone_resilient"`
 	AzureTags                                  map[string]string                  `mapstructure:"azure_tags" required:"false" cty:"azure_tags" hcl:"azure_tags"`
-	AzureTag                                   []hcl2template.FlatNameValue       `mapstructure:"azure_tag" required:"false" cty:"azure_tag" hcl:"azure_tag"`
+	AzureTag                                   []config.FlatNameValue             `mapstructure:"azure_tag" required:"false" cty:"azure_tag" hcl:"azure_tag"`
 	ResourceGroupName                          *string                            `mapstructure:"resource_group_name" cty:"resource_group_name" hcl:"resource_group_name"`
 	StorageAccount                             *string                            `mapstructure:"storage_account" cty:"storage_account" hcl:"storage_account"`
 	TempComputeName                            *string                            `mapstructure:"temp_compute_name" required:"false" cty:"temp_compute_name" hcl:"temp_compute_name"`
@@ -138,6 +140,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                                &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":                              &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":                              &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                                     &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                                     &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                                  &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -151,6 +154,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"object_id":                                        &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false},
 		"tenant_id":                                        &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false},
 		"subscription_id":                                  &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false},
+		"use_azure_cli_auth":                               &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false},
 		"user_assigned_managed_identities":                 &hcldec.AttrSpec{Name: "user_assigned_managed_identities", Type: cty.List(cty.String), Required: false},
 		"capture_name_prefix":                              &hcldec.AttrSpec{Name: "capture_name_prefix", Type: cty.String, Required: false},
 		"capture_container_name":                           &hcldec.AttrSpec{Name: "capture_container_name", Type: cty.String, Required: false},
@@ -176,7 +180,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"managed_image_data_disk_snapshot_prefix":          &hcldec.AttrSpec{Name: "managed_image_data_disk_snapshot_prefix", Type: cty.String, Required: false},
 		"managed_image_zone_resilient":                     &hcldec.AttrSpec{Name: "managed_image_zone_resilient", Type: cty.Bool, Required: false},
 		"azure_tags":                                       &hcldec.AttrSpec{Name: "azure_tags", Type: cty.Map(cty.String), Required: false},
-		"azure_tag":                                        &hcldec.BlockListSpec{TypeName: "azure_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"azure_tag":                                        &hcldec.BlockListSpec{TypeName: "azure_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"resource_group_name":                              &hcldec.AttrSpec{Name: "resource_group_name", Type: cty.String, Required: false},
 		"storage_account":                                  &hcldec.AttrSpec{Name: "storage_account", Type: cty.String, Required: false},
 		"temp_compute_name":                                &hcldec.AttrSpec{Name: "temp_compute_name", Type: cty.String, Required: false},
diff --git a/builder/azure/arm/config_test.go b/builder/azure/arm/config_test.go
index dda6e9234..cb85d6a31 100644
--- a/builder/azure/arm/config_test.go
+++ b/builder/azure/arm/config_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/hcl2template"
+	sdkconfig "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 // List of configuration parameters that are required by the ARM builder.
@@ -913,7 +913,7 @@ func TestConfigShouldAcceptTags(t *testing.T) {
 	}
 
 	c := Config{
-		AzureTag: hcl2template.NameValues{
+		AzureTag: sdkconfig.NameValues{
 			{Name: "tag03", Value: "value03"},
 		},
 	}
@@ -948,7 +948,7 @@ func TestConfigShouldAcceptTag(t *testing.T) {
 	}
 
 	c := Config{
-		AzureTag: hcl2template.NameValues{
+		AzureTag: sdkconfig.NameValues{
 			{Name: "tag03", Value: "value03"},
 		},
 	}
diff --git a/builder/azure/arm/step.go b/builder/azure/arm/step.go
index 7fc7396b6..a9f53a34e 100644
--- a/builder/azure/arm/step.go
+++ b/builder/azure/arm/step.go
@@ -2,7 +2,7 @@ package arm
 
 import (
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func processStepResult(
diff --git a/builder/azure/arm/step_capture_image.go b/builder/azure/arm/step_capture_image.go
index f8fe17b59..025fc96d3 100644
--- a/builder/azure/arm/step_capture_image.go
+++ b/builder/azure/arm/step_capture_image.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCaptureImage struct {
diff --git a/builder/azure/arm/step_capture_image_test.go b/builder/azure/arm/step_capture_image_test.go
index bd898b039..4f4d0f0fb 100644
--- a/builder/azure/arm/step_capture_image_test.go
+++ b/builder/azure/arm/step_capture_image_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCaptureImageShouldFailIfCaptureFails(t *testing.T) {
diff --git a/builder/azure/arm/step_certificate_in_keyvault.go b/builder/azure/arm/step_certificate_in_keyvault.go
index d646acead..1d1b5800d 100644
--- a/builder/azure/arm/step_certificate_in_keyvault.go
+++ b/builder/azure/arm/step_certificate_in_keyvault.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCertificateInKeyVault struct {
diff --git a/builder/azure/arm/step_certificate_in_keyvault_test.go b/builder/azure/arm/step_certificate_in_keyvault_test.go
index a246a7746..ce0dcfa79 100644
--- a/builder/azure/arm/step_certificate_in_keyvault_test.go
+++ b/builder/azure/arm/step_certificate_in_keyvault_test.go
@@ -7,8 +7,8 @@ import (
 
 	azcommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestNewStepCertificateInKeyVault(t *testing.T) {
diff --git a/builder/azure/arm/step_create_resource_group.go b/builder/azure/arm/step_create_resource_group.go
index f745d5054..ff0bab59c 100644
--- a/builder/azure/arm/step_create_resource_group.go
+++ b/builder/azure/arm/step_create_resource_group.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2018-02-01/resources"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateResourceGroup struct {
diff --git a/builder/azure/arm/step_create_resource_group_test.go b/builder/azure/arm/step_create_resource_group_test.go
index 2073aa32c..9ee79a550 100644
--- a/builder/azure/arm/step_create_resource_group_test.go
+++ b/builder/azure/arm/step_create_resource_group_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateResourceGroupShouldFailIfBothGroupNames(t *testing.T) {
diff --git a/builder/azure/arm/step_delete_additional_disks.go b/builder/azure/arm/step_delete_additional_disks.go
index c51155242..6ff15a893 100644
--- a/builder/azure/arm/step_delete_additional_disks.go
+++ b/builder/azure/arm/step_delete_additional_disks.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDeleteAdditionalDisk struct {
diff --git a/builder/azure/arm/step_delete_additional_disks_test.go b/builder/azure/arm/step_delete_additional_disks_test.go
index 3d249fd0d..9aba4b3fe 100644
--- a/builder/azure/arm/step_delete_additional_disks_test.go
+++ b/builder/azure/arm/step_delete_additional_disks_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepDeleteAdditionalDiskShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_deploy_template.go b/builder/azure/arm/step_deploy_template.go
index 11e71e8da..481af6156 100644
--- a/builder/azure/arm/step_deploy_template.go
+++ b/builder/azure/arm/step_deploy_template.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepDeployTemplate struct {
diff --git a/builder/azure/arm/step_deploy_template_test.go b/builder/azure/arm/step_deploy_template_test.go
index 329a36fde..92e43177f 100644
--- a/builder/azure/arm/step_deploy_template_test.go
+++ b/builder/azure/arm/step_deploy_template_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepDeployTemplateShouldFailIfDeployFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_additional_disks.go b/builder/azure/arm/step_get_additional_disks.go
index 23d16f425..51468a3cd 100644
--- a/builder/azure/arm/step_get_additional_disks.go
+++ b/builder/azure/arm/step_get_additional_disks.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepGetDataDisk struct {
diff --git a/builder/azure/arm/step_get_additional_disks_test.go b/builder/azure/arm/step_get_additional_disks_test.go
index f9685bef4..454fa1792 100644
--- a/builder/azure/arm/step_get_additional_disks_test.go
+++ b/builder/azure/arm/step_get_additional_disks_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepGetAdditionalDiskShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_certificate.go b/builder/azure/arm/step_get_certificate.go
index 2c05bf191..ca19b262e 100644
--- a/builder/azure/arm/step_get_certificate.go
+++ b/builder/azure/arm/step_get_certificate.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepGetCertificate struct {
diff --git a/builder/azure/arm/step_get_certificate_test.go b/builder/azure/arm/step_get_certificate_test.go
index 5ce807afe..61574e126 100644
--- a/builder/azure/arm/step_get_certificate_test.go
+++ b/builder/azure/arm/step_get_certificate_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepGetCertificateShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_ip_address.go b/builder/azure/arm/step_get_ip_address.go
index ef838b339..03620ae00 100644
--- a/builder/azure/arm/step_get_ip_address.go
+++ b/builder/azure/arm/step_get_ip_address.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type EndpointType int
diff --git a/builder/azure/arm/step_get_ip_address_test.go b/builder/azure/arm/step_get_ip_address_test.go
index 38b71fa5f..a23cecddd 100644
--- a/builder/azure/arm/step_get_ip_address_test.go
+++ b/builder/azure/arm/step_get_ip_address_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepGetIPAddressShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_get_os_disk.go b/builder/azure/arm/step_get_os_disk.go
index 62337fa2a..78eda273b 100644
--- a/builder/azure/arm/step_get_os_disk.go
+++ b/builder/azure/arm/step_get_os_disk.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepGetOSDisk struct {
diff --git a/builder/azure/arm/step_get_os_disk_test.go b/builder/azure/arm/step_get_os_disk_test.go
index f9e633319..7e27b7ab1 100644
--- a/builder/azure/arm/step_get_os_disk_test.go
+++ b/builder/azure/arm/step_get_os_disk_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepGetOSDiskShouldFailIfGetFails(t *testing.T) {
diff --git a/builder/azure/arm/step_power_off_compute.go b/builder/azure/arm/step_power_off_compute.go
index 86f51935b..f6100ae9a 100644
--- a/builder/azure/arm/step_power_off_compute.go
+++ b/builder/azure/arm/step_power_off_compute.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPowerOffCompute struct {
diff --git a/builder/azure/arm/step_power_off_compute_test.go b/builder/azure/arm/step_power_off_compute_test.go
index 8239f2122..991a603ce 100644
--- a/builder/azure/arm/step_power_off_compute_test.go
+++ b/builder/azure/arm/step_power_off_compute_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepPowerOffComputeShouldFailIfPowerOffFails(t *testing.T) {
diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery.go b/builder/azure/arm/step_publish_to_shared_image_gallery.go
index 5f0a0f158..ed7f050b9 100644
--- a/builder/azure/arm/step_publish_to_shared_image_gallery.go
+++ b/builder/azure/arm/step_publish_to_shared_image_gallery.go
@@ -7,8 +7,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
 	"github.com/Azure/go-autorest/autorest/date"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPublishToSharedImageGallery struct {
diff --git a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go
index d11fb052b..ad87b47d4 100644
--- a/builder/azure/arm/step_publish_to_shared_image_gallery_test.go
+++ b/builder/azure/arm/step_publish_to_shared_image_gallery_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepPublishToSharedImageGalleryShouldNotPublishForVhd(t *testing.T) {
diff --git a/builder/azure/arm/step_set_certificate.go b/builder/azure/arm/step_set_certificate.go
index 46621e306..563cc55c1 100644
--- a/builder/azure/arm/step_set_certificate.go
+++ b/builder/azure/arm/step_set_certificate.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSetCertificate struct {
diff --git a/builder/azure/arm/step_set_certificate_test.go b/builder/azure/arm/step_set_certificate_test.go
index 387d620a9..69d5377fd 100644
--- a/builder/azure/arm/step_set_certificate_test.go
+++ b/builder/azure/arm/step_set_certificate_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepSetCertificateShouldPassIfGetPasses(t *testing.T) {
diff --git a/builder/azure/arm/step_snapshot_data_disks.go b/builder/azure/arm/step_snapshot_data_disks.go
index dba6f7634..63e9b0f71 100644
--- a/builder/azure/arm/step_snapshot_data_disks.go
+++ b/builder/azure/arm/step_snapshot_data_disks.go
@@ -8,8 +8,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSnapshotDataDisks struct {
diff --git a/builder/azure/arm/step_snapshot_data_disks_test.go b/builder/azure/arm/step_snapshot_data_disks_test.go
index 9f34f0cce..88b1dfaf6 100644
--- a/builder/azure/arm/step_snapshot_data_disks_test.go
+++ b/builder/azure/arm/step_snapshot_data_disks_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepSnapshotDataDisksShouldFailIfSnapshotFails(t *testing.T) {
diff --git a/builder/azure/arm/step_snapshot_os_disk.go b/builder/azure/arm/step_snapshot_os_disk.go
index 28fc844a9..bc84d0d94 100644
--- a/builder/azure/arm/step_snapshot_os_disk.go
+++ b/builder/azure/arm/step_snapshot_os_disk.go
@@ -7,8 +7,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-04-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSnapshotOSDisk struct {
diff --git a/builder/azure/arm/step_snapshot_os_disk_test.go b/builder/azure/arm/step_snapshot_os_disk_test.go
index 7148a6eb0..7e0e99aa1 100644
--- a/builder/azure/arm/step_snapshot_os_disk_test.go
+++ b/builder/azure/arm/step_snapshot_os_disk_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepSnapshotOSDiskShouldFailIfSnapshotFails(t *testing.T) {
diff --git a/builder/azure/arm/step_test.go b/builder/azure/arm/step_test.go
index 1f75b1936..1c6b37e70 100644
--- a/builder/azure/arm/step_test.go
+++ b/builder/azure/arm/step_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) {
diff --git a/builder/azure/arm/step_validate_template.go b/builder/azure/arm/step_validate_template.go
index 30ec3728b..4f3204659 100644
--- a/builder/azure/arm/step_validate_template.go
+++ b/builder/azure/arm/step_validate_template.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepValidateTemplate struct {
diff --git a/builder/azure/arm/step_validate_template_test.go b/builder/azure/arm/step_validate_template_test.go
index 22251f489..7e127a2aa 100644
--- a/builder/azure/arm/step_validate_template_test.go
+++ b/builder/azure/arm/step_validate_template_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) {
diff --git a/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json b/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json
index 44c9e68e4..c4f85c6a8 100644
--- a/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json
+++ b/builder/azure/arm/template_factory_test.TestKeyVaultDeployment03.approved.json
@@ -38,6 +38,7 @@
             "tenantId": "[parameters('tenantId')]"
           }
         ],
+        "enableSoftDelete": "true",
         "enabledForDeployment": "true",
         "enabledForTemplateDeployment": "true",
         "sku": {
diff --git a/builder/azure/arm/tempname.go b/builder/azure/arm/tempname.go
index 8ad7fae3e..e90d2c420 100644
--- a/builder/azure/arm/tempname.go
+++ b/builder/azure/arm/tempname.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 type TempName struct {
diff --git a/builder/azure/arm/tempname_test.go b/builder/azure/arm/tempname_test.go
index 5f7711a82..5f0baa52f 100644
--- a/builder/azure/arm/tempname_test.go
+++ b/builder/azure/arm/tempname_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 func TestTempNameShouldCreatePrefixedRandomNames(t *testing.T) {
diff --git a/builder/azure/chroot/builder.go b/builder/azure/chroot/builder.go
index e0e0eacc4..58e146d3e 100644
--- a/builder/azure/chroot/builder.go
+++ b/builder/azure/chroot/builder.go
@@ -18,12 +18,13 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	azcommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/chroot"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/chroot"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest/azure"
@@ -439,7 +440,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	steps := buildsteps(b.config, info)
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/azure/chroot/builder.hcl2spec.go b/builder/azure/chroot/builder.hcl2spec.go
index 059f4f6b6..4ace06b46 100644
--- a/builder/azure/chroot/builder.hcl2spec.go
+++ b/builder/azure/chroot/builder.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                   *string                            `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                 *string                            `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                 *string                            `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                       *bool                              `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                       *bool                              `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                     *string                            `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -24,6 +25,7 @@ type FlatConfig struct {
 	ObjectID                          *string                            `mapstructure:"object_id" cty:"object_id" hcl:"object_id"`
 	TenantID                          *string                            `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"`
 	SubscriptionID                    *string                            `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"`
+	UseAzureCLIAuth                   *bool                              `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"`
 	FromScratch                       *bool                              `mapstructure:"from_scratch" cty:"from_scratch" hcl:"from_scratch"`
 	Source                            *string                            `mapstructure:"source" required:"true" cty:"source" hcl:"source"`
 	CommandWrapper                    *string                            `mapstructure:"command_wrapper" cty:"command_wrapper" hcl:"command_wrapper"`
@@ -63,6 +65,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":               &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":             &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":             &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                    &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                    &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                 &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -76,6 +79,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"object_id":                       &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false},
 		"tenant_id":                       &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false},
 		"subscription_id":                 &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false},
+		"use_azure_cli_auth":              &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false},
 		"from_scratch":                    &hcldec.AttrSpec{Name: "from_scratch", Type: cty.Bool, Required: false},
 		"source":                          &hcldec.AttrSpec{Name: "source", Type: cty.String, Required: false},
 		"command_wrapper":                 &hcldec.AttrSpec{Name: "command_wrapper", Type: cty.String, Required: false},
diff --git a/builder/azure/chroot/builder_test.go b/builder/azure/chroot/builder_test.go
index dee9436a9..08e6132e5 100644
--- a/builder/azure/chroot/builder_test.go
+++ b/builder/azure/chroot/builder_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 )
diff --git a/builder/azure/chroot/step_attach_disk.go b/builder/azure/chroot/step_attach_disk.go
index efbc2b430..53a0b16c3 100644
--- a/builder/azure/chroot/step_attach_disk.go
+++ b/builder/azure/chroot/step_attach_disk.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 var _ multistep.Step = &StepAttachDisk{}
diff --git a/builder/azure/chroot/step_attach_disk_test.go b/builder/azure/chroot/step_attach_disk_test.go
index acbdfa4e1..69261b298 100644
--- a/builder/azure/chroot/step_attach_disk_test.go
+++ b/builder/azure/chroot/step_attach_disk_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepAttachDisk_Run(t *testing.T) {
diff --git a/builder/azure/chroot/step_create_image.go b/builder/azure/chroot/step_create_image.go
index a818c4cd7..952374f7d 100644
--- a/builder/azure/chroot/step_create_image.go
+++ b/builder/azure/chroot/step_create_image.go
@@ -10,8 +10,8 @@ import (
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 var _ multistep.Step = &StepCreateImage{}
diff --git a/builder/azure/chroot/step_create_image_test.go b/builder/azure/chroot/step_create_image_test.go
index 43bbebd50..4bb32e9cd 100644
--- a/builder/azure/chroot/step_create_image_test.go
+++ b/builder/azure/chroot/step_create_image_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
diff --git a/builder/azure/chroot/step_create_new_diskset.go b/builder/azure/chroot/step_create_new_diskset.go
index 3d188b2a5..ad690ecad 100644
--- a/builder/azure/chroot/step_create_new_diskset.go
+++ b/builder/azure/chroot/step_create_new_diskset.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
diff --git a/builder/azure/chroot/step_create_new_diskset_test.go b/builder/azure/chroot/step_create_new_diskset_test.go
index 596752e2e..f85ea0d1f 100644
--- a/builder/azure/chroot/step_create_new_diskset_test.go
+++ b/builder/azure/chroot/step_create_new_diskset_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
diff --git a/builder/azure/chroot/step_create_shared_image_version.go b/builder/azure/chroot/step_create_shared_image_version.go
index 614ad100f..d32da7e92 100644
--- a/builder/azure/chroot/step_create_shared_image_version.go
+++ b/builder/azure/chroot/step_create_shared_image_version.go
@@ -10,8 +10,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateSharedImageVersion struct {
diff --git a/builder/azure/chroot/step_create_shared_image_version_test.go b/builder/azure/chroot/step_create_shared_image_version_test.go
index 4b8be5542..e08265a41 100644
--- a/builder/azure/chroot/step_create_shared_image_version_test.go
+++ b/builder/azure/chroot/step_create_shared_image_version_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
diff --git a/builder/azure/chroot/step_create_snapshotset.go b/builder/azure/chroot/step_create_snapshotset.go
index a03fbe5c9..6af98710a 100644
--- a/builder/azure/chroot/step_create_snapshotset.go
+++ b/builder/azure/chroot/step_create_snapshotset.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
diff --git a/builder/azure/chroot/step_create_snapshotset_test.go b/builder/azure/chroot/step_create_snapshotset_test.go
index c7baf74e5..861edcb2c 100644
--- a/builder/azure/chroot/step_create_snapshotset_test.go
+++ b/builder/azure/chroot/step_create_snapshotset_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateSnapshot_Run(t *testing.T) {
diff --git a/builder/azure/chroot/step_mount_device.go b/builder/azure/chroot/step_mount_device.go
index 99fbb9d90..315b61d5b 100644
--- a/builder/azure/chroot/step_mount_device.go
+++ b/builder/azure/chroot/step_mount_device.go
@@ -12,10 +12,10 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 var _ multistep.Step = &StepMountDevice{}
diff --git a/builder/azure/chroot/step_mount_device_test.go b/builder/azure/chroot/step_mount_device_test.go
index 98ed49bc7..ee601ef52 100644
--- a/builder/azure/chroot/step_mount_device_test.go
+++ b/builder/azure/chroot/step_mount_device_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepMountDevice_Run(t *testing.T) {
diff --git a/builder/azure/chroot/step_resolve_plaform_image_version.go b/builder/azure/chroot/step_resolve_plaform_image_version.go
index 77a2e7531..d0f4a9ed2 100644
--- a/builder/azure/chroot/step_resolve_plaform_image_version.go
+++ b/builder/azure/chroot/step_resolve_plaform_image_version.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepResolvePlatformImageVersion resolves the exact PIR version when the version is 'latest'
diff --git a/builder/azure/chroot/step_resolve_plaform_image_version_test.go b/builder/azure/chroot/step_resolve_plaform_image_version_test.go
index 0030b8090..687037f64 100644
--- a/builder/azure/chroot/step_resolve_plaform_image_version_test.go
+++ b/builder/azure/chroot/step_resolve_plaform_image_version_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
diff --git a/builder/azure/chroot/step_verify_shared_image_destination.go b/builder/azure/chroot/step_verify_shared_image_destination.go
index 7877948fe..156e8413f 100644
--- a/builder/azure/chroot/step_verify_shared_image_destination.go
+++ b/builder/azure/chroot/step_verify_shared_image_destination.go
@@ -9,8 +9,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 var _ multistep.Step = &StepVerifySharedImageDestination{}
diff --git a/builder/azure/chroot/step_verify_shared_image_destination_test.go b/builder/azure/chroot/step_verify_shared_image_destination_test.go
index b34d24840..22dafaf94 100644
--- a/builder/azure/chroot/step_verify_shared_image_destination_test.go
+++ b/builder/azure/chroot/step_verify_shared_image_destination_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
diff --git a/builder/azure/chroot/step_verify_shared_image_source.go b/builder/azure/chroot/step_verify_shared_image_source.go
index ff64a565a..5f6d243c6 100644
--- a/builder/azure/chroot/step_verify_shared_image_source.go
+++ b/builder/azure/chroot/step_verify_shared_image_source.go
@@ -9,8 +9,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 var _ multistep.Step = &StepVerifySharedImageSource{}
diff --git a/builder/azure/chroot/step_verify_shared_image_source_test.go b/builder/azure/chroot/step_verify_shared_image_source_test.go
index 69ad4065d..d29b8042a 100644
--- a/builder/azure/chroot/step_verify_shared_image_source_test.go
+++ b/builder/azure/chroot/step_verify_shared_image_source_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepVerifySharedImageSource_Run(t *testing.T) {
diff --git a/builder/azure/chroot/step_verify_source_disk.go b/builder/azure/chroot/step_verify_source_disk.go
index 43a0343ef..1bf65a436 100644
--- a/builder/azure/chroot/step_verify_source_disk.go
+++ b/builder/azure/chroot/step_verify_source_disk.go
@@ -10,8 +10,8 @@ import (
 	"github.com/Azure/go-autorest/autorest/to"
 
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepVerifySourceDisk struct {
diff --git a/builder/azure/chroot/step_verify_source_disk_test.go b/builder/azure/chroot/step_verify_source_disk_test.go
index dd3732b10..d0149a439 100644
--- a/builder/azure/chroot/step_verify_source_disk_test.go
+++ b/builder/azure/chroot/step_verify_source_disk_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/hashicorp/packer/builder/azure/common/client"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func Test_StepVerifySourceDisk_Run(t *testing.T) {
diff --git a/builder/azure/common/client/azure_client_set.go b/builder/azure/common/client/azure_client_set.go
index 04fb6a473..5948192ff 100644
--- a/builder/azure/common/client/azure_client_set.go
+++ b/builder/azure/common/client/azure_client_set.go
@@ -1,15 +1,17 @@
 package client
 
 import (
+	"log"
 	"net/http"
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/helper/useragent"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute"
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-12-01/compute/computeapi"
 	"github.com/Azure/go-autorest/autorest"
+	version "github.com/hashicorp/packer/builder/azure/version"
 )
 
 type AzureClientSet interface {
@@ -64,7 +66,10 @@ func (s azureClientSet) SubscriptionID() string {
 }
 
 func (s azureClientSet) configureAutorestClient(c *autorest.Client) {
-	c.AddToUserAgent(useragent.String())
+	err := c.AddToUserAgent(useragent.String(version.AzurePluginVersion.FormattedVersion()))
+	if err != nil {
+		log.Printf("Error appending Packer plugin version to user agent.")
+	}
 	c.Authorizer = s.authorizer
 	c.Sender = s.sender
 }
@@ -72,7 +77,7 @@ func (s azureClientSet) configureAutorestClient(c *autorest.Client) {
 func (s azureClientSet) MetadataClient() MetadataClientAPI {
 	return metadataClient{
 		s.sender,
-		useragent.String(),
+		useragent.String(version.AzurePluginVersion.FormattedVersion()),
 	}
 }
 
diff --git a/builder/azure/common/client/config.go b/builder/azure/common/client/config.go
index 5eb1d8a38..5ee5e6c31 100644
--- a/builder/azure/common/client/config.go
+++ b/builder/azure/common/client/config.go
@@ -54,6 +54,14 @@ type Config struct {
 	SubscriptionID string `mapstructure:"subscription_id"`
 
 	authType string
+
+	// Flag to use Azure CLI authentication. Defaults to false.
+	// CLI auth will use the information from an active `az login` session to connect to Azure and set the subscription id and tenant id associated to the signed in account.
+	// If enabled, it will use the authentication provided by the `az` CLI.
+	// Azure CLI authentication will use the credential marked as `isDefault` and can be verified using `az account show`.
+	// Works with normal authentication (`az login`) and service principals (`az login --service-principal --username APP_ID --password PASSWORD --tenant TENANT_ID`).
+	// Ignores all other configurations if enabled.
+	UseAzureCLIAuth bool `mapstructure:"use_azure_cli_auth" required:"false"`
 }
 
 const (
@@ -62,6 +70,7 @@ const (
 	authTypeClientSecret    = "ClientSecret"
 	authTypeClientCert      = "ClientCertificate"
 	authTypeClientBearerJWT = "ClientBearerJWT"
+	authTypeAzureCLI        = "AzureCLI"
 )
 
 const DefaultCloudEnvironmentName = "Public"
@@ -124,6 +133,10 @@ func (c Config) Validate(errs *packer.MultiError) {
 	// readable by the ObjectID of the App.  There may be another way to handle
 	// this case, but I am not currently aware of it - send feedback.
 
+	if c.UseCLI() {
+		return
+	}
+
 	if c.UseMSI() {
 		return
 	}
@@ -193,6 +206,10 @@ func (c Config) useDeviceLogin() bool {
 		c.ClientCertPath == ""
 }
 
+func (c Config) UseCLI() bool {
+	return c.UseAzureCLIAuth == true
+}
+
 func (c Config) UseMSI() bool {
 	return c.SubscriptionID == "" &&
 		c.ClientID == "" &&
@@ -230,6 +247,9 @@ func (c Config) GetServicePrincipalToken(
 	case authTypeDeviceLogin:
 		say("Getting tokens using device flow")
 		auth = NewDeviceFlowOAuthTokenProvider(*c.cloudEnvironment, say, c.TenantID)
+	case authTypeAzureCLI:
+		say("Getting tokens using Azure CLI")
+		auth = NewCliOAuthTokenProvider(*c.cloudEnvironment, say, c.TenantID)
 	case authTypeMSI:
 		say("Getting tokens using Managed Identity for Azure")
 		auth = NewMSIOAuthTokenProvider(*c.cloudEnvironment)
@@ -268,6 +288,8 @@ func (c *Config) FillParameters() error {
 	if c.authType == "" {
 		if c.useDeviceLogin() {
 			c.authType = authTypeDeviceLogin
+		} else if c.UseCLI() {
+			c.authType = authTypeAzureCLI
 		} else if c.UseMSI() {
 			c.authType = authTypeMSI
 		} else if c.ClientSecret != "" {
@@ -295,6 +317,16 @@ func (c *Config) FillParameters() error {
 		}
 	}
 
+	if c.authType == authTypeAzureCLI {
+		tenantID, subscriptionID, err := getIDsFromAzureCLI()
+		if err != nil {
+			return fmt.Errorf("error fetching tenantID and subscriptionID from Azure CLI (are you logged on using `az login`?): %v", err)
+		}
+
+		c.TenantID = tenantID
+		c.SubscriptionID = subscriptionID
+	}
+
 	if c.TenantID == "" {
 		tenantID, err := findTenantID(*c.cloudEnvironment, c.SubscriptionID)
 		if err != nil {
diff --git a/builder/azure/common/client/config_test.go b/builder/azure/common/client/config_test.go
index a914e25c3..8f399b886 100644
--- a/builder/azure/common/client/config_test.go
+++ b/builder/azure/common/client/config_test.go
@@ -29,6 +29,13 @@ func Test_ClientConfig_RequiredParametersSet(t *testing.T) {
 			config:  Config{},
 			wantErr: false,
 		},
+		{
+			name: "use_azure_cli_auth will trigger Azure CLI auth",
+			config: Config{
+				UseAzureCLIAuth: true,
+			},
+			wantErr: false,
+		},
 		{
 			name: "subscription_id is set will trigger device flow",
 			config: Config{
@@ -158,6 +165,26 @@ func Test_ClientConfig_DeviceLogin(t *testing.T) {
 	}
 }
 
+func Test_ClientConfig_AzureCli(t *testing.T) {
+	// Azure CLI tests skipped unless env 'AZURE_CLI_AUTH' is set, and an active `az login` session has been established
+	getEnvOrSkip(t, "AZURE_CLI_AUTH")
+
+	cfg := Config{
+		UseAzureCLIAuth:  true,
+		cloudEnvironment: getCloud(),
+	}
+	assertValid(t, cfg)
+
+	err := cfg.FillParameters()
+	if err != nil {
+		t.Fatalf("Expected nil err, but got: %v", err)
+	}
+
+	if cfg.authType != authTypeAzureCLI {
+		t.Fatalf("Expected authType to be %q, but got: %q", authTypeAzureCLI, cfg.authType)
+	}
+}
+
 func Test_ClientConfig_ClientPassword(t *testing.T) {
 	cfg := Config{
 		SubscriptionID:   getEnvOrSkip(t, "AZURE_SUBSCRIPTION"),
diff --git a/builder/azure/common/client/devicelogin.go b/builder/azure/common/client/devicelogin.go
index 888e851bf..02555fc64 100644
--- a/builder/azure/common/client/devicelogin.go
+++ b/builder/azure/common/client/devicelogin.go
@@ -15,7 +15,8 @@ import (
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/Azure/go-autorest/autorest/to"
-	"github.com/hashicorp/packer/helper/useragent"
+	version "github.com/hashicorp/packer/builder/azure/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
 )
 
 var (
@@ -123,7 +124,7 @@ func tokenFromFile(say func(string), oauthCfg adal.OAuthConfig, tokenPath, clien
 // endpoint is polled until user gives consent, denies or the flow times out.
 // Returned token must be saved.
 func tokenFromDeviceFlow(say func(string), oauthCfg adal.OAuthConfig, clientID, resource string) (*adal.ServicePrincipalToken, error) {
-	cl := autorest.NewClientWithUserAgent(useragent.String())
+	cl := autorest.NewClientWithUserAgent(useragent.String(version.AzurePluginVersion.FormattedVersion()))
 	deviceCode, err := adal.InitiateDeviceAuth(&cl, oauthCfg, clientID, resource)
 	if err != nil {
 		return nil, fmt.Errorf("Failed to start device auth: %v", err)
diff --git a/builder/azure/common/client/tokenprovider_cli.go b/builder/azure/common/client/tokenprovider_cli.go
new file mode 100644
index 000000000..b11182e20
--- /dev/null
+++ b/builder/azure/common/client/tokenprovider_cli.go
@@ -0,0 +1,99 @@
+package client
+
+import (
+	"context"
+	"errors"
+	"fmt"
+
+	"github.com/Azure/go-autorest/autorest/adal"
+	"github.com/Azure/go-autorest/autorest/azure"
+	"github.com/Azure/go-autorest/autorest/azure/cli"
+)
+
+// for managed identity auth
+type cliOAuthTokenProvider struct {
+	env      azure.Environment
+	say      func(string)
+	tenantID string
+}
+
+func NewCliOAuthTokenProvider(env azure.Environment, say func(string), tenantID string) oAuthTokenProvider {
+	return &cliOAuthTokenProvider{
+		env:      env,
+		say:      say,
+		tenantID: tenantID,
+	}
+}
+
+func (tp *cliOAuthTokenProvider) getServicePrincipalToken() (*adal.ServicePrincipalToken, error) {
+	return tp.getServicePrincipalTokenWithResource(tp.env.ResourceManagerEndpoint)
+}
+
+func (tp *cliOAuthTokenProvider) getServicePrincipalTokenWithResource(resource string) (*adal.ServicePrincipalToken, error) {
+	token, err := cli.GetTokenFromCLI(resource)
+	if err != nil {
+		tp.say(fmt.Sprintf("unable to get token from azure cli: %v", err))
+		return nil, err
+	}
+
+	oAuthConfig, err := adal.NewOAuthConfig(resource, tp.tenantID)
+	if err != nil {
+		tp.say(fmt.Sprintf("unable to generate OAuth Config: %v", err))
+		return nil, err
+	}
+
+	adalToken, err := token.ToADALToken()
+	if err != nil {
+		tp.say(fmt.Sprintf("unable to get ADAL Token from azure cli token: %v", err))
+		return nil, err
+	}
+
+	spt, err := adal.NewServicePrincipalTokenFromManualToken(*oAuthConfig, clientIDs[tp.env.Name], resource, adalToken)
+	if err != nil {
+		tp.say(fmt.Sprintf("unable to get service principal token from adal token: %v", err))
+		return nil, err
+	}
+
+	// Custom refresh function to make it possible to use Azure CLI to refresh tokens.
+	// Inspired by HashiCorps go-azure-helpers: https://github.com/hashicorp/go-azure-helpers/blob/373622ce2effb0cf299051ea019cb657f357a4d8/authentication/auth_method_azure_cli_token.go#L96-L109
+	var customRefreshFunc adal.TokenRefresh = func(ctx context.Context, resource string) (*adal.Token, error) {
+		token, err := cli.GetTokenFromCLI(resource)
+		if err != nil {
+			tp.say(fmt.Sprintf("token refresh - unable to get token from azure cli: %v", err))
+			return nil, err
+		}
+
+		adalToken, err := token.ToADALToken()
+		if err != nil {
+			tp.say(fmt.Sprintf("token refresh - unable to get ADAL Token from azure cli token: %v", err))
+			return nil, err
+		}
+
+		return &adalToken, nil
+	}
+
+	spt.SetCustomRefreshFunc(customRefreshFunc)
+
+	return spt, nil
+}
+
+// getIDsFromAzureCLI returns the TenantID and SubscriptionID from an active Azure CLI login session
+func getIDsFromAzureCLI() (string, string, error) {
+	profilePath, err := cli.ProfilePath()
+	if err != nil {
+		return "", "", err
+	}
+
+	profile, err := cli.LoadProfile(profilePath)
+	if err != nil {
+		return "", "", err
+	}
+
+	for _, p := range profile.Subscriptions {
+		if p.IsDefault {
+			return p.TenantID, p.ID, nil
+		}
+	}
+
+	return "", "", errors.New("Unable to find default subscription")
+}
diff --git a/builder/azure/common/lin/ssh.go b/builder/azure/common/lin/ssh.go
index c8b09c45e..5e48273d9 100644
--- a/builder/azure/common/lin/ssh.go
+++ b/builder/azure/common/lin/ssh.go
@@ -2,7 +2,7 @@ package lin
 
 import (
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func SSHHost(state multistep.StateBag) (string, error) {
diff --git a/builder/azure/common/state_bag.go b/builder/azure/common/state_bag.go
index 57889c03f..ced0362f1 100644
--- a/builder/azure/common/state_bag.go
+++ b/builder/azure/common/state_bag.go
@@ -1,6 +1,6 @@
 package common
 
-import "github.com/hashicorp/packer/helper/multistep"
+import "github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 func IsStateCancelled(stateBag multistep.StateBag) bool {
 	_, ok := stateBag.GetOk(multistep.StateCancelled)
diff --git a/builder/azure/common/template/template.go b/builder/azure/common/template/template.go
index 32fa39917..2366b7a24 100644
--- a/builder/azure/common/template/template.go
+++ b/builder/azure/common/template/template.go
@@ -85,6 +85,7 @@ type Properties struct {
 	DNSSettings                  *network.PublicIPAddressDNSSettings `json:"dnsSettings,omitempty"`
 	EnabledForDeployment         *string                             `json:"enabledForDeployment,omitempty"`
 	EnabledForTemplateDeployment *string                             `json:"enabledForTemplateDeployment,omitempty"`
+	EnableSoftDelete             *string                             `json:"enableSoftDelete,omitempty"`
 	HardwareProfile              *compute.HardwareProfile            `json:"hardwareProfile,omitempty"`
 	IPConfigurations             *[]network.IPConfiguration          `json:"ipConfigurations,omitempty"`
 	NetworkProfile               *compute.NetworkProfile             `json:"networkProfile,omitempty"`
diff --git a/builder/azure/common/template/template_builder.go b/builder/azure/common/template/template_builder.go
index d4248d04b..cdb9f92d1 100644
--- a/builder/azure/common/template/template_builder.go
+++ b/builder/azure/common/template/template_builder.go
@@ -554,6 +554,7 @@ const KeyVault = `{
       "properties": {
         "enabledForDeployment": "true",
         "enabledForTemplateDeployment": "true",
+        "enableSoftDelete": "true",
         "tenantId": "[parameters('tenantId')]",
         "accessPolicies": [
           {
diff --git a/builder/azure/dtl/azure_client.go b/builder/azure/dtl/azure_client.go
index eefc89d45..595d0e746 100644
--- a/builder/azure/dtl/azure_client.go
+++ b/builder/azure/dtl/azure_client.go
@@ -20,7 +20,8 @@ import (
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/hashicorp/packer/builder/azure/common"
-	"github.com/hashicorp/packer/helper/useragent"
+	"github.com/hashicorp/packer/builder/azure/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
 )
 
 const (
@@ -142,28 +143,28 @@ func NewAzureClient(subscriptionID, resourceGroupName string,
 	azureClient.DtlVirtualMachineClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DtlVirtualMachineClient.RequestInspector = withInspection(maxlen)
 	azureClient.DtlVirtualMachineClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
-	azureClient.DtlVirtualMachineClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlVirtualMachineClient.UserAgent)
+	azureClient.DtlVirtualMachineClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlVirtualMachineClient.UserAgent)
 	azureClient.DtlVirtualMachineClient.Client.PollingDuration = PollingDuration
 
 	azureClient.DtlEnvironmentsClient = dtl.NewEnvironmentsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DtlEnvironmentsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DtlEnvironmentsClient.RequestInspector = withInspection(maxlen)
 	azureClient.DtlEnvironmentsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
-	azureClient.DtlEnvironmentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlEnvironmentsClient.UserAgent)
+	azureClient.DtlEnvironmentsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlEnvironmentsClient.UserAgent)
 	azureClient.DtlEnvironmentsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.DtlLabsClient = dtl.NewLabsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DtlLabsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DtlLabsClient.RequestInspector = withInspection(maxlen)
 	azureClient.DtlLabsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
-	azureClient.DtlLabsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlLabsClient.UserAgent)
+	azureClient.DtlLabsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlLabsClient.UserAgent)
 	azureClient.DtlLabsClient.Client.PollingDuration = PollingDuration
 
 	azureClient.DtlCustomImageClient = dtl.NewCustomImagesClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.DtlCustomImageClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DtlCustomImageClient.RequestInspector = withInspection(maxlen)
 	azureClient.DtlCustomImageClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
-	azureClient.DtlCustomImageClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlCustomImageClient.UserAgent)
+	azureClient.DtlCustomImageClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlCustomImageClient.UserAgent)
 	azureClient.DtlCustomImageClient.PollingDuration = autorest.DefaultPollingDuration
 	azureClient.DtlCustomImageClient.Client.PollingDuration = PollingDuration
 
@@ -171,14 +172,14 @@ func NewAzureClient(subscriptionID, resourceGroupName string,
 	azureClient.DtlVirtualNetworksClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.DtlVirtualNetworksClient.RequestInspector = withInspection(maxlen)
 	azureClient.DtlVirtualNetworksClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), templateCapture(azureClient), errorCapture(azureClient))
-	azureClient.DtlVirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.DtlVirtualNetworksClient.UserAgent)
+	azureClient.DtlVirtualNetworksClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.DtlVirtualNetworksClient.UserAgent)
 	azureClient.DtlVirtualNetworksClient.Client.PollingDuration = PollingDuration
 
 	azureClient.GalleryImageVersionsClient = newCompute.NewGalleryImageVersionsClientWithBaseURI(cloud.ResourceManagerEndpoint, subscriptionID)
 	azureClient.GalleryImageVersionsClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GalleryImageVersionsClient.RequestInspector = withInspection(maxlen)
 	azureClient.GalleryImageVersionsClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImageVersionsClient.UserAgent)
+	azureClient.GalleryImageVersionsClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImageVersionsClient.UserAgent)
 	azureClient.GalleryImageVersionsClient.Client.PollingDuration = SharedGalleryTimeout
 	azureClient.GalleryImageVersionsClient.Client.PollingDuration = PollingDuration
 
@@ -186,7 +187,7 @@ func NewAzureClient(subscriptionID, resourceGroupName string,
 	azureClient.GalleryImagesClient.Authorizer = autorest.NewBearerAuthorizer(servicePrincipalToken)
 	azureClient.GalleryImagesClient.RequestInspector = withInspection(maxlen)
 	azureClient.GalleryImagesClient.ResponseInspector = byConcatDecorators(byInspecting(maxlen), errorCapture(azureClient))
-	azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(), azureClient.GalleryImagesClient.UserAgent)
+	azureClient.GalleryImagesClient.UserAgent = fmt.Sprintf("%s %s", useragent.String(version.AzurePluginVersion.FormattedVersion()), azureClient.GalleryImagesClient.UserAgent)
 	azureClient.GalleryImagesClient.Client.PollingDuration = PollingDuration
 
 	return azureClient, nil
diff --git a/builder/azure/dtl/azure_error_response_test.go b/builder/azure/dtl/azure_error_response_test.go
index bc8a82f15..6e1e78d7b 100644
--- a/builder/azure/dtl/azure_error_response_test.go
+++ b/builder/azure/dtl/azure_error_response_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	approvaltests "github.com/approvals/go-approval-tests"
-	"github.com/hashicorp/packer/common/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 )
 
 const AzureErrorSimple = `{"error":{"code":"ResourceNotFound","message":"The Resource 'Microsoft.Compute/images/PackerUbuntuImage' under resource group 'packer-test00' was not found."}}`
diff --git a/builder/azure/dtl/builder.go b/builder/azure/dtl/builder.go
index 02334ba36..ad32a4d83 100644
--- a/builder/azure/dtl/builder.go
+++ b/builder/azure/dtl/builder.go
@@ -17,10 +17,10 @@ import (
 	packerAzureCommon "github.com/hashicorp/packer/builder/azure/common"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 	"github.com/hashicorp/packer/builder/azure/common/lin"
-	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type Builder struct {
@@ -187,8 +187,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				Host:      lin.SSHHost,
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&packerCommon.StepProvision{},
-			&packerCommon.StepCleanupTempKeys{
+			&commonsteps.StepProvision{},
+			&commonsteps.StepCleanupTempKeys{
 				Comm: &b.config.Comm,
 			},
 			NewStepPowerOffCompute(azureClient, ui, b.config),
@@ -215,7 +215,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 					}, nil
 				},
 			},
-			&packerCommon.StepProvision{},
+			&commonsteps.StepProvision{},
 			NewStepPowerOffCompute(azureClient, ui, b.config),
 			NewStepCaptureImage(azureClient, ui, b.config),
 			NewStepPublishToSharedImageGallery(azureClient, ui, b.config),
@@ -237,7 +237,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		}
 	}
 
-	b.runner = packerCommon.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, b.stateBag)
 
 	// Report any errors.
diff --git a/builder/azure/dtl/config.go b/builder/azure/dtl/config.go
index d46cd82dc..fdb960905 100644
--- a/builder/azure/dtl/config.go
+++ b/builder/azure/dtl/config.go
@@ -24,11 +24,11 @@ import (
 	"github.com/hashicorp/packer/builder/azure/common/constants"
 
 	"github.com/hashicorp/packer/builder/azure/pkcs12"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 	"golang.org/x/crypto/ssh"
 )
diff --git a/builder/azure/dtl/config.hcl2spec.go b/builder/azure/dtl/config.hcl2spec.go
index f1c417062..4986ced94 100644
--- a/builder/azure/dtl/config.hcl2spec.go
+++ b/builder/azure/dtl/config.hcl2spec.go
@@ -38,6 +38,7 @@ func (*FlatArtifactParameter) HCL2Spec() map[string]hcldec.Spec {
 type FlatConfig struct {
 	PackerBuildName                     *string                            `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                   *string                            `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                   *string                            `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                         *bool                              `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                         *bool                              `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                       *string                            `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -51,6 +52,7 @@ type FlatConfig struct {
 	ObjectID                            *string                            `mapstructure:"object_id" cty:"object_id" hcl:"object_id"`
 	TenantID                            *string                            `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"`
 	SubscriptionID                      *string                            `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"`
+	UseAzureCLIAuth                     *bool                              `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"`
 	CaptureNamePrefix                   *string                            `mapstructure:"capture_name_prefix" cty:"capture_name_prefix" hcl:"capture_name_prefix"`
 	CaptureContainerName                *string                            `mapstructure:"capture_container_name" cty:"capture_container_name" hcl:"capture_container_name"`
 	SharedGallery                       *FlatSharedImageGallery            `mapstructure:"shared_image_gallery" cty:"shared_image_gallery" hcl:"shared_image_gallery"`
@@ -150,6 +152,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                        &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":                      &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":                      &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                             &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                             &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                          &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -163,6 +166,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"object_id":                                &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false},
 		"tenant_id":                                &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false},
 		"subscription_id":                          &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false},
+		"use_azure_cli_auth":                       &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false},
 		"capture_name_prefix":                      &hcldec.AttrSpec{Name: "capture_name_prefix", Type: cty.String, Required: false},
 		"capture_container_name":                   &hcldec.AttrSpec{Name: "capture_container_name", Type: cty.String, Required: false},
 		"shared_image_gallery":                     &hcldec.BlockSpec{TypeName: "shared_image_gallery", Nested: hcldec.ObjectSpec((*FlatSharedImageGallery)(nil).HCL2Spec())},
diff --git a/builder/azure/dtl/step.go b/builder/azure/dtl/step.go
index 6418e5c15..39320e5bd 100644
--- a/builder/azure/dtl/step.go
+++ b/builder/azure/dtl/step.go
@@ -2,7 +2,7 @@ package dtl
 
 import (
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func processStepResult(
diff --git a/builder/azure/dtl/step_capture_image.go b/builder/azure/dtl/step_capture_image.go
index 30f726a7d..6e0f84fb3 100644
--- a/builder/azure/dtl/step_capture_image.go
+++ b/builder/azure/dtl/step_capture_image.go
@@ -7,8 +7,8 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/devtestlabs/mgmt/2018-09-15/dtl"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCaptureImage struct {
diff --git a/builder/azure/dtl/step_delete_virtual_machine.go b/builder/azure/dtl/step_delete_virtual_machine.go
index a94f72d6a..d85d18407 100644
--- a/builder/azure/dtl/step_delete_virtual_machine.go
+++ b/builder/azure/dtl/step_delete_virtual_machine.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDeleteVirtualMachine struct {
diff --git a/builder/azure/dtl/step_deploy_template.go b/builder/azure/dtl/step_deploy_template.go
index 0cface5ff..cae494bd6 100644
--- a/builder/azure/dtl/step_deploy_template.go
+++ b/builder/azure/dtl/step_deploy_template.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDeployTemplate struct {
diff --git a/builder/azure/dtl/step_power_off_compute.go b/builder/azure/dtl/step_power_off_compute.go
index 794c3b751..2bc224c34 100644
--- a/builder/azure/dtl/step_power_off_compute.go
+++ b/builder/azure/dtl/step_power_off_compute.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPowerOffCompute struct {
diff --git a/builder/azure/dtl/step_publish_to_shared_image_gallery.go b/builder/azure/dtl/step_publish_to_shared_image_gallery.go
index 3ed56794e..e4c6d8231 100644
--- a/builder/azure/dtl/step_publish_to_shared_image_gallery.go
+++ b/builder/azure/dtl/step_publish_to_shared_image_gallery.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-03-01/compute"
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPublishToSharedImageGallery struct {
diff --git a/builder/azure/dtl/step_save_winrm_password.go b/builder/azure/dtl/step_save_winrm_password.go
index 241396228..ab81bcc80 100644
--- a/builder/azure/dtl/step_save_winrm_password.go
+++ b/builder/azure/dtl/step_save_winrm_password.go
@@ -3,8 +3,8 @@ package dtl
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSaveWinRMPassword struct {
diff --git a/builder/azure/dtl/step_test.go b/builder/azure/dtl/step_test.go
index 71ebb2b7a..1dedc7e85 100644
--- a/builder/azure/dtl/step_test.go
+++ b/builder/azure/dtl/step_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/azure/common/constants"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestProcessStepResultShouldContinueForNonErrors(t *testing.T) {
diff --git a/builder/azure/dtl/template_funcs.go b/builder/azure/dtl/template_funcs.go
index d76eda267..0bb93fa08 100644
--- a/builder/azure/dtl/template_funcs.go
+++ b/builder/azure/dtl/template_funcs.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"text/template"
 
-	packertpl "github.com/hashicorp/packer/common/template"
+	packertpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 func isValidByteValue(b byte) bool {
diff --git a/builder/azure/dtl/tempname.go b/builder/azure/dtl/tempname.go
index b4c51d478..c5d64ac04 100644
--- a/builder/azure/dtl/tempname.go
+++ b/builder/azure/dtl/tempname.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 type TempName struct {
diff --git a/examples/azure/centos.json b/builder/azure/examples/centos.json
similarity index 100%
rename from examples/azure/centos.json
rename to builder/azure/examples/centos.json
diff --git a/examples/azure/debian-chroot.json b/builder/azure/examples/debian-chroot.json
similarity index 100%
rename from examples/azure/debian-chroot.json
rename to builder/azure/examples/debian-chroot.json
diff --git a/examples/azure/debian.json b/builder/azure/examples/debian.json
similarity index 100%
rename from examples/azure/debian.json
rename to builder/azure/examples/debian.json
diff --git a/examples/azure/freebsd-chroot.json b/builder/azure/examples/freebsd-chroot.json
similarity index 100%
rename from examples/azure/freebsd-chroot.json
rename to builder/azure/examples/freebsd-chroot.json
diff --git a/examples/azure/freebsd.json b/builder/azure/examples/freebsd.json
similarity index 100%
rename from examples/azure/freebsd.json
rename to builder/azure/examples/freebsd.json
diff --git a/examples/azure/linux_custom_image.json b/builder/azure/examples/linux_custom_image.json
similarity index 100%
rename from examples/azure/linux_custom_image.json
rename to builder/azure/examples/linux_custom_image.json
diff --git a/examples/azure/linux_custom_managed_image.json b/builder/azure/examples/linux_custom_managed_image.json
similarity index 100%
rename from examples/azure/linux_custom_managed_image.json
rename to builder/azure/examples/linux_custom_managed_image.json
diff --git a/examples/azure/marketplace_plan_info.json b/builder/azure/examples/marketplace_plan_info.json
similarity index 100%
rename from examples/azure/marketplace_plan_info.json
rename to builder/azure/examples/marketplace_plan_info.json
diff --git a/examples/azure/rhel.json b/builder/azure/examples/rhel.json
similarity index 100%
rename from examples/azure/rhel.json
rename to builder/azure/examples/rhel.json
diff --git a/examples/azure/suse.json b/builder/azure/examples/suse.json
similarity index 100%
rename from examples/azure/suse.json
rename to builder/azure/examples/suse.json
diff --git a/examples/azure/ubuntu-chroot.json b/builder/azure/examples/ubuntu-chroot.json
similarity index 100%
rename from examples/azure/ubuntu-chroot.json
rename to builder/azure/examples/ubuntu-chroot.json
diff --git a/examples/azure/ubuntu.json b/builder/azure/examples/ubuntu.json
similarity index 100%
rename from examples/azure/ubuntu.json
rename to builder/azure/examples/ubuntu.json
diff --git a/examples/azure/ubuntu_managed_image_sig.json b/builder/azure/examples/ubuntu_managed_image_sig.json
similarity index 100%
rename from examples/azure/ubuntu_managed_image_sig.json
rename to builder/azure/examples/ubuntu_managed_image_sig.json
diff --git a/examples/azure/ubuntu_quickstart.json b/builder/azure/examples/ubuntu_quickstart.json
similarity index 100%
rename from examples/azure/ubuntu_quickstart.json
rename to builder/azure/examples/ubuntu_quickstart.json
diff --git a/examples/azure/windows.json b/builder/azure/examples/windows.json
similarity index 100%
rename from examples/azure/windows.json
rename to builder/azure/examples/windows.json
diff --git a/examples/azure/windows_custom_image.json b/builder/azure/examples/windows_custom_image.json
similarity index 100%
rename from examples/azure/windows_custom_image.json
rename to builder/azure/examples/windows_custom_image.json
diff --git a/examples/azure/windows_quickstart.json b/builder/azure/examples/windows_quickstart.json
similarity index 100%
rename from examples/azure/windows_quickstart.json
rename to builder/azure/examples/windows_quickstart.json
diff --git a/builder/azure/version/version.go b/builder/azure/version/version.go
new file mode 100644
index 000000000..a0d76ec4d
--- /dev/null
+++ b/builder/azure/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AzurePluginVersion *version.PluginVersion
+
+func init() {
+	AzurePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/cloudstack/builder.go b/builder/cloudstack/builder.go
index c7454d0a2..9dde567e3 100644
--- a/builder/cloudstack/builder.go
+++ b/builder/cloudstack/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
@@ -60,7 +60,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	// Build the steps.
 	steps := []multistep.Step{
 		&stepPrepareConfig{},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -85,8 +85,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SSHPort:   commPort,
 			WinRMPort: commPort,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		&stepShutdownInstance{},
@@ -94,7 +94,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Configure the runner and run the steps.
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/cloudstack/config.go b/builder/cloudstack/config.go
index 183b6f6d5..0d05c3325 100644
--- a/builder/cloudstack/config.go
+++ b/builder/cloudstack/config.go
@@ -9,19 +9,20 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // Config holds all the details needed to configure the builder.
 type Config struct {
-	common.PackerConfig `mapstructure:",squash"`
-	common.HTTPConfig   `mapstructure:",squash"`
-	Comm                communicator.Config `mapstructure:",squash"`
+	common.PackerConfig    `mapstructure:",squash"`
+	commonsteps.HTTPConfig `mapstructure:",squash"`
+	Comm                   communicator.Config `mapstructure:",squash"`
 
 	// The CloudStack API endpoint we will connect to. It can
 	// also be specified via environment variable CLOUDSTACK_API_URL, if set.
diff --git a/builder/cloudstack/config.hcl2spec.go b/builder/cloudstack/config.hcl2spec.go
index 5c2313af3..2fc182ae3 100644
--- a/builder/cloudstack/config.hcl2spec.go
+++ b/builder/cloudstack/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -126,6 +127,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/cloudstack/ssh.go b/builder/cloudstack/ssh.go
index 269c2a583..3be57e3e9 100644
--- a/builder/cloudstack/ssh.go
+++ b/builder/cloudstack/ssh.go
@@ -3,7 +3,7 @@ package cloudstack
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func commPort(state multistep.StateBag) (int, error) {
diff --git a/builder/cloudstack/step_configure_networking.go b/builder/cloudstack/step_configure_networking.go
index 17ee7d92f..7de5a0a35 100644
--- a/builder/cloudstack/step_configure_networking.go
+++ b/builder/cloudstack/step_configure_networking.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_create_instance.go b/builder/cloudstack/step_create_instance.go
index 3a6b3d2c3..682f0659b 100644
--- a/builder/cloudstack/step_create_instance.go
+++ b/builder/cloudstack/step_create_instance.go
@@ -8,9 +8,9 @@ import (
 	"net"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_create_security_group.go b/builder/cloudstack/step_create_security_group.go
index e8a1f1818..e479d0558 100644
--- a/builder/cloudstack/step_create_security_group.go
+++ b/builder/cloudstack/step_create_security_group.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_create_template.go b/builder/cloudstack/step_create_template.go
index 4b72d206d..f3f0ad03f 100644
--- a/builder/cloudstack/step_create_template.go
+++ b/builder/cloudstack/step_create_template.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_detach_iso.go b/builder/cloudstack/step_detach_iso.go
index 444293c2c..9e0a17d7c 100644
--- a/builder/cloudstack/step_detach_iso.go
+++ b/builder/cloudstack/step_detach_iso.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_keypair.go b/builder/cloudstack/step_keypair.go
index b47655596..41761c976 100644
--- a/builder/cloudstack/step_keypair.go
+++ b/builder/cloudstack/step_keypair.go
@@ -7,8 +7,8 @@ import (
 	"runtime"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_prepare_config.go b/builder/cloudstack/step_prepare_config.go
index 7c6e1a4ff..f7cbcd637 100644
--- a/builder/cloudstack/step_prepare_config.go
+++ b/builder/cloudstack/step_prepare_config.go
@@ -6,8 +6,8 @@ import (
 	"io/ioutil"
 	"regexp"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/step_shutdown_instance.go b/builder/cloudstack/step_shutdown_instance.go
index 77186e13b..c14a41f82 100644
--- a/builder/cloudstack/step_shutdown_instance.go
+++ b/builder/cloudstack/step_shutdown_instance.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/xanzy/go-cloudstack/cloudstack"
 )
 
diff --git a/builder/cloudstack/version/version.go b/builder/cloudstack/version/version.go
new file mode 100644
index 000000000..69744c9c7
--- /dev/null
+++ b/builder/cloudstack/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var CloudstackPluginVersion *version.PluginVersion
+
+func init() {
+	CloudstackPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/digitalocean/builder.go b/builder/digitalocean/builder.go
index b4492d7d5..76cf9fbc3 100644
--- a/builder/digitalocean/builder.go
+++ b/builder/digitalocean/builder.go
@@ -11,10 +11,10 @@ import (
 
 	"github.com/digitalocean/godo"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"golang.org/x/oauth2"
 )
 
@@ -91,8 +91,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      communicator.CommHost(b.config.Comm.Host(), "droplet_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		new(stepShutdown),
@@ -103,7 +103,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/digitalocean/builder_test.go b/builder/digitalocean/builder_test.go
index 5113495cf..a767d52b9 100644
--- a/builder/digitalocean/builder_test.go
+++ b/builder/digitalocean/builder_test.go
@@ -362,3 +362,55 @@ func TestBuilderPrepare_DropletName(t *testing.T) {
 	}
 
 }
+
+func TestBuilderPrepare_VPCUUID(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	// Test with the case vpc_uuid is defined but private_networking is not enabled
+	config["vpc_uuid"] = "554c41b3-425f-5403-8860-7f24fb108098"
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatalf("should have error: 'private networking should be enabled to use vpc_uuid'")
+	}
+
+	// Test with the case both vpc_uuid and private_networking are defined/enabled
+	config["private_networking"] = true
+	b = Builder{}
+	_, warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatal("should not have error")
+	}
+}
+
+func TestBuilderPrepare_ConnectWithPrivateIP(t *testing.T) {
+	var b Builder
+	config := testConfig()
+
+	// Test with the case connect_with_private_ip is defined but private_networking is not enabled
+	config["connect_with_private_ip"] = true
+	_, warnings, err := b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err == nil {
+		t.Fatalf("should have error: 'private networking should be enabled to use connect_with_private_ip'")
+	}
+
+	// Test with the case both connect_with_private_ip and private_networking are enabled
+	config["private_networking"] = true
+	b = Builder{}
+	_, warnings, err = b.Prepare(config)
+	if len(warnings) > 0 {
+		t.Fatalf("bad: %#v", warnings)
+	}
+	if err != nil {
+		t.Fatal("should not have error")
+	}
+}
diff --git a/builder/digitalocean/config.go b/builder/digitalocean/config.go
index 37ff5640c..958b04f66 100644
--- a/builder/digitalocean/config.go
+++ b/builder/digitalocean/config.go
@@ -10,12 +10,12 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/mapstructure"
 )
 
@@ -85,6 +85,14 @@ type Config struct {
 	UserDataFile string `mapstructure:"user_data_file" required:"false"`
 	// Tags to apply to the droplet when it is created
 	Tags []string `mapstructure:"tags" required:"false"`
+	// UUID of the VPC which the droplet will be created in. Before using this,
+	// private_networking should be enabled.
+	VPCUUID string `mapstructure:"vpc_uuid" required:"false"`
+	// Wheter the communicators should use private IP or not (public IP in that case).
+	// If the droplet is or going to be accessible only from the local network because
+	// it is at behind a firewall, then communicators should use the private IP
+	// instead of the public IP. Before using this, private_networking should be enabled.
+	ConnectWithPrivateIP bool `mapstructure:"connect_with_private_ip" required:"false"`
 
 	ctx interpolate.Context
 }
@@ -187,6 +195,20 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 		}
 	}
 
+	// Check if the PrivateNetworking is enabled by user before use VPC UUID
+	if c.VPCUUID != "" {
+		if c.PrivateNetworking != true {
+			errs = packer.MultiErrorAppend(errs, errors.New("private networking should be enabled to use vpc_uuid"))
+		}
+	}
+
+	// Check if the PrivateNetworking is enabled by user before use ConnectWithPrivateIP
+	if c.ConnectWithPrivateIP == true {
+		if c.PrivateNetworking != true {
+			errs = packer.MultiErrorAppend(errs, errors.New("private networking should be enabled to use connect_with_private_ip"))
+		}
+	}
+
 	if errs != nil && len(errs.Errors) > 0 {
 		return nil, errs
 	}
diff --git a/builder/digitalocean/config.hcl2spec.go b/builder/digitalocean/config.hcl2spec.go
index 4bcc78324..ef07b3626 100644
--- a/builder/digitalocean/config.hcl2spec.go
+++ b/builder/digitalocean/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -81,6 +82,8 @@ type FlatConfig struct {
 	UserData                  *string           `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
 	UserDataFile              *string           `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
 	Tags                      []string          `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
+	VPCUUID                   *string           `mapstructure:"vpc_uuid" required:"false" cty:"vpc_uuid" hcl:"vpc_uuid"`
+	ConnectWithPrivateIP      *bool             `mapstructure:"connect_with_private_ip" required:"false" cty:"connect_with_private_ip" hcl:"connect_with_private_ip"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -97,6 +100,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -167,6 +171,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"user_data":                    &hcldec.AttrSpec{Name: "user_data", Type: cty.String, Required: false},
 		"user_data_file":               &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false},
 		"tags":                         &hcldec.AttrSpec{Name: "tags", Type: cty.List(cty.String), Required: false},
+		"vpc_uuid":                     &hcldec.AttrSpec{Name: "vpc_uuid", Type: cty.String, Required: false},
+		"connect_with_private_ip":      &hcldec.AttrSpec{Name: "connect_with_private_ip", Type: cty.Bool, Required: false},
 	}
 	return s
 }
diff --git a/builder/digitalocean/step_create_droplet.go b/builder/digitalocean/step_create_droplet.go
index e246abf5e..e24a4de46 100644
--- a/builder/digitalocean/step_create_droplet.go
+++ b/builder/digitalocean/step_create_droplet.go
@@ -9,8 +9,8 @@ import (
 	"io/ioutil"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateDroplet struct {
@@ -52,6 +52,7 @@ func (s *stepCreateDroplet) Run(ctx context.Context, state multistep.StateBag) m
 		IPv6:              c.IPv6,
 		UserData:          userData,
 		Tags:              c.Tags,
+		VPCUUID:           c.VPCUUID,
 	}
 
 	log.Printf("[DEBUG] Droplet create paramaters: %s", godo.Stringify(dropletCreateReq))
diff --git a/builder/digitalocean/step_create_ssh_key.go b/builder/digitalocean/step_create_ssh_key.go
index 40b6c115d..36eaf0ed3 100644
--- a/builder/digitalocean/step_create_ssh_key.go
+++ b/builder/digitalocean/step_create_ssh_key.go
@@ -12,9 +12,9 @@ import (
 	"runtime"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/digitalocean/step_droplet_info.go b/builder/digitalocean/step_droplet_info.go
index dc7a9ed8a..44e5f5e4e 100644
--- a/builder/digitalocean/step_droplet_info.go
+++ b/builder/digitalocean/step_droplet_info.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepDropletInfo struct{}
@@ -46,10 +46,11 @@ func (s *stepDropletInfo) Run(ctx context.Context, state multistep.StateBag) mul
 		return multistep.ActionHalt
 	}
 
-	// Find a public IPv4 network
+	// Find the ip address which will be used by communicator
 	foundNetwork := false
 	for _, network := range droplet.Networks.V4 {
-		if network.Type == "public" {
+		if (c.ConnectWithPrivateIP && network.Type == "private") ||
+			(!(c.ConnectWithPrivateIP) && network.Type == "public") {
 			state.Put("droplet_ip", network.IPAddress)
 			foundNetwork = true
 			break
diff --git a/builder/digitalocean/step_power_off.go b/builder/digitalocean/step_power_off.go
index fab35569a..f75fe898b 100644
--- a/builder/digitalocean/step_power_off.go
+++ b/builder/digitalocean/step_power_off.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepPowerOff struct{}
diff --git a/builder/digitalocean/step_shutdown.go b/builder/digitalocean/step_shutdown.go
index 339e034b7..8076ad539 100644
--- a/builder/digitalocean/step_shutdown.go
+++ b/builder/digitalocean/step_shutdown.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepShutdown struct{}
diff --git a/builder/digitalocean/step_snapshot.go b/builder/digitalocean/step_snapshot.go
index 511c3a377..b28a5e38c 100644
--- a/builder/digitalocean/step_snapshot.go
+++ b/builder/digitalocean/step_snapshot.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/digitalocean/godo"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepSnapshot struct {
diff --git a/builder/digitalocean/version/version.go b/builder/digitalocean/version/version.go
new file mode 100644
index 000000000..bceba8ddd
--- /dev/null
+++ b/builder/digitalocean/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DockerPluginVersion *version.PluginVersion
+
+func init() {
+	DockerPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/docker/builder.go b/builder/docker/builder.go
index a3f807da4..87b29680e 100644
--- a/builder/docker/builder.go
+++ b/builder/docker/builder.go
@@ -5,11 +5,11 @@ import (
 	"log"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 const (
@@ -52,7 +52,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("config", &b.config)
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	// Setup the driver that will talk to Docker
 	state.Put("driver", driver)
@@ -70,8 +70,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				"dockerWindowsContainer": &StepConnectDocker{},
 			},
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 	}
@@ -93,7 +93,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/docker/comm.go b/builder/docker/comm.go
index 6feabc3b2..dbc4198fb 100644
--- a/builder/docker/comm.go
+++ b/builder/docker/comm.go
@@ -3,7 +3,7 @@ package docker
 import (
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func commHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/docker/communicator_test.go b/builder/docker/communicator_test.go
index afaa5e60f..6abba8cd5 100644
--- a/builder/docker/communicator_test.go
+++ b/builder/docker/communicator_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 	"github.com/hashicorp/packer/provisioner/file"
 	"github.com/hashicorp/packer/provisioner/shell"
-	"github.com/hashicorp/packer/template"
 )
 
 // TestUploadDownload verifies that basic upload / download functionality works
diff --git a/builder/docker/config.go b/builder/docker/config.go
index aa0b785e4..5fe0e8b54 100644
--- a/builder/docker/config.go
+++ b/builder/docker/config.go
@@ -7,11 +7,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/docker/config.hcl2spec.go b/builder/docker/config.hcl2spec.go
index 1c650d8d3..c0472c3bb 100644
--- a/builder/docker/config.hcl2spec.go
+++ b/builder/docker/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -110,6 +111,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/docker/driver_docker.go b/builder/docker/driver_docker.go
index ba5693b91..81058a754 100644
--- a/builder/docker/driver_docker.go
+++ b/builder/docker/driver_docker.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type DockerDriver struct {
diff --git a/builder/docker/exec.go b/builder/docker/exec.go
index e04461bb6..309fdcc5d 100644
--- a/builder/docker/exec.go
+++ b/builder/docker/exec.go
@@ -3,8 +3,8 @@ package docker
 import (
 	"os/exec"
 
-	"github.com/hashicorp/packer/helper/builder/localexec"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
 )
 
 func runAndStream(cmd *exec.Cmd, ui packer.Ui) error {
diff --git a/builder/docker/step_commit.go b/builder/docker/step_commit.go
index 33ccb090b..ca5948336 100644
--- a/builder/docker/step_commit.go
+++ b/builder/docker/step_commit.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCommit commits the container to a image.
diff --git a/builder/docker/step_commit_test.go b/builder/docker/step_commit_test.go
index 16548b069..c7c9e7067 100644
--- a/builder/docker/step_commit_test.go
+++ b/builder/docker/step_commit_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testStepCommitState(t *testing.T) multistep.StateBag {
diff --git a/builder/docker/step_connect_docker.go b/builder/docker/step_connect_docker.go
index 0d064b269..bff5108eb 100644
--- a/builder/docker/step_connect_docker.go
+++ b/builder/docker/step_connect_docker.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepConnectDocker struct{}
diff --git a/builder/docker/step_export.go b/builder/docker/step_export.go
index 99a8a1d11..107761ce8 100644
--- a/builder/docker/step_export.go
+++ b/builder/docker/step_export.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepExport exports the container to a flat tar file.
diff --git a/builder/docker/step_export_test.go b/builder/docker/step_export_test.go
index aa3fd124b..cdffcc4b6 100644
--- a/builder/docker/step_export_test.go
+++ b/builder/docker/step_export_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testStepExportState(t *testing.T) multistep.StateBag {
diff --git a/builder/docker/step_pull.go b/builder/docker/step_pull.go
index d2cf3cdda..b18d01444 100644
--- a/builder/docker/step_pull.go
+++ b/builder/docker/step_pull.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPull struct{}
diff --git a/builder/docker/step_pull_test.go b/builder/docker/step_pull_test.go
index b01b42107..c921612dd 100644
--- a/builder/docker/step_pull_test.go
+++ b/builder/docker/step_pull_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepPull_impl(t *testing.T) {
diff --git a/builder/docker/step_run.go b/builder/docker/step_run.go
index 89f953dd2..ce9c46a40 100644
--- a/builder/docker/step_run.go
+++ b/builder/docker/step_run.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRun struct {
diff --git a/builder/docker/step_run_test.go b/builder/docker/step_run_test.go
index c76c7c637..cc5908951 100644
--- a/builder/docker/step_run_test.go
+++ b/builder/docker/step_run_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testStepRunState(t *testing.T) multistep.StateBag {
diff --git a/builder/docker/step_set_generated_data.go b/builder/docker/step_set_generated_data.go
index 5ab9df8b9..9576cab17 100644
--- a/builder/docker/step_set_generated_data.go
+++ b/builder/docker/step_set_generated_data.go
@@ -3,12 +3,12 @@ package docker
 import (
 	"context"
 
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 type StepSetGeneratedData struct {
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func (s *StepSetGeneratedData) Run(_ context.Context, state multistep.StateBag) multistep.StepAction {
diff --git a/builder/docker/step_set_generated_data_test.go b/builder/docker/step_set_generated_data_test.go
index b1e5e2bea..930956095 100644
--- a/builder/docker/step_set_generated_data_test.go
+++ b/builder/docker/step_set_generated_data_test.go
@@ -4,14 +4,14 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 func TestStepSetGeneratedData_Run(t *testing.T) {
 	state := testState(t)
 	step := new(StepSetGeneratedData)
-	step.GeneratedData = &builder.GeneratedData{State: state}
+	step.GeneratedData = &packerbuilderdata.GeneratedData{State: state}
 	driver := state.Get("driver").(*MockDriver)
 	driver.Sha256Result = "80B3BB1B1696E73A9B19DEEF92F664F8979F948DF348088B61F9A3477655AF64"
 	state.Put("image_id", "12345")
@@ -33,7 +33,7 @@ func TestStepSetGeneratedData_Run(t *testing.T) {
 
 	// Image ID not implement
 	state = testState(t)
-	step.GeneratedData = &builder.GeneratedData{State: state}
+	step.GeneratedData = &packerbuilderdata.GeneratedData{State: state}
 	driver = state.Get("driver").(*MockDriver)
 	notImplementedMsg := "ERR_IMAGE_SHA256_NOT_FOUND"
 
diff --git a/builder/docker/step_temp_dir.go b/builder/docker/step_temp_dir.go
index 39808cdd2..9879939d7 100644
--- a/builder/docker/step_temp_dir.go
+++ b/builder/docker/step_temp_dir.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepTempDir creates a temporary directory that we use in order to
diff --git a/builder/docker/step_temp_dir_test.go b/builder/docker/step_temp_dir_test.go
index ee7245150..d58906df9 100644
--- a/builder/docker/step_temp_dir_test.go
+++ b/builder/docker/step_temp_dir_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepTempDir_impl(t *testing.T) {
diff --git a/builder/docker/step_test.go b/builder/docker/step_test.go
index 0c7d56649..b048c3f6e 100644
--- a/builder/docker/step_test.go
+++ b/builder/docker/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/docker/version/version.go b/builder/docker/version/version.go
new file mode 100644
index 000000000..56302680d
--- /dev/null
+++ b/builder/docker/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DigitalOceanPluginVersion *version.PluginVersion
+
+func init() {
+	DigitalOceanPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/file/builder.go b/builder/file/builder.go
index 0f5b78734..f2a8d2969 100644
--- a/builder/file/builder.go
+++ b/builder/file/builder.go
@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const BuilderId = "packer.file"
diff --git a/builder/file/config.go b/builder/file/config.go
index 730c497f5..5560f73e5 100644
--- a/builder/file/config.go
+++ b/builder/file/config.go
@@ -5,10 +5,10 @@ package file
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 var ErrTargetRequired = fmt.Errorf("target required")
diff --git a/builder/file/config.hcl2spec.go b/builder/file/config.hcl2spec.go
index dc6e144e3..28d36410f 100644
--- a/builder/file/config.hcl2spec.go
+++ b/builder/file/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -35,6 +36,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/file/version/version.go b/builder/file/version/version.go
new file mode 100644
index 000000000..e99f8c173
--- /dev/null
+++ b/builder/file/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var FilePluginVersion *version.PluginVersion
+
+func init() {
+	FilePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/generated_data.go b/builder/generated_data.go
deleted file mode 100644
index 9b84c8d2a..000000000
--- a/builder/generated_data.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package builder
-
-import "github.com/hashicorp/packer/helper/multistep"
-
-// GeneratedData manages variables exported by a builder after
-// it started. It uses the builder's multistep.StateBag internally, make sure it
-// is not nil before calling any functions.
-type GeneratedData struct {
-	// The builder's StateBag
-	State multistep.StateBag
-}
-
-func (gd *GeneratedData) Put(key string, data interface{}) {
-	genData := make(map[string]interface{})
-	if _, ok := gd.State.GetOk("generated_data"); ok {
-		genData = gd.State.Get("generated_data").(map[string]interface{})
-	}
-	genData[key] = data
-	gd.State.Put("generated_data", genData)
-}
diff --git a/builder/googlecompute/builder.go b/builder/googlecompute/builder.go
index 74df7f53d..f3b73d0ef 100644
--- a/builder/googlecompute/builder.go
+++ b/builder/googlecompute/builder.go
@@ -8,10 +8,10 @@ import (
 	"log"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // The unique ID for this builder.
@@ -95,8 +95,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SSHConfig:   b.config.Comm.SSHConfigFunc(),
 			WinRMConfig: winrmConfig,
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 	}
@@ -106,7 +106,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	steps = append(steps, new(StepTeardownInstance), new(StepCreateImage))
 
 	// Run the steps.
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/googlecompute/config.go b/builder/googlecompute/config.go
index 055cd2a28..cdf4581e5 100644
--- a/builder/googlecompute/config.go
+++ b/builder/googlecompute/config.go
@@ -11,12 +11,12 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	compute "google.golang.org/api/compute/v1"
 )
 
diff --git a/builder/googlecompute/config.hcl2spec.go b/builder/googlecompute/config.hcl2spec.go
index ca9064ca4..c235087f0 100644
--- a/builder/googlecompute/config.hcl2spec.go
+++ b/builder/googlecompute/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName              *string                    `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType            *string                    `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion            *string                    `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                  *bool                      `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                  *bool                      `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                *string                    `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -133,6 +134,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":               &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":             &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":             &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                    &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                    &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                 &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/googlecompute/driver_gce.go b/builder/googlecompute/driver_gce.go
index e1a558713..5ade084c2 100644
--- a/builder/googlecompute/driver_gce.go
+++ b/builder/googlecompute/driver_gce.go
@@ -17,9 +17,10 @@ import (
 	"google.golang.org/api/option"
 	oslogin "google.golang.org/api/oslogin/v1"
 
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/useragent"
+	"github.com/hashicorp/packer/builder/googlecompute/version"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
 	vaultapi "github.com/hashicorp/vault/api"
 
 	"golang.org/x/oauth2"
@@ -146,7 +147,7 @@ func NewDriverGCE(config GCEDriverConfig) (Driver, error) {
 	}
 
 	// Set UserAgent
-	service.UserAgent = useragent.String()
+	service.UserAgent = useragent.String(version.GCEPluginVersion.FormattedVersion())
 
 	return &driverGCE{
 		projectId:      config.ProjectId,
diff --git a/builder/googlecompute/step_check_existing_image.go b/builder/googlecompute/step_check_existing_image.go
index 0574a0234..faabae456 100644
--- a/builder/googlecompute/step_check_existing_image.go
+++ b/builder/googlecompute/step_check_existing_image.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCheckExistingImage represents a Packer build step that checks if the
diff --git a/builder/googlecompute/step_check_existing_image_test.go b/builder/googlecompute/step_check_existing_image_test.go
index d4b9a9541..162d6188b 100644
--- a/builder/googlecompute/step_check_existing_image_test.go
+++ b/builder/googlecompute/step_check_existing_image_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCheckExistingImage_impl(t *testing.T) {
diff --git a/builder/googlecompute/step_create_image.go b/builder/googlecompute/step_create_image.go
index 0de8211b0..0c37d6acf 100644
--- a/builder/googlecompute/step_create_image.go
+++ b/builder/googlecompute/step_create_image.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCreateImage represents a Packer build step that creates GCE machine
diff --git a/builder/googlecompute/step_create_image_test.go b/builder/googlecompute/step_create_image_test.go
index 2a3017f0a..f8084412c 100644
--- a/builder/googlecompute/step_create_image_test.go
+++ b/builder/googlecompute/step_create_image_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/googlecompute/step_create_instance.go b/builder/googlecompute/step_create_instance.go
index 6c892da60..371fee64a 100644
--- a/builder/googlecompute/step_create_instance.go
+++ b/builder/googlecompute/step_create_instance.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCreateInstance represents a Packer build step that creates GCE instances.
diff --git a/builder/googlecompute/step_create_instance_test.go b/builder/googlecompute/step_create_instance_test.go
index 82ccfe881..42fa74d8c 100644
--- a/builder/googlecompute/step_create_instance_test.go
+++ b/builder/googlecompute/step_create_instance_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/googlecompute/step_create_windows_password.go b/builder/googlecompute/step_create_windows_password.go
index 6f1aeb22f..d86116091 100644
--- a/builder/googlecompute/step_create_windows_password.go
+++ b/builder/googlecompute/step_create_windows_password.go
@@ -13,8 +13,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCreateWindowsPassword represents a Packer build step that sets the windows password on a Windows GCE instance.
diff --git a/builder/googlecompute/step_create_windows_password_test.go b/builder/googlecompute/step_create_windows_password_test.go
index 6abb6243d..03dd188dd 100644
--- a/builder/googlecompute/step_create_windows_password_test.go
+++ b/builder/googlecompute/step_create_windows_password_test.go
@@ -6,7 +6,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"testing"
 )
diff --git a/builder/googlecompute/step_import_os_login_ssh_key.go b/builder/googlecompute/step_import_os_login_ssh_key.go
index 84bfb8b8c..833e73fb0 100644
--- a/builder/googlecompute/step_import_os_login_ssh_key.go
+++ b/builder/googlecompute/step_import_os_login_ssh_key.go
@@ -6,8 +6,8 @@ import (
 	"encoding/hex"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"google.golang.org/api/oauth2/v2"
 )
 
diff --git a/builder/googlecompute/step_import_os_login_ssh_key_test.go b/builder/googlecompute/step_import_os_login_ssh_key_test.go
index f31df1b0d..0ed20bb1a 100644
--- a/builder/googlecompute/step_import_os_login_ssh_key_test.go
+++ b/builder/googlecompute/step_import_os_login_ssh_key_test.go
@@ -6,7 +6,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"google.golang.org/api/oauth2/v2"
 )
 
diff --git a/builder/googlecompute/step_instance_info.go b/builder/googlecompute/step_instance_info.go
index b36d2f1d8..cd388df9f 100644
--- a/builder/googlecompute/step_instance_info.go
+++ b/builder/googlecompute/step_instance_info.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepInstanceInfo represents a Packer build step that gathers GCE instance info.
diff --git a/builder/googlecompute/step_instance_info_test.go b/builder/googlecompute/step_instance_info_test.go
index 7435df7fc..502bbedfd 100644
--- a/builder/googlecompute/step_instance_info_test.go
+++ b/builder/googlecompute/step_instance_info_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepInstanceInfo_impl(t *testing.T) {
diff --git a/builder/googlecompute/step_start_tunnel.go b/builder/googlecompute/step_start_tunnel.go
index 4b74a2e4e..bda9e8d32 100644
--- a/builder/googlecompute/step_start_tunnel.go
+++ b/builder/googlecompute/step_start_tunnel.go
@@ -18,12 +18,12 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // StepStartTunnel represents a Packer build step that launches an IAP tunnel
diff --git a/builder/googlecompute/step_teardown_instance.go b/builder/googlecompute/step_teardown_instance.go
index e7757862b..b545634f4 100644
--- a/builder/googlecompute/step_teardown_instance.go
+++ b/builder/googlecompute/step_teardown_instance.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepTeardownInstance represents a Packer build step that tears down GCE
diff --git a/builder/googlecompute/step_teardown_instance_test.go b/builder/googlecompute/step_teardown_instance_test.go
index 129c4e596..96db676f6 100644
--- a/builder/googlecompute/step_teardown_instance_test.go
+++ b/builder/googlecompute/step_teardown_instance_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepTeardownInstance_impl(t *testing.T) {
diff --git a/builder/googlecompute/step_test.go b/builder/googlecompute/step_test.go
index a50bde49f..db9ff3dab 100644
--- a/builder/googlecompute/step_test.go
+++ b/builder/googlecompute/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/googlecompute/step_wait_startup_script.go b/builder/googlecompute/step_wait_startup_script.go
index 8bde22f7e..25c64988b 100644
--- a/builder/googlecompute/step_wait_startup_script.go
+++ b/builder/googlecompute/step_wait_startup_script.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type StepWaitStartupScript int
diff --git a/builder/googlecompute/step_wait_startup_script_test.go b/builder/googlecompute/step_wait_startup_script_test.go
index 0bbe242ba..0e783f8dd 100644
--- a/builder/googlecompute/step_wait_startup_script_test.go
+++ b/builder/googlecompute/step_wait_startup_script_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/googlecompute/version/version.go b/builder/googlecompute/version/version.go
new file mode 100644
index 000000000..55050dfae
--- /dev/null
+++ b/builder/googlecompute/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var GCEPluginVersion *version.PluginVersion
+
+func init() {
+	GCEPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/googlecompute/winrm.go b/builder/googlecompute/winrm.go
index 767787401..7d5370866 100644
--- a/builder/googlecompute/winrm.go
+++ b/builder/googlecompute/winrm.go
@@ -2,7 +2,7 @@ package googlecompute
 
 import (
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // winrmConfig returns the WinRM configuration.
diff --git a/builder/hcloud/builder.go b/builder/hcloud/builder.go
index be311e7bc..f46b62c33 100644
--- a/builder/hcloud/builder.go
+++ b/builder/hcloud/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 )
 
@@ -61,15 +61,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      getServerIP,
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		&stepShutdownServer{},
 		&stepCreateSnapshot{},
 	}
 	// Run the steps
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 	// If there was an error, return that
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/hcloud/config.go b/builder/hcloud/config.go
index 878c7cc1f..55d31e799 100644
--- a/builder/hcloud/config.go
+++ b/builder/hcloud/config.go
@@ -8,13 +8,13 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 	"github.com/mitchellh/mapstructure"
 )
diff --git a/builder/hcloud/config.hcl2spec.go b/builder/hcloud/config.hcl2spec.go
index b39fdcbe3..1b8430684 100644
--- a/builder/hcloud/config.hcl2spec.go
+++ b/builder/hcloud/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -95,6 +96,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/hcloud/step_create_server.go b/builder/hcloud/step_create_server.go
index f0d2f863a..05d84407a 100644
--- a/builder/hcloud/step_create_server.go
+++ b/builder/hcloud/step_create_server.go
@@ -7,8 +7,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 )
 
diff --git a/builder/hcloud/step_create_snapshot.go b/builder/hcloud/step_create_snapshot.go
index f2365fc1e..26550d66e 100644
--- a/builder/hcloud/step_create_snapshot.go
+++ b/builder/hcloud/step_create_snapshot.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 )
 
diff --git a/builder/hcloud/step_create_sshkey.go b/builder/hcloud/step_create_sshkey.go
index d1c98da4f..fa6a05e68 100644
--- a/builder/hcloud/step_create_sshkey.go
+++ b/builder/hcloud/step_create_sshkey.go
@@ -11,9 +11,9 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 	"golang.org/x/crypto/ssh"
 )
diff --git a/builder/hcloud/step_shutdown_server.go b/builder/hcloud/step_shutdown_server.go
index 4aafd5852..25cba2de8 100644
--- a/builder/hcloud/step_shutdown_server.go
+++ b/builder/hcloud/step_shutdown_server.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/hetznercloud/hcloud-go/hcloud"
 )
 
diff --git a/builder/hcloud/version/version.go b/builder/hcloud/version/version.go
new file mode 100644
index 000000000..34734bb27
--- /dev/null
+++ b/builder/hcloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var HcloudPluginVersion *version.PluginVersion
+
+func init() {
+	HcloudPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/hyperone/builder.go b/builder/hyperone/builder.go
index 525db4abf..d1cb42047 100644
--- a/builder/hyperone/builder.go
+++ b/builder/hyperone/builder.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
@@ -91,13 +91,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		)
 	} else {
 		steps = append(steps,
-			&common.StepProvision{},
+			&commonsteps.StepProvision{},
 			&stepStopVM{},
 			&stepCreateImage{},
 		)
 	}
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/hyperone/config.go b/builder/hyperone/config.go
index 8f9b32aab..7f5cd520e 100644
--- a/builder/hyperone/config.go
+++ b/builder/hyperone/config.go
@@ -10,15 +10,14 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/json"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/go-homedir"
 	"github.com/mitchellh/mapstructure"
 )
@@ -67,7 +66,7 @@ type Config struct {
 	// block containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	ImageTag hcl2template.KeyValues `mapstructure:"image_tag" required:"false"`
+	ImageTag config.KeyValues `mapstructure:"image_tag" required:"false"`
 	// The service of the resulting image.
 	ImageService string `mapstructure:"image_service" required:"false"`
 	// ID or name of the type this server should be created with.
@@ -80,7 +79,7 @@ type Config struct {
 	// containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	VmTag hcl2template.NameValues `mapstructure:"vm_tag" required:"false"`
+	VmTag config.NameValues `mapstructure:"vm_tag" required:"false"`
 	// The name of the created disk.
 	DiskName string `mapstructure:"disk_name" required:"false"`
 	// The type of the created disk. Defaults to ssd.
diff --git a/builder/hyperone/config.hcl2spec.go b/builder/hyperone/config.hcl2spec.go
index dc7a137a4..24cfca117 100644
--- a/builder/hyperone/config.hcl2spec.go
+++ b/builder/hyperone/config.hcl2spec.go
@@ -3,105 +3,106 @@ package hyperone
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName           *string                      `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
-	PackerBuilderType         *string                      `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug               *bool                        `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce               *bool                        `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError             *string                      `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars            map[string]string            `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars       []string                     `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	Type                      *string                      `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect        *string                      `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                   *string                      `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                   *int                         `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername               *string                      `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword               *string                      `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName            *string                      `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName   *string                      `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	SSHTemporaryKeyPairType   *string                      `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits   *int                         `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                []string                     `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys    *bool                        `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos               []string                     `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile         *string                      `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile        *string                      `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                    *bool                        `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                *string                      `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout            *string                      `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth              *bool                        `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding *bool                        `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts      *int                         `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost            *string                      `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort            *int                         `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth       *bool                        `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername        *string                      `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword        *string                      `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive     *bool                        `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile  *string                      `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile *string                      `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod     *string                      `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost              *string                      `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort              *int                         `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername          *string                      `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword          *string                      `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval      *string                      `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout       *string                      `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels          []string                     `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels           []string                     `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey              []byte                       `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey             []byte                       `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                 *string                      `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword             *string                      `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                 *string                      `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy              *bool                        `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                 *int                         `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout              *string                      `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL               *bool                        `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure             *bool                        `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM              *bool                        `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	APIURL                    *string                      `mapstructure:"api_url" required:"false" cty:"api_url" hcl:"api_url"`
-	Token                     *string                      `mapstructure:"token" required:"true" cty:"token" hcl:"token"`
-	Project                   *string                      `mapstructure:"project" required:"true" cty:"project" hcl:"project"`
-	TokenLogin                *string                      `mapstructure:"token_login" required:"false" cty:"token_login" hcl:"token_login"`
-	StateTimeout              *string                      `mapstructure:"state_timeout" required:"false" cty:"state_timeout" hcl:"state_timeout"`
-	SourceImage               *string                      `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"`
-	ImageName                 *string                      `mapstructure:"image_name" required:"false" cty:"image_name" hcl:"image_name"`
-	ImageDescription          *string                      `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
-	ImageTags                 map[string]string            `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"`
-	ImageTag                  []hcl2template.FlatKeyValue  `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"`
-	ImageService              *string                      `mapstructure:"image_service" required:"false" cty:"image_service" hcl:"image_service"`
-	VmType                    *string                      `mapstructure:"vm_type" required:"true" cty:"vm_type" hcl:"vm_type"`
-	VmName                    *string                      `mapstructure:"vm_name" required:"false" cty:"vm_name" hcl:"vm_name"`
-	VmTags                    map[string]string            `mapstructure:"vm_tags" required:"false" cty:"vm_tags" hcl:"vm_tags"`
-	VmTag                     []hcl2template.FlatNameValue `mapstructure:"vm_tag" required:"false" cty:"vm_tag" hcl:"vm_tag"`
-	DiskName                  *string                      `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"`
-	DiskType                  *string                      `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"`
-	DiskSize                  *float32                     `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"`
-	Network                   *string                      `mapstructure:"network" required:"false" cty:"network" hcl:"network"`
-	PrivateIP                 *string                      `mapstructure:"private_ip" required:"false" cty:"private_ip" hcl:"private_ip"`
-	PublicIP                  *string                      `mapstructure:"public_ip" required:"false" cty:"public_ip" hcl:"public_ip"`
-	PublicNetAdpService       *string                      `mapstructure:"public_netadp_service" required:"false" cty:"public_netadp_service" hcl:"public_netadp_service"`
-	ChrootDevice              *string                      `mapstructure:"chroot_device" cty:"chroot_device" hcl:"chroot_device"`
-	ChrootDisk                *bool                        `mapstructure:"chroot_disk" cty:"chroot_disk" hcl:"chroot_disk"`
-	ChrootDiskSize            *float32                     `mapstructure:"chroot_disk_size" cty:"chroot_disk_size" hcl:"chroot_disk_size"`
-	ChrootDiskType            *string                      `mapstructure:"chroot_disk_type" cty:"chroot_disk_type" hcl:"chroot_disk_type"`
-	ChrootMountPath           *string                      `mapstructure:"chroot_mount_path" cty:"chroot_mount_path" hcl:"chroot_mount_path"`
-	ChrootMounts              [][]string                   `mapstructure:"chroot_mounts" cty:"chroot_mounts" hcl:"chroot_mounts"`
-	ChrootCopyFiles           []string                     `mapstructure:"chroot_copy_files" cty:"chroot_copy_files" hcl:"chroot_copy_files"`
-	ChrootCommandWrapper      *string                      `mapstructure:"chroot_command_wrapper" cty:"chroot_command_wrapper" hcl:"chroot_command_wrapper"`
-	MountOptions              []string                     `mapstructure:"mount_options" cty:"mount_options" hcl:"mount_options"`
-	MountPartition            *string                      `mapstructure:"mount_partition" cty:"mount_partition" hcl:"mount_partition"`
-	PreMountCommands          []string                     `mapstructure:"pre_mount_commands" cty:"pre_mount_commands" hcl:"pre_mount_commands"`
-	PostMountCommands         []string                     `mapstructure:"post_mount_commands" cty:"post_mount_commands" hcl:"post_mount_commands"`
-	SSHKeys                   []string                     `mapstructure:"ssh_keys" required:"false" cty:"ssh_keys" hcl:"ssh_keys"`
-	UserData                  *string                      `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
+	PackerBuildName           *string                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
+	PackerBuilderType         *string                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
+	PackerDebug               *bool                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
+	PackerForce               *bool                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
+	PackerOnError             *string                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
+	PackerUserVars            map[string]string      `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
+	PackerSensitiveVars       []string               `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
+	Type                      *string                `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
+	PauseBeforeConnect        *string                `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
+	SSHHost                   *string                `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
+	SSHPort                   *int                   `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
+	SSHUsername               *string                `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
+	SSHPassword               *string                `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
+	SSHKeyPairName            *string                `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName   *string                `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
+	SSHTemporaryKeyPairType   *string                `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
+	SSHTemporaryKeyPairBits   *int                   `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
+	SSHCiphers                []string               `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
+	SSHClearAuthorizedKeys    *bool                  `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
+	SSHKEXAlgos               []string               `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
+	SSHPrivateKeyFile         *string                `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
+	SSHCertificateFile        *string                `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
+	SSHPty                    *bool                  `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
+	SSHTimeout                *string                `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
+	SSHWaitTimeout            *string                `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
+	SSHAgentAuth              *bool                  `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
+	SSHDisableAgentForwarding *bool                  `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
+	SSHHandshakeAttempts      *int                   `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
+	SSHBastionHost            *string                `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
+	SSHBastionPort            *int                   `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
+	SSHBastionAgentAuth       *bool                  `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
+	SSHBastionUsername        *string                `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
+	SSHBastionPassword        *string                `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
+	SSHBastionInteractive     *bool                  `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
+	SSHBastionPrivateKeyFile  *string                `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
+	SSHBastionCertificateFile *string                `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
+	SSHFileTransferMethod     *string                `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
+	SSHProxyHost              *string                `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
+	SSHProxyPort              *int                   `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
+	SSHProxyUsername          *string                `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
+	SSHProxyPassword          *string                `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
+	SSHKeepAliveInterval      *string                `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
+	SSHReadWriteTimeout       *string                `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
+	SSHRemoteTunnels          []string               `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
+	SSHLocalTunnels           []string               `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
+	SSHPublicKey              []byte                 `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
+	SSHPrivateKey             []byte                 `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
+	WinRMUser                 *string                `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
+	WinRMPassword             *string                `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
+	WinRMHost                 *string                `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
+	WinRMNoProxy              *bool                  `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
+	WinRMPort                 *int                   `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
+	WinRMTimeout              *string                `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
+	WinRMUseSSL               *bool                  `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
+	WinRMInsecure             *bool                  `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
+	WinRMUseNTLM              *bool                  `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
+	APIURL                    *string                `mapstructure:"api_url" required:"false" cty:"api_url" hcl:"api_url"`
+	Token                     *string                `mapstructure:"token" required:"true" cty:"token" hcl:"token"`
+	Project                   *string                `mapstructure:"project" required:"true" cty:"project" hcl:"project"`
+	TokenLogin                *string                `mapstructure:"token_login" required:"false" cty:"token_login" hcl:"token_login"`
+	StateTimeout              *string                `mapstructure:"state_timeout" required:"false" cty:"state_timeout" hcl:"state_timeout"`
+	SourceImage               *string                `mapstructure:"source_image" required:"true" cty:"source_image" hcl:"source_image"`
+	ImageName                 *string                `mapstructure:"image_name" required:"false" cty:"image_name" hcl:"image_name"`
+	ImageDescription          *string                `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
+	ImageTags                 map[string]string      `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"`
+	ImageTag                  []config.FlatKeyValue  `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"`
+	ImageService              *string                `mapstructure:"image_service" required:"false" cty:"image_service" hcl:"image_service"`
+	VmType                    *string                `mapstructure:"vm_type" required:"true" cty:"vm_type" hcl:"vm_type"`
+	VmName                    *string                `mapstructure:"vm_name" required:"false" cty:"vm_name" hcl:"vm_name"`
+	VmTags                    map[string]string      `mapstructure:"vm_tags" required:"false" cty:"vm_tags" hcl:"vm_tags"`
+	VmTag                     []config.FlatNameValue `mapstructure:"vm_tag" required:"false" cty:"vm_tag" hcl:"vm_tag"`
+	DiskName                  *string                `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"`
+	DiskType                  *string                `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"`
+	DiskSize                  *float32               `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"`
+	Network                   *string                `mapstructure:"network" required:"false" cty:"network" hcl:"network"`
+	PrivateIP                 *string                `mapstructure:"private_ip" required:"false" cty:"private_ip" hcl:"private_ip"`
+	PublicIP                  *string                `mapstructure:"public_ip" required:"false" cty:"public_ip" hcl:"public_ip"`
+	PublicNetAdpService       *string                `mapstructure:"public_netadp_service" required:"false" cty:"public_netadp_service" hcl:"public_netadp_service"`
+	ChrootDevice              *string                `mapstructure:"chroot_device" cty:"chroot_device" hcl:"chroot_device"`
+	ChrootDisk                *bool                  `mapstructure:"chroot_disk" cty:"chroot_disk" hcl:"chroot_disk"`
+	ChrootDiskSize            *float32               `mapstructure:"chroot_disk_size" cty:"chroot_disk_size" hcl:"chroot_disk_size"`
+	ChrootDiskType            *string                `mapstructure:"chroot_disk_type" cty:"chroot_disk_type" hcl:"chroot_disk_type"`
+	ChrootMountPath           *string                `mapstructure:"chroot_mount_path" cty:"chroot_mount_path" hcl:"chroot_mount_path"`
+	ChrootMounts              [][]string             `mapstructure:"chroot_mounts" cty:"chroot_mounts" hcl:"chroot_mounts"`
+	ChrootCopyFiles           []string               `mapstructure:"chroot_copy_files" cty:"chroot_copy_files" hcl:"chroot_copy_files"`
+	ChrootCommandWrapper      *string                `mapstructure:"chroot_command_wrapper" cty:"chroot_command_wrapper" hcl:"chroot_command_wrapper"`
+	MountOptions              []string               `mapstructure:"mount_options" cty:"mount_options" hcl:"mount_options"`
+	MountPartition            *string                `mapstructure:"mount_partition" cty:"mount_partition" hcl:"mount_partition"`
+	PreMountCommands          []string               `mapstructure:"pre_mount_commands" cty:"pre_mount_commands" hcl:"pre_mount_commands"`
+	PostMountCommands         []string               `mapstructure:"post_mount_commands" cty:"post_mount_commands" hcl:"post_mount_commands"`
+	SSHKeys                   []string               `mapstructure:"ssh_keys" required:"false" cty:"ssh_keys" hcl:"ssh_keys"`
+	UserData                  *string                `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -118,6 +119,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -181,12 +183,12 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"image_name":                   &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
 		"image_description":            &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false},
 		"image_tags":                   &hcldec.AttrSpec{Name: "image_tags", Type: cty.Map(cty.String), Required: false},
-		"image_tag":                    &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"image_tag":                    &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"image_service":                &hcldec.AttrSpec{Name: "image_service", Type: cty.String, Required: false},
 		"vm_type":                      &hcldec.AttrSpec{Name: "vm_type", Type: cty.String, Required: false},
 		"vm_name":                      &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false},
 		"vm_tags":                      &hcldec.AttrSpec{Name: "vm_tags", Type: cty.Map(cty.String), Required: false},
-		"vm_tag":                       &hcldec.BlockListSpec{TypeName: "vm_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"vm_tag":                       &hcldec.BlockListSpec{TypeName: "vm_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"disk_name":                    &hcldec.AttrSpec{Name: "disk_name", Type: cty.String, Required: false},
 		"disk_type":                    &hcldec.AttrSpec{Name: "disk_type", Type: cty.String, Required: false},
 		"disk_size":                    &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false},
diff --git a/examples/hyperone/basic.json b/builder/hyperone/examples/basic.json
similarity index 100%
rename from examples/hyperone/basic.json
rename to builder/hyperone/examples/basic.json
diff --git a/examples/hyperone/chroot.json b/builder/hyperone/examples/chroot.json
similarity index 100%
rename from examples/hyperone/chroot.json
rename to builder/hyperone/examples/chroot.json
diff --git a/examples/hyperone/new-syntax.pkr.hcl b/builder/hyperone/examples/new-syntax.pkr.hcl
similarity index 100%
rename from examples/hyperone/new-syntax.pkr.hcl
rename to builder/hyperone/examples/new-syntax.pkr.hcl
diff --git a/builder/hyperone/step_chroot_provision.go b/builder/hyperone/step_chroot_provision.go
index 005c869c5..7efa606ed 100644
--- a/builder/hyperone/step_chroot_provision.go
+++ b/builder/hyperone/step_chroot_provision.go
@@ -3,9 +3,9 @@ package hyperone
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type stepChrootProvision struct{}
@@ -21,7 +21,7 @@ func (s *stepChrootProvision) Run(ctx context.Context, state multistep.StateBag)
 		Wrapped:    sshCommunicator,
 	}
 
-	stepProvision := common.StepProvision{Comm: comm}
+	stepProvision := commonsteps.StepProvision{Comm: comm}
 	return stepProvision.Run(ctx, state)
 }
 
diff --git a/builder/hyperone/step_copy_files.go b/builder/hyperone/step_copy_files.go
index 739b76e62..7eade9313 100644
--- a/builder/hyperone/step_copy_files.go
+++ b/builder/hyperone/step_copy_files.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCopyFiles struct{}
diff --git a/builder/hyperone/step_create_image.go b/builder/hyperone/step_create_image.go
index 923566cd1..9b12e3a53 100644
--- a/builder/hyperone/step_create_image.go
+++ b/builder/hyperone/step_create_image.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
diff --git a/builder/hyperone/step_create_ssh_key.go b/builder/hyperone/step_create_ssh_key.go
index 3bf19fe33..1180ae61f 100644
--- a/builder/hyperone/step_create_ssh_key.go
+++ b/builder/hyperone/step_create_ssh_key.go
@@ -10,8 +10,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/hyperone/step_create_vm.go b/builder/hyperone/step_create_vm.go
index b1e1f0c9b..05b4b340b 100644
--- a/builder/hyperone/step_create_vm.go
+++ b/builder/hyperone/step_create_vm.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
diff --git a/builder/hyperone/step_create_vm_from_disk.go b/builder/hyperone/step_create_vm_from_disk.go
index b81a93b32..39969e780 100644
--- a/builder/hyperone/step_create_vm_from_disk.go
+++ b/builder/hyperone/step_create_vm_from_disk.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
diff --git a/builder/hyperone/step_detach_disk.go b/builder/hyperone/step_detach_disk.go
index 0a1451ae1..d258cabb2 100644
--- a/builder/hyperone/step_detach_disk.go
+++ b/builder/hyperone/step_detach_disk.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
diff --git a/builder/hyperone/step_mount_chroot.go b/builder/hyperone/step_mount_chroot.go
index a4e01a09c..c4b5dd0d6 100644
--- a/builder/hyperone/step_mount_chroot.go
+++ b/builder/hyperone/step_mount_chroot.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepMountChroot struct{}
diff --git a/builder/hyperone/step_mount_extra.go b/builder/hyperone/step_mount_extra.go
index ae798526e..318803746 100644
--- a/builder/hyperone/step_mount_extra.go
+++ b/builder/hyperone/step_mount_extra.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepMountExtra struct{}
diff --git a/builder/hyperone/step_post_mount_commands.go b/builder/hyperone/step_post_mount_commands.go
index 5fc074263..7d943f34a 100644
--- a/builder/hyperone/step_post_mount_commands.go
+++ b/builder/hyperone/step_post_mount_commands.go
@@ -3,8 +3,8 @@ package hyperone
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type postMountCommandsData struct {
diff --git a/builder/hyperone/step_pre_mount_commands.go b/builder/hyperone/step_pre_mount_commands.go
index 4a1e4dd11..b96551af2 100644
--- a/builder/hyperone/step_pre_mount_commands.go
+++ b/builder/hyperone/step_pre_mount_commands.go
@@ -3,8 +3,8 @@ package hyperone
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type preMountCommandsData struct {
diff --git a/builder/hyperone/step_prepare_device.go b/builder/hyperone/step_prepare_device.go
index c0d42852c..a4474fe3a 100644
--- a/builder/hyperone/step_prepare_device.go
+++ b/builder/hyperone/step_prepare_device.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const (
diff --git a/builder/hyperone/step_stop_vm.go b/builder/hyperone/step_stop_vm.go
index 7d83334d4..4189cf15b 100644
--- a/builder/hyperone/step_stop_vm.go
+++ b/builder/hyperone/step_stop_vm.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
diff --git a/builder/hyperone/token_by_ssh.go b/builder/hyperone/token_by_ssh.go
index ae1da04d2..47e626bf5 100644
--- a/builder/hyperone/token_by_ssh.go
+++ b/builder/hyperone/token_by_ssh.go
@@ -11,7 +11,7 @@ import (
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 
-	"github.com/hashicorp/packer/common/json"
+	"github.com/hashicorp/packer/packer-plugin-sdk/json"
 )
 
 const (
diff --git a/builder/hyperone/utils.go b/builder/hyperone/utils.go
index 696747de6..8d83d26c0 100644
--- a/builder/hyperone/utils.go
+++ b/builder/hyperone/utils.go
@@ -7,9 +7,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	openapi "github.com/hyperonecom/h1-client-go"
 )
 
diff --git a/builder/hyperone/version/version.go b/builder/hyperone/version/version.go
new file mode 100644
index 000000000..3832ad6f6
--- /dev/null
+++ b/builder/hyperone/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var HyperonePluginVersion *version.PluginVersion
+
+func init() {
+	HyperonePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/hyperv/common/config.go b/builder/hyperv/common/config.go
index 5ccd5d453..17e79c5d3 100644
--- a/builder/hyperv/common/config.go
+++ b/builder/hyperv/common/config.go
@@ -8,10 +8,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
-	powershell "github.com/hashicorp/packer/common/powershell"
-	"github.com/hashicorp/packer/common/powershell/hyperv"
-	"github.com/hashicorp/packer/template/interpolate"
+	powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell"
+	"github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const (
@@ -36,8 +37,8 @@ const (
 )
 
 type CommonConfig struct {
-	common.FloppyConfig `mapstructure:",squash"`
-	common.CDConfig     `mapstructure:",squash"`
+	commonsteps.FloppyConfig `mapstructure:",squash"`
+	commonsteps.CDConfig     `mapstructure:",squash"`
 	// The block size of the VHD to be created.
 	// Recommended disk block size for Linux hyper-v guests is 1 MiB. This
 	// defaults to "32" MiB.
@@ -133,8 +134,6 @@ type CommonConfig struct {
 	// If "true", Packer will not delete the VM from
 	// The Hyper-V manager.
 	KeepRegistered bool `mapstructure:"keep_registered" required:"false"`
-
-	Communicator string `mapstructure:"communicator"`
 	// If true skip compacting the hard disk for
 	// the virtual machine when exporting. This defaults to false.
 	SkipCompaction bool `mapstructure:"skip_compaction" required:"false"`
diff --git a/builder/hyperv/common/driver_ps_4.go b/builder/hyperv/common/driver_ps_4.go
index 13fa4a4d5..e8e8faf29 100644
--- a/builder/hyperv/common/driver_ps_4.go
+++ b/builder/hyperv/common/driver_ps_4.go
@@ -8,8 +8,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/packer/common/powershell"
-	"github.com/hashicorp/packer/common/powershell/hyperv"
+	"github.com/hashicorp/packer/builder/hyperv/common/powershell"
+	"github.com/hashicorp/packer/builder/hyperv/common/powershell/hyperv"
 )
 
 type HypervPS4Driver struct {
diff --git a/builder/hyperv/common/output_config.go b/builder/hyperv/common/output_config.go
index 3a1538312..2637ae87e 100644
--- a/builder/hyperv/common/output_config.go
+++ b/builder/hyperv/common/output_config.go
@@ -6,8 +6,8 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type OutputConfig struct {
diff --git a/builder/hyperv/common/output_config_test.go b/builder/hyperv/common/output_config_test.go
index a5aa0b8fe..278969a42 100644
--- a/builder/hyperv/common/output_config_test.go
+++ b/builder/hyperv/common/output_config_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/common/powershell/hyperv/hyperv.go b/builder/hyperv/common/powershell/hyperv/hyperv.go
similarity index 99%
rename from common/powershell/hyperv/hyperv.go
rename to builder/hyperv/common/powershell/hyperv/hyperv.go
index 75cf4a82f..1c49343b2 100644
--- a/common/powershell/hyperv/hyperv.go
+++ b/builder/hyperv/common/powershell/hyperv/hyperv.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/hashicorp/packer/common/powershell"
+	"github.com/hashicorp/packer/builder/hyperv/common/powershell"
 )
 
 type scriptOptions struct {
@@ -194,7 +194,7 @@ func SetFirstBootDeviceGen1(vmName string, controllerType string) error {
 
 	script := `
 param([string] $vmName, [string] $controllerType)
-	$vmBootOrder = Hyper-V\Get-VMBios -VMName $vmName | Select-Object -ExpandProperty StartupOrder | Where-Object { $_ -ne $controllerType } 
+	$vmBootOrder = Hyper-V\Get-VMBios -VMName $vmName | Select-Object -ExpandProperty StartupOrder | Where-Object { $_ -ne $controllerType }
 	Hyper-V\Set-VMBios -VMName $vmName -StartupOrder (@($controllerType) + $vmBootOrder)
 `
 
diff --git a/common/powershell/hyperv/hyperv_test.go b/builder/hyperv/common/powershell/hyperv/hyperv_test.go
similarity index 100%
rename from common/powershell/hyperv/hyperv_test.go
rename to builder/hyperv/common/powershell/hyperv/hyperv_test.go
diff --git a/common/powershell/powershell.go b/builder/hyperv/common/powershell/powershell.go
similarity index 99%
rename from common/powershell/powershell.go
rename to builder/hyperv/common/powershell/powershell.go
index 3d899ffce..5c10e991c 100644
--- a/common/powershell/powershell.go
+++ b/builder/hyperv/common/powershell/powershell.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 const (
diff --git a/common/powershell/powershell_test.go b/builder/hyperv/common/powershell/powershell_test.go
similarity index 100%
rename from common/powershell/powershell_test.go
rename to builder/hyperv/common/powershell/powershell_test.go
diff --git a/common/powershell/scriptbuilder.go b/builder/hyperv/common/powershell/scriptbuilder.go
similarity index 100%
rename from common/powershell/scriptbuilder.go
rename to builder/hyperv/common/powershell/scriptbuilder.go
diff --git a/builder/hyperv/common/ssh.go b/builder/hyperv/common/ssh.go
index c152e419c..c116f2f3f 100644
--- a/builder/hyperv/common/ssh.go
+++ b/builder/hyperv/common/ssh.go
@@ -3,7 +3,7 @@ package common
 import (
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CommHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/hyperv/common/ssh_config.go b/builder/hyperv/common/ssh_config.go
index 152230ccd..48ffad38a 100644
--- a/builder/hyperv/common/ssh_config.go
+++ b/builder/hyperv/common/ssh_config.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type SSHConfig struct {
diff --git a/builder/hyperv/common/step_clone_vm.go b/builder/hyperv/common/step_clone_vm.go
index 5213574e1..a6a101e4f 100644
--- a/builder/hyperv/common/step_clone_vm.go
+++ b/builder/hyperv/common/step_clone_vm.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step clones an existing virtual machine.
diff --git a/builder/hyperv/common/step_collate_artifacts.go b/builder/hyperv/common/step_collate_artifacts.go
index 580ba28d0..7f0561e90 100644
--- a/builder/hyperv/common/step_collate_artifacts.go
+++ b/builder/hyperv/common/step_collate_artifacts.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCollateArtifacts struct {
diff --git a/builder/hyperv/common/step_collate_artifacts_test.go b/builder/hyperv/common/step_collate_artifacts_test.go
index d88ca59bc..88fa325ad 100644
--- a/builder/hyperv/common/step_collate_artifacts_test.go
+++ b/builder/hyperv/common/step_collate_artifacts_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCollateArtifacts_impl(t *testing.T) {
diff --git a/builder/hyperv/common/step_compact_disk.go b/builder/hyperv/common/step_compact_disk.go
index 437473b16..75f174d22 100644
--- a/builder/hyperv/common/step_compact_disk.go
+++ b/builder/hyperv/common/step_compact_disk.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCompactDisk struct {
diff --git a/builder/hyperv/common/step_compact_disk_test.go b/builder/hyperv/common/step_compact_disk_test.go
index f8943d25f..a88a637e2 100644
--- a/builder/hyperv/common/step_compact_disk_test.go
+++ b/builder/hyperv/common/step_compact_disk_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCompactDisk_impl(t *testing.T) {
diff --git a/builder/hyperv/common/step_configure_ip.go b/builder/hyperv/common/step_configure_ip.go
index 5e5baac31..70682a6df 100644
--- a/builder/hyperv/common/step_configure_ip.go
+++ b/builder/hyperv/common/step_configure_ip.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepConfigureIp struct {
diff --git a/builder/hyperv/common/step_configure_vlan.go b/builder/hyperv/common/step_configure_vlan.go
index 60d8fdf3a..810c200c2 100644
--- a/builder/hyperv/common/step_configure_vlan.go
+++ b/builder/hyperv/common/step_configure_vlan.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepConfigureVlan struct {
diff --git a/builder/hyperv/common/step_create_build_dir.go b/builder/hyperv/common/step_create_build_dir.go
index dc6b69a04..d66257bac 100644
--- a/builder/hyperv/common/step_create_build_dir.go
+++ b/builder/hyperv/common/step_create_build_dir.go
@@ -7,9 +7,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 type StepCreateBuildDir struct {
diff --git a/builder/hyperv/common/step_create_build_dir_test.go b/builder/hyperv/common/step_create_build_dir_test.go
index ab0c0c49a..80e4d391f 100644
--- a/builder/hyperv/common/step_create_build_dir_test.go
+++ b/builder/hyperv/common/step_create_build_dir_test.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateBuildDir_imp(t *testing.T) {
diff --git a/builder/hyperv/common/step_create_external_switch.go b/builder/hyperv/common/step_create_external_switch.go
index df1776a63..ec8d41339 100644
--- a/builder/hyperv/common/step_create_external_switch.go
+++ b/builder/hyperv/common/step_create_external_switch.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // This step creates an external switch for the VM.
diff --git a/builder/hyperv/common/step_create_switch.go b/builder/hyperv/common/step_create_switch.go
index 7ea5f5c24..2e46036cd 100644
--- a/builder/hyperv/common/step_create_switch.go
+++ b/builder/hyperv/common/step_create_switch.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const (
diff --git a/builder/hyperv/common/step_create_vm.go b/builder/hyperv/common/step_create_vm.go
index 920edfa45..1b5e22c73 100644
--- a/builder/hyperv/common/step_create_vm.go
+++ b/builder/hyperv/common/step_create_vm.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step creates the actual virtual machine.
diff --git a/builder/hyperv/common/step_create_vm_test.go b/builder/hyperv/common/step_create_vm_test.go
index 93725d9cb..d97623895 100644
--- a/builder/hyperv/common/step_create_vm_test.go
+++ b/builder/hyperv/common/step_create_vm_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateVM_impl(t *testing.T) {
diff --git a/builder/hyperv/common/step_disable_vlan.go b/builder/hyperv/common/step_disable_vlan.go
index 3bae16d7c..f2caf89a4 100644
--- a/builder/hyperv/common/step_disable_vlan.go
+++ b/builder/hyperv/common/step_disable_vlan.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDisableVlan struct {
diff --git a/builder/hyperv/common/step_enable_integration_service.go b/builder/hyperv/common/step_enable_integration_service.go
index 25675b749..4a1a3a7d5 100644
--- a/builder/hyperv/common/step_enable_integration_service.go
+++ b/builder/hyperv/common/step_enable_integration_service.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepEnableIntegrationService struct {
diff --git a/builder/hyperv/common/step_export_vm.go b/builder/hyperv/common/step_export_vm.go
index 08513d0f7..f94d4f7e1 100644
--- a/builder/hyperv/common/step_export_vm.go
+++ b/builder/hyperv/common/step_export_vm.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepExportVm struct {
diff --git a/builder/hyperv/common/step_export_vm_test.go b/builder/hyperv/common/step_export_vm_test.go
index 81cc34af9..dcffa5bc2 100644
--- a/builder/hyperv/common/step_export_vm_test.go
+++ b/builder/hyperv/common/step_export_vm_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepExportVm_impl(t *testing.T) {
diff --git a/builder/hyperv/common/step_mount_dvddrive.go b/builder/hyperv/common/step_mount_dvddrive.go
index f0eeaba61..37b10bf8e 100644
--- a/builder/hyperv/common/step_mount_dvddrive.go
+++ b/builder/hyperv/common/step_mount_dvddrive.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepMountDvdDrive struct {
diff --git a/builder/hyperv/common/step_mount_floppydrive.go b/builder/hyperv/common/step_mount_floppydrive.go
index 5ded58d29..e2cb9e1b1 100644
--- a/builder/hyperv/common/step_mount_floppydrive.go
+++ b/builder/hyperv/common/step_mount_floppydrive.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 const (
diff --git a/builder/hyperv/common/step_mount_guest_additions.go b/builder/hyperv/common/step_mount_guest_additions.go
index 852e8e274..4f215220d 100644
--- a/builder/hyperv/common/step_mount_guest_additions.go
+++ b/builder/hyperv/common/step_mount_guest_additions.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepMountGuestAdditions struct {
diff --git a/builder/hyperv/common/step_mount_secondary_dvd_images.go b/builder/hyperv/common/step_mount_secondary_dvd_images.go
index a6cbd7e6b..fe1921ff8 100644
--- a/builder/hyperv/common/step_mount_secondary_dvd_images.go
+++ b/builder/hyperv/common/step_mount_secondary_dvd_images.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepMountSecondaryDvdImages struct {
diff --git a/builder/hyperv/common/step_polling_installation.go b/builder/hyperv/common/step_polling_installation.go
index 40754f725..a2db5f9cb 100644
--- a/builder/hyperv/common/step_polling_installation.go
+++ b/builder/hyperv/common/step_polling_installation.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const port string = "13000"
diff --git a/builder/hyperv/common/step_reboot_vm.go b/builder/hyperv/common/step_reboot_vm.go
index b2053804f..335f66c1f 100644
--- a/builder/hyperv/common/step_reboot_vm.go
+++ b/builder/hyperv/common/step_reboot_vm.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRebootVm struct {
diff --git a/builder/hyperv/common/step_run.go b/builder/hyperv/common/step_run.go
index 41a0be191..035aa35bf 100644
--- a/builder/hyperv/common/step_run.go
+++ b/builder/hyperv/common/step_run.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRun struct {
diff --git a/builder/hyperv/common/step_set_boot_order.go b/builder/hyperv/common/step_set_boot_order.go
index ab94ce968..7e4b9d3d1 100644
--- a/builder/hyperv/common/step_set_boot_order.go
+++ b/builder/hyperv/common/step_set_boot_order.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSetBootOrder struct {
diff --git a/builder/hyperv/common/step_set_boot_order_test.go b/builder/hyperv/common/step_set_boot_order_test.go
index 0c1b1e539..bd1916ac9 100644
--- a/builder/hyperv/common/step_set_boot_order_test.go
+++ b/builder/hyperv/common/step_set_boot_order_test.go
@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type bootOrderTest struct {
diff --git a/builder/hyperv/common/step_set_first_boot_device.go b/builder/hyperv/common/step_set_first_boot_device.go
index c8b56f8f0..cf3c60fa4 100644
--- a/builder/hyperv/common/step_set_first_boot_device.go
+++ b/builder/hyperv/common/step_set_first_boot_device.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSetFirstBootDevice struct {
diff --git a/builder/hyperv/common/step_set_first_boot_device_test.go b/builder/hyperv/common/step_set_first_boot_device_test.go
index 264363e98..80e4b28b3 100644
--- a/builder/hyperv/common/step_set_first_boot_device_test.go
+++ b/builder/hyperv/common/step_set_first_boot_device_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type parseBootDeviceIdentifierTest struct {
diff --git a/builder/hyperv/common/step_shutdown.go b/builder/hyperv/common/step_shutdown.go
index 6620b901f..741c6d815 100644
--- a/builder/hyperv/common/step_shutdown.go
+++ b/builder/hyperv/common/step_shutdown.go
@@ -8,8 +8,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff --git a/builder/hyperv/common/step_sleep.go b/builder/hyperv/common/step_sleep.go
index 1bbcfac56..5420c7f0d 100644
--- a/builder/hyperv/common/step_sleep.go
+++ b/builder/hyperv/common/step_sleep.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSleep struct {
diff --git a/builder/hyperv/common/step_test.go b/builder/hyperv/common/step_test.go
index e5f9f3998..30691fa20 100644
--- a/builder/hyperv/common/step_test.go
+++ b/builder/hyperv/common/step_test.go
@@ -6,9 +6,9 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/hyperv/common/step_type_boot_command.go b/builder/hyperv/common/step_type_boot_command.go
index 8b7ed40e4..3fbd0871f 100644
--- a/builder/hyperv/common/step_type_boot_command.go
+++ b/builder/hyperv/common/step_type_boot_command.go
@@ -6,10 +6,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type bootCommandTemplateData struct {
diff --git a/builder/hyperv/common/step_unmount_dvddrive.go b/builder/hyperv/common/step_unmount_dvddrive.go
index 665d00808..bdd98e30f 100644
--- a/builder/hyperv/common/step_unmount_dvddrive.go
+++ b/builder/hyperv/common/step_unmount_dvddrive.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUnmountDvdDrive struct {
diff --git a/builder/hyperv/common/step_unmount_floppydrive.go b/builder/hyperv/common/step_unmount_floppydrive.go
index 7c212ce5c..eccfb5dc4 100644
--- a/builder/hyperv/common/step_unmount_floppydrive.go
+++ b/builder/hyperv/common/step_unmount_floppydrive.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUnmountFloppyDrive struct {
diff --git a/builder/hyperv/common/step_unmount_guest_additions.go b/builder/hyperv/common/step_unmount_guest_additions.go
index bb51eb7ce..663d64077 100644
--- a/builder/hyperv/common/step_unmount_guest_additions.go
+++ b/builder/hyperv/common/step_unmount_guest_additions.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUnmountGuestAdditions struct {
diff --git a/builder/hyperv/common/step_unmount_secondary_dvd_images.go b/builder/hyperv/common/step_unmount_secondary_dvd_images.go
index 9cf192d4d..c33617fe0 100644
--- a/builder/hyperv/common/step_unmount_secondary_dvd_images.go
+++ b/builder/hyperv/common/step_unmount_secondary_dvd_images.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUnmountSecondaryDvdImages struct {
diff --git a/builder/hyperv/common/step_wait_for_install_to_complete.go b/builder/hyperv/common/step_wait_for_install_to_complete.go
index 265eb6572..da4ac90ba 100644
--- a/builder/hyperv/common/step_wait_for_install_to_complete.go
+++ b/builder/hyperv/common/step_wait_for_install_to_complete.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const (
diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go
index 8fa9d9844..b5df8e57c 100644
--- a/builder/hyperv/iso/builder.go
+++ b/builder/hyperv/iso/builder.go
@@ -13,14 +13,15 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const (
@@ -53,8 +54,8 @@ type Builder struct {
 
 type Config struct {
 	common.PackerConfig            `mapstructure:",squash"`
-	common.HTTPConfig              `mapstructure:",squash"`
-	common.ISOConfig               `mapstructure:",squash"`
+	commonsteps.HTTPConfig         `mapstructure:",squash"`
+	commonsteps.ISOConfig          `mapstructure:",squash"`
 	bootcommand.BootConfig         `mapstructure:",squash"`
 	hypervcommon.OutputConfig      `mapstructure:",squash"`
 	hypervcommon.SSHConfig         `mapstructure:",squash"`
@@ -193,11 +194,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&hypervcommon.StepCreateBuildDir{
 			TempPath: b.config.TempPath,
 		},
-		&common.StepOutputDir{
+		&commonsteps.StepOutputDir{
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			ResultKey:   "iso_path",
@@ -205,12 +206,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Extension:   b.config.TargetExtension,
 			TargetPath:  b.config.TargetPath,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -255,7 +256,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsPath: b.config.GuestAdditionsPath,
 			Generation:         b.config.Generation,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -298,10 +299,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 
 		// provision requires communicator to be setup
-		&common.StepProvision{},
+		&commonsteps.StepProvision{},
 
 		// Remove ephemeral key from authorized_hosts if using SSH communicator
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.SSHConfig.Comm,
 		},
 
@@ -337,7 +338,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps.
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/hyperv/iso/builder.hcl2spec.go b/builder/hyperv/iso/builder.hcl2spec.go
index 4d2df4065..8cc2b4786 100644
--- a/builder/hyperv/iso/builder.hcl2spec.go
+++ b/builder/hyperv/iso/builder.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType              *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion              *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                    *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                    *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                  *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -132,6 +133,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":              &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":              &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                     &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                     &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                  &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/hyperv/iso/builder_test.go b/builder/hyperv/iso/builder_test.go
index 2f95f5f1a..0103b656a 100644
--- a/builder/hyperv/iso/builder_test.go
+++ b/builder/hyperv/iso/builder_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 
 	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testConfig() map[string]interface{} {
@@ -213,7 +213,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppiesPath := "../../../common/test-fixtures/floppies"
+	floppiesPath := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppiesPath), fmt.Sprintf("%s/foo.ps1", floppiesPath)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/hyperv/version/version.go b/builder/hyperv/version/version.go
new file mode 100644
index 000000000..9b2f13701
--- /dev/null
+++ b/builder/hyperv/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var HypervPluginVersion *version.PluginVersion
+
+func init() {
+	HypervPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/hyperv/vmcx/builder.go b/builder/hyperv/vmcx/builder.go
index 622917ac4..ad91ec126 100644
--- a/builder/hyperv/vmcx/builder.go
+++ b/builder/hyperv/vmcx/builder.go
@@ -12,15 +12,16 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	powershell "github.com/hashicorp/packer/common/powershell"
-	"github.com/hashicorp/packer/common/shutdowncommand"
+	powershell "github.com/hashicorp/packer/builder/hyperv/common/powershell"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const (
@@ -44,8 +45,8 @@ type Builder struct {
 
 type Config struct {
 	common.PackerConfig            `mapstructure:",squash"`
-	common.HTTPConfig              `mapstructure:",squash"`
-	common.ISOConfig               `mapstructure:",squash"`
+	commonsteps.HTTPConfig         `mapstructure:",squash"`
+	commonsteps.ISOConfig          `mapstructure:",squash"`
 	bootcommand.BootConfig         `mapstructure:",squash"`
 	hypervcommon.OutputConfig      `mapstructure:",squash"`
 	hypervcommon.SSHConfig         `mapstructure:",squash"`
@@ -233,11 +234,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&hypervcommon.StepCreateBuildDir{
 			TempPath: b.config.TempPath,
 		},
-		&common.StepOutputDir{
+		&commonsteps.StepOutputDir{
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			ResultKey:   "iso_path",
@@ -245,12 +246,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Extension:   b.config.TargetExtension,
 			TargetPath:  b.config.TargetPath,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -295,7 +296,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsPath: b.config.GuestAdditionsPath,
 			Generation:         b.config.Generation,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -338,10 +339,10 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 
 		// provision requires communicator to be setup
-		&common.StepProvision{},
+		&commonsteps.StepProvision{},
 
 		// Remove ephemeral SSH keys, if using
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.SSHConfig.Comm,
 		},
 
@@ -377,7 +378,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	// the clean up actions for each step will be executed reverse order
 
 	// Run the steps.
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/hyperv/vmcx/builder.hcl2spec.go b/builder/hyperv/vmcx/builder.hcl2spec.go
index 927c91bed..7a038c083 100644
--- a/builder/hyperv/vmcx/builder.hcl2spec.go
+++ b/builder/hyperv/vmcx/builder.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType              *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion              *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                    *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                    *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                  *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -134,6 +135,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":              &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":              &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                     &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                     &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                  &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/hyperv/vmcx/builder_test.go b/builder/hyperv/vmcx/builder_test.go
index 5e01b488e..e6c25b9f5 100644
--- a/builder/hyperv/vmcx/builder_test.go
+++ b/builder/hyperv/vmcx/builder_test.go
@@ -10,8 +10,8 @@ import (
 	"os"
 
 	hypervcommon "github.com/hashicorp/packer/builder/hyperv/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testConfig() map[string]interface{} {
@@ -353,7 +353,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/jdcloud/builder.go b/builder/jdcloud/builder.go
index 9fb801018..8dc291b6f 100644
--- a/builder/jdcloud/builder.go
+++ b/builder/jdcloud/builder.go
@@ -5,12 +5,12 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func (b *Builder) ConfigSpec() hcldec.ObjectSpec { return b.config.FlatMapstructure().HCL2Spec() }
@@ -70,7 +70,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      instanceHost,
 		},
 
-		&common.StepProvision{},
+		&commonsteps.StepProvision{},
 
 		&stepStopJDCloudInstance{
 			InstanceSpecConfig: &b.config.JDCloudInstanceSpecConfig,
@@ -81,7 +81,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 	}
 
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/jdcloud/common.go b/builder/jdcloud/common.go
index 1de7efe22..f60889450 100644
--- a/builder/jdcloud/common.go
+++ b/builder/jdcloud/common.go
@@ -9,9 +9,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client"
 	vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client"
 )
diff --git a/builder/jdcloud/common.hcl2spec.go b/builder/jdcloud/common.hcl2spec.go
index 2fa158b84..dadbb8e56 100644
--- a/builder/jdcloud/common.hcl2spec.go
+++ b/builder/jdcloud/common.hcl2spec.go
@@ -73,6 +73,7 @@ type FlatConfig struct {
 	PublicIpId                *string           `cty:"public_ip_id" hcl:"public_ip_id"`
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -156,6 +157,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"public_ip_id":                 &hcldec.AttrSpec{Name: "public_ip_id", Type: cty.String, Required: false},
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/jdcloud/credential_config.go b/builder/jdcloud/credential_config.go
index 28768b8e7..0648c6565 100644
--- a/builder/jdcloud/credential_config.go
+++ b/builder/jdcloud/credential_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/jdcloud-api/jdcloud-sdk-go/core"
 	vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/client"
 	vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/client"
diff --git a/examples/jdcloud/credential-key.json b/builder/jdcloud/examples/credential-key.json
similarity index 100%
rename from examples/jdcloud/credential-key.json
rename to builder/jdcloud/examples/credential-key.json
diff --git a/examples/jdcloud/credential-new-key.json b/builder/jdcloud/examples/credential-new-key.json
similarity index 100%
rename from examples/jdcloud/credential-new-key.json
rename to builder/jdcloud/examples/credential-new-key.json
diff --git a/examples/jdcloud/credential-password.json b/builder/jdcloud/examples/credential-password.json
similarity index 100%
rename from examples/jdcloud/credential-password.json
rename to builder/jdcloud/examples/credential-password.json
diff --git a/examples/jdcloud/use_new_subnet.json b/builder/jdcloud/examples/use_new_subnet.json
similarity index 100%
rename from examples/jdcloud/use_new_subnet.json
rename to builder/jdcloud/examples/use_new_subnet.json
diff --git a/builder/jdcloud/instance_config.go b/builder/jdcloud/instance_config.go
index c63ae046b..1d43142f9 100644
--- a/builder/jdcloud/instance_config.go
+++ b/builder/jdcloud/instance_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type JDCloudInstanceSpecConfig struct {
diff --git a/builder/jdcloud/step_config_credentials.go b/builder/jdcloud/step_config_credentials.go
index 360a27629..848f44874 100644
--- a/builder/jdcloud/step_config_credentials.go
+++ b/builder/jdcloud/step_config_credentials.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis"
 )
 
diff --git a/builder/jdcloud/step_create_image.go b/builder/jdcloud/step_create_image.go
index c126d8047..4e1fde048 100644
--- a/builder/jdcloud/step_create_image.go
+++ b/builder/jdcloud/step_create_image.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis"
 )
 
diff --git a/builder/jdcloud/step_create_instance.go b/builder/jdcloud/step_create_instance.go
index 4395b1932..745b98085 100644
--- a/builder/jdcloud/step_create_instance.go
+++ b/builder/jdcloud/step_create_instance.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/jdcloud-api/jdcloud-sdk-go/core"
 	"github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis"
 	vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/models"
diff --git a/builder/jdcloud/step_stop_instance.go b/builder/jdcloud/step_stop_instance.go
index 0468b7469..a167b0fc6 100644
--- a/builder/jdcloud/step_stop_instance.go
+++ b/builder/jdcloud/step_stop_instance.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis"
 )
 
diff --git a/builder/jdcloud/step_validate_parameters.go b/builder/jdcloud/step_validate_parameters.go
index adfab5e14..708617957 100644
--- a/builder/jdcloud/step_validate_parameters.go
+++ b/builder/jdcloud/step_validate_parameters.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	vm "github.com/jdcloud-api/jdcloud-sdk-go/services/vm/apis"
 	vpc "github.com/jdcloud-api/jdcloud-sdk-go/services/vpc/apis"
 )
diff --git a/builder/jdcloud/version/version.go b/builder/jdcloud/version/version.go
new file mode 100644
index 000000000..033c0b378
--- /dev/null
+++ b/builder/jdcloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var JDCloudPluginVersion *version.PluginVersion
+
+func init() {
+	JDCloudPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/linode/builder.go b/builder/linode/builder.go
index 0eff01aec..670cc2d35 100644
--- a/builder/linode/builder.go
+++ b/builder/linode/builder.go
@@ -9,12 +9,12 @@ import (
 	"log"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/linode/linodego"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // The unique ID for this builder.
@@ -62,15 +62,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (ret
 			Host:      commHost(b.config.Comm.Host()),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		&stepShutdownLinode{client},
 		&stepCreateImage{client},
 	}
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/linode/config.go b/builder/linode/config.go
index 44a1a9d2b..f749fa113 100644
--- a/builder/linode/config.go
+++ b/builder/linode/config.go
@@ -11,11 +11,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/builder/linode/config.hcl2spec.go b/builder/linode/config.hcl2spec.go
index 7af23acce..ca737e789 100644
--- a/builder/linode/config.hcl2spec.go
+++ b/builder/linode/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -93,6 +94,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/linode/linode.go b/builder/linode/linode.go
index 726a9b468..c274960a9 100644
--- a/builder/linode/linode.go
+++ b/builder/linode/linode.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/hashicorp/packer/version"
+	"github.com/hashicorp/packer/builder/linode/version"
 	"github.com/linode/linodego"
 	"golang.org/x/oauth2"
 )
@@ -23,7 +23,7 @@ func newLinodeClient(pat string) linodego.Client {
 
 	projectURL := "https://www.packer.io"
 	userAgent := fmt.Sprintf("Packer/%s (+%s) linodego/%s",
-		version.FormattedVersion(), projectURL, linodego.Version)
+		version.LinodePluginVersion.FormattedVersion(), projectURL, linodego.Version)
 
 	client.SetUserAgent(userAgent)
 	return client
diff --git a/builder/linode/step_create_image.go b/builder/linode/step_create_image.go
index 4e5ea5a64..58da16e73 100644
--- a/builder/linode/step_create_image.go
+++ b/builder/linode/step_create_image.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/linode/linodego"
 )
 
diff --git a/builder/linode/step_create_linode.go b/builder/linode/step_create_linode.go
index 90dc6342a..50db58696 100644
--- a/builder/linode/step_create_linode.go
+++ b/builder/linode/step_create_linode.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/linode/linodego"
 )
 
diff --git a/builder/linode/step_create_ssh_key.go b/builder/linode/step_create_ssh_key.go
index 2e0776ade..c5f7ad4cb 100644
--- a/builder/linode/step_create_ssh_key.go
+++ b/builder/linode/step_create_ssh_key.go
@@ -10,8 +10,8 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/linode/step_shutdown_linode.go b/builder/linode/step_shutdown_linode.go
index 30ca39c57..82069e19c 100644
--- a/builder/linode/step_shutdown_linode.go
+++ b/builder/linode/step_shutdown_linode.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/linode/linodego"
 )
 
diff --git a/builder/linode/version/version.go b/builder/linode/version/version.go
new file mode 100644
index 000000000..3616d9049
--- /dev/null
+++ b/builder/linode/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var LinodePluginVersion *version.PluginVersion
+
+func init() {
+	LinodePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/lxc/builder.go b/builder/lxc/builder.go
index ec0205f97..53195c764 100644
--- a/builder/lxc/builder.go
+++ b/builder/lxc/builder.go
@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -59,7 +59,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("wrappedCommand", CommandWrapper(wrappedCommand))
 
 	// Run
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/lxc/communicator.go b/builder/lxc/communicator.go
index 6994a2828..b91d811d0 100644
--- a/builder/lxc/communicator.go
+++ b/builder/lxc/communicator.go
@@ -13,7 +13,7 @@ import (
 	"syscall"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 type LxcAttachCommunicator struct {
diff --git a/builder/lxc/config.go b/builder/lxc/config.go
index c9a58026b..c02187794 100644
--- a/builder/lxc/config.go
+++ b/builder/lxc/config.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/lxc/config.hcl2spec.go b/builder/lxc/config.hcl2spec.go
index 985e34af9..780477b73 100644
--- a/builder/lxc/config.hcl2spec.go
+++ b/builder/lxc/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/lxc/step_export.go b/builder/lxc/step_export.go
index 890949bde..f017f551a 100644
--- a/builder/lxc/step_export.go
+++ b/builder/lxc/step_export.go
@@ -9,8 +9,8 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepExport struct{}
diff --git a/builder/lxc/step_lxc_create.go b/builder/lxc/step_lxc_create.go
index c09626cd1..afcc2da79 100644
--- a/builder/lxc/step_lxc_create.go
+++ b/builder/lxc/step_lxc_create.go
@@ -7,8 +7,8 @@ import (
 	"os/user"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepLxcCreate struct{}
diff --git a/builder/lxc/step_prepare_output_dir.go b/builder/lxc/step_prepare_output_dir.go
index 5537c5a8c..65e7b40b0 100644
--- a/builder/lxc/step_prepare_output_dir.go
+++ b/builder/lxc/step_prepare_output_dir.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepPrepareOutputDir struct{}
diff --git a/builder/lxc/step_provision.go b/builder/lxc/step_provision.go
index fe9f3264b..5d8beae4c 100644
--- a/builder/lxc/step_provision.go
+++ b/builder/lxc/step_provision.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // StepProvision provisions the instance within a chroot.
@@ -28,7 +28,7 @@ func (s *StepProvision) Run(ctx context.Context, state multistep.StateBag) multi
 	}
 
 	// Loads hook data from builder's state, if it has been set.
-	hookData := common.PopulateProvisionHookData(state)
+	hookData := commonsteps.PopulateProvisionHookData(state)
 
 	// Update state generated_data with complete hookData
 	// to make them accessible by post-processors
diff --git a/builder/lxc/step_wait_init.go b/builder/lxc/step_wait_init.go
index 5b7873cb4..c4e733edc 100644
--- a/builder/lxc/step_wait_init.go
+++ b/builder/lxc/step_wait_init.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepWaitInit struct {
diff --git a/builder/lxc/version/version.go b/builder/lxc/version/version.go
new file mode 100644
index 000000000..77e16b41a
--- /dev/null
+++ b/builder/lxc/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var LXCPluginVersion *version.PluginVersion
+
+func init() {
+	LXCPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/lxd/builder.go b/builder/lxd/builder.go
index 5130e8d19..34be34e62 100644
--- a/builder/lxd/builder.go
+++ b/builder/lxd/builder.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -53,7 +53,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("wrappedCommand", CommandWrapper(wrappedCommand))
 
 	// Run
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/lxd/config.go b/builder/lxd/config.go
index 707f6aaec..f737d283b 100644
--- a/builder/lxd/config.go
+++ b/builder/lxd/config.go
@@ -6,10 +6,10 @@ package lxd
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/lxd/config.hcl2spec.go b/builder/lxd/config.hcl2spec.go
index ac2391f8a..803571182 100644
--- a/builder/lxd/config.hcl2spec.go
+++ b/builder/lxd/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -40,6 +41,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/lxd/step_lxd_launch.go b/builder/lxd/step_lxd_launch.go
index 7bff6fd42..420c6564a 100644
--- a/builder/lxd/step_lxd_launch.go
+++ b/builder/lxd/step_lxd_launch.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepLxdLaunch struct{}
diff --git a/builder/lxd/step_provision.go b/builder/lxd/step_provision.go
index 79f43b21a..1fa1b47c0 100644
--- a/builder/lxd/step_provision.go
+++ b/builder/lxd/step_provision.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // StepProvision provisions the container
@@ -25,7 +25,7 @@ func (s *StepProvision) Run(ctx context.Context, state multistep.StateBag) multi
 	}
 
 	// Loads hook data from builder's state, if it has been set.
-	hookData := common.PopulateProvisionHookData(state)
+	hookData := commonsteps.PopulateProvisionHookData(state)
 
 	// Update state generated_data with complete hookData
 	// to make them accessible by post-processors
diff --git a/builder/lxd/step_publish.go b/builder/lxd/step_publish.go
index 461f3a9bd..7f7d838b1 100644
--- a/builder/lxd/step_publish.go
+++ b/builder/lxd/step_publish.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepPublish struct{}
diff --git a/builder/lxd/version/version.go b/builder/lxd/version/version.go
new file mode 100644
index 000000000..d72cf0190
--- /dev/null
+++ b/builder/lxd/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var LXDPluginVersion *version.PluginVersion
+
+func init() {
+	LXDPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/ncloud/builder.go b/builder/ncloud/builder.go
index 5645471b5..284a881d3 100644
--- a/builder/ncloud/builder.go
+++ b/builder/ncloud/builder.go
@@ -5,10 +5,10 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // Builder assume this implements packer.Builder
@@ -65,8 +65,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				},
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&common.StepProvision{},
-			&common.StepCleanupTempKeys{
+			&commonsteps.StepProvision{},
+			&commonsteps.StepCleanupTempKeys{
 				Comm: &b.config.Comm,
 			},
 			NewStepStopServerInstance(conn, ui),
@@ -94,7 +94,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 					}, nil
 				},
 			},
-			&common.StepProvision{},
+			&commonsteps.StepProvision{},
 			NewStepStopServerInstance(conn, ui),
 			NewStepCreateServerImage(conn, ui, &b.config),
 			NewStepDeleteBlockStorageInstance(conn, ui, &b.config),
@@ -103,7 +103,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, b.stateBag)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, b.stateBag)
 	b.runner.Run(ctx, b.stateBag)
 
 	// If there was an error, return that
diff --git a/builder/ncloud/config.go b/builder/ncloud/config.go
index 55437c6ae..9db019e74 100644
--- a/builder/ncloud/config.go
+++ b/builder/ncloud/config.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Config is structure to use packer builder plugin for Naver Cloud Platform
diff --git a/builder/ncloud/config.hcl2spec.go b/builder/ncloud/config.hcl2spec.go
index a7fffd0dd..b0e2013a3 100644
--- a/builder/ncloud/config.hcl2spec.go
+++ b/builder/ncloud/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                   *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                 *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                 *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                       *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                       *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                     *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -93,6 +94,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                     &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":                   &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":                   &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                          &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                          &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                       &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/ncloud/step.go b/builder/ncloud/step.go
index 8b312fae7..537692de8 100644
--- a/builder/ncloud/step.go
+++ b/builder/ncloud/step.go
@@ -1,7 +1,7 @@
 package ncloud
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func processStepResult(err error, sayError func(error), state multistep.StateBag) multistep.StepAction {
diff --git a/builder/ncloud/step_create_block_storage_instance.go b/builder/ncloud/step_create_block_storage_instance.go
index 17ac68ba1..d0f584507 100644
--- a/builder/ncloud/step_create_block_storage_instance.go
+++ b/builder/ncloud/step_create_block_storage_instance.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCreateBlockStorageInstance struct is for making extra block storage
diff --git a/builder/ncloud/step_create_block_storage_instance_test.go b/builder/ncloud/step_create_block_storage_instance_test.go
index 1731eec6d..f5fb575a0 100644
--- a/builder/ncloud/step_create_block_storage_instance_test.go
+++ b/builder/ncloud/step_create_block_storage_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateBlockStorageInstanceShouldFailIfOperationCreateBlockStorageInstanceFails(t *testing.T) {
diff --git a/builder/ncloud/step_create_login_key.go b/builder/ncloud/step_create_login_key.go
index 1a302c665..7cf7ae505 100644
--- a/builder/ncloud/step_create_login_key.go
+++ b/builder/ncloud/step_create_login_key.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type LoginKey struct {
diff --git a/builder/ncloud/step_create_login_key_test.go b/builder/ncloud/step_create_login_key_test.go
index 3583f47a5..df6cedd44 100644
--- a/builder/ncloud/step_create_login_key_test.go
+++ b/builder/ncloud/step_create_login_key_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateLoginKeyShouldFailIfOperationCreateLoginKeyFails(t *testing.T) {
diff --git a/builder/ncloud/step_create_public_ip_instance.go b/builder/ncloud/step_create_public_ip_instance.go
index 4a0900a9a..17820c241 100644
--- a/builder/ncloud/step_create_public_ip_instance.go
+++ b/builder/ncloud/step_create_public_ip_instance.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreatePublicIPInstance struct {
diff --git a/builder/ncloud/step_create_public_ip_instance_test.go b/builder/ncloud/step_create_public_ip_instance_test.go
index 25b4d3c11..c4045fd03 100644
--- a/builder/ncloud/step_create_public_ip_instance_test.go
+++ b/builder/ncloud/step_create_public_ip_instance_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreatePublicIPInstanceShouldFailIfOperationCreatePublicIPInstanceFails(t *testing.T) {
diff --git a/builder/ncloud/step_create_server_image.go b/builder/ncloud/step_create_server_image.go
index 12e20478e..9b36b3ffc 100644
--- a/builder/ncloud/step_create_server_image.go
+++ b/builder/ncloud/step_create_server_image.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateServerImage struct {
diff --git a/builder/ncloud/step_create_server_image_test.go b/builder/ncloud/step_create_server_image_test.go
index cfe31b91b..3d42a2a26 100644
--- a/builder/ncloud/step_create_server_image_test.go
+++ b/builder/ncloud/step_create_server_image_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateServerImageShouldFailIfOperationCreateServerImageFails(t *testing.T) {
diff --git a/builder/ncloud/step_create_server_instance.go b/builder/ncloud/step_create_server_instance.go
index 7c1e7382e..48b1b11ef 100644
--- a/builder/ncloud/step_create_server_instance.go
+++ b/builder/ncloud/step_create_server_instance.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateServerInstance struct {
diff --git a/builder/ncloud/step_create_server_instance_test.go b/builder/ncloud/step_create_server_instance_test.go
index 676c3fa3f..b740f1466 100644
--- a/builder/ncloud/step_create_server_instance_test.go
+++ b/builder/ncloud/step_create_server_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateServerInstanceShouldFailIfOperationCreateFails(t *testing.T) {
diff --git a/builder/ncloud/step_delete_block_storage_instance.go b/builder/ncloud/step_delete_block_storage_instance.go
index fb4bc892b..a3cdc70a5 100644
--- a/builder/ncloud/step_delete_block_storage_instance.go
+++ b/builder/ncloud/step_delete_block_storage_instance.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDeleteBlockStorageInstance struct {
diff --git a/builder/ncloud/step_delete_block_storage_instance_test.go b/builder/ncloud/step_delete_block_storage_instance_test.go
index 9f4d6de80..e5448bbb4 100644
--- a/builder/ncloud/step_delete_block_storage_instance_test.go
+++ b/builder/ncloud/step_delete_block_storage_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepDeleteBlockStorageInstanceShouldFailIfOperationDeleteBlockStorageInstanceFails(t *testing.T) {
diff --git a/builder/ncloud/step_get_rootpassword.go b/builder/ncloud/step_get_rootpassword.go
index 0de8cf351..94daf1382 100644
--- a/builder/ncloud/step_get_rootpassword.go
+++ b/builder/ncloud/step_get_rootpassword.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepGetRootPassword struct {
diff --git a/builder/ncloud/step_get_rootpassword_test.go b/builder/ncloud/step_get_rootpassword_test.go
index c048a8144..4bff59c1d 100644
--- a/builder/ncloud/step_get_rootpassword_test.go
+++ b/builder/ncloud/step_get_rootpassword_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepGetRootPasswordShouldFailIfOperationGetRootPasswordFails(t *testing.T) {
diff --git a/builder/ncloud/step_stop_server_instance.go b/builder/ncloud/step_stop_server_instance.go
index a4fad0bf3..b95dca774 100644
--- a/builder/ncloud/step_stop_server_instance.go
+++ b/builder/ncloud/step_stop_server_instance.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepStopServerInstance struct {
diff --git a/builder/ncloud/step_stop_server_instance_test.go b/builder/ncloud/step_stop_server_instance_test.go
index 4b5afe605..f63386349 100644
--- a/builder/ncloud/step_stop_server_instance_test.go
+++ b/builder/ncloud/step_stop_server_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepStopServerInstanceShouldFailIfOperationStopFails(t *testing.T) {
diff --git a/builder/ncloud/step_terminate_server_instance.go b/builder/ncloud/step_terminate_server_instance.go
index 12e6da11b..b8de7b79f 100644
--- a/builder/ncloud/step_terminate_server_instance.go
+++ b/builder/ncloud/step_terminate_server_instance.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepTerminateServerInstance struct {
diff --git a/builder/ncloud/step_terminate_server_instance_test.go b/builder/ncloud/step_terminate_server_instance_test.go
index 3db5f3ec8..ff5fafd59 100644
--- a/builder/ncloud/step_terminate_server_instance_test.go
+++ b/builder/ncloud/step_terminate_server_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepTerminateServerInstanceShouldFailIfOperationTerminationFails(t *testing.T) {
diff --git a/builder/ncloud/step_validate_template.go b/builder/ncloud/step_validate_template.go
index fbc21f9a3..52866e5ee 100644
--- a/builder/ncloud/step_validate_template.go
+++ b/builder/ncloud/step_validate_template.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
 	"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/olekukonko/tablewriter"
 )
 
diff --git a/builder/ncloud/step_validate_template_test.go b/builder/ncloud/step_validate_template_test.go
index 7e9212c7f..42d582561 100644
--- a/builder/ncloud/step_validate_template_test.go
+++ b/builder/ncloud/step_validate_template_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepValidateTemplateShouldFailIfValidateFails(t *testing.T) {
diff --git a/builder/ncloud/version/version.go b/builder/ncloud/version/version.go
new file mode 100644
index 000000000..52a84e043
--- /dev/null
+++ b/builder/ncloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var NCloudPluginVersion *version.PluginVersion
+
+func init() {
+	NCloudPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/null/builder.go b/builder/null/builder.go
index 1d2fc40e4..a48da95fb 100644
--- a/builder/null/builder.go
+++ b/builder/null/builder.go
@@ -4,10 +4,10 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 const BuilderId = "fnoeding.null"
@@ -40,7 +40,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	)
 
 	steps = append(steps,
-		new(common.StepProvision),
+		new(commonsteps.StepProvision),
 	)
 
 	// Setup the state bag and initial state for the steps
@@ -50,7 +50,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("instance_id", "Null")
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/null/config.go b/builder/null/config.go
index 6c7fcb9c2..500cb0674 100644
--- a/builder/null/config.go
+++ b/builder/null/config.go
@@ -5,11 +5,11 @@ package null
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/builder/null/config.hcl2spec.go b/builder/null/config.hcl2spec.go
index a4297fa6a..ecea3e994 100644
--- a/builder/null/config.hcl2spec.go
+++ b/builder/null/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -81,6 +82,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/null/ssh.go b/builder/null/ssh.go
index 373f8158b..335c93dca 100644
--- a/builder/null/ssh.go
+++ b/builder/null/ssh.go
@@ -1,7 +1,7 @@
 package null
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CommHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/null/version/version.go b/builder/null/version/version.go
new file mode 100644
index 000000000..a6a76bca0
--- /dev/null
+++ b/builder/null/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var NullPluginVersion *version.PluginVersion
+
+func init() {
+	NullPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/oneandone/builder.go b/builder/oneandone/builder.go
index 8fe3526fd..915d1c470 100644
--- a/builder/oneandone/builder.go
+++ b/builder/oneandone/builder.go
@@ -6,10 +6,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 const BuilderId = "packer.oneandone"
@@ -49,14 +49,14 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      communicator.CommHost(b.config.Comm.Host(), "server_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		new(stepTakeSnapshot),
 	}
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/oneandone/config.go b/builder/oneandone/config.go
index a0a5e6109..c11e2e925 100644
--- a/builder/oneandone/config.go
+++ b/builder/oneandone/config.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/oneandone/config.hcl2spec.go b/builder/oneandone/config.hcl2spec.go
index b13d2bedd..05ca4c7a4 100644
--- a/builder/oneandone/config.hcl2spec.go
+++ b/builder/oneandone/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -89,6 +90,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/oneandone/step_create_server.go b/builder/oneandone/step_create_server.go
index 6d70db862..3cd1e7de7 100644
--- a/builder/oneandone/step_create_server.go
+++ b/builder/oneandone/step_create_server.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateServer struct{}
diff --git a/builder/oneandone/step_create_sshkey.go b/builder/oneandone/step_create_sshkey.go
index 8a3613560..2da8f5839 100644
--- a/builder/oneandone/step_create_sshkey.go
+++ b/builder/oneandone/step_create_sshkey.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/oneandone/step_take_snapshot.go b/builder/oneandone/step_take_snapshot.go
index d5c3c757f..c5b128ef5 100644
--- a/builder/oneandone/step_take_snapshot.go
+++ b/builder/oneandone/step_take_snapshot.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/1and1/oneandone-cloudserver-sdk-go"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepTakeSnapshot struct{}
diff --git a/builder/oneandone/version/version.go b/builder/oneandone/version/version.go
new file mode 100644
index 000000000..ba95169b8
--- /dev/null
+++ b/builder/oneandone/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var OneAndOnePluginVersion *version.PluginVersion
+
+func init() {
+	OneAndOnePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/openstack/access_config.go b/builder/openstack/access_config.go
index 0fe669666..fafcdae65 100644
--- a/builder/openstack/access_config.go
+++ b/builder/openstack/access_config.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gophercloud/utils/openstack/clientconfig"
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // AccessConfig is for common configuration related to openstack access
diff --git a/builder/openstack/builder.go b/builder/openstack/builder.go
index 44df3ff9e..a61b1d547 100644
--- a/builder/openstack/builder.go
+++ b/builder/openstack/builder.go
@@ -10,12 +10,13 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -155,8 +156,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHIPVersion),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&StepStopServer{},
@@ -173,7 +174,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/openstack/builder.hcl2spec.go b/builder/openstack/builder.hcl2spec.go
index dab0f357e..e85e8ecc4 100644
--- a/builder/openstack/builder.hcl2spec.go
+++ b/builder/openstack/builder.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName             *string                 `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType           *string                 `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion           *string                 `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                 *bool                   `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                 *bool                   `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError               *string                 `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -141,6 +142,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/openstack/image_config.go b/builder/openstack/image_config.go
index f5c8d5a11..d36e5caae 100644
--- a/builder/openstack/image_config.go
+++ b/builder/openstack/image_config.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // ImageConfig is for common configuration related to creating Images.
diff --git a/builder/openstack/run_config.go b/builder/openstack/run_config.go
index f8bc3b514..b57124465 100644
--- a/builder/openstack/run_config.go
+++ b/builder/openstack/run_config.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // RunConfig contains configuration for running an instance from a source image
diff --git a/builder/openstack/server.go b/builder/openstack/server.go
index f509452d6..af7b3c3dc 100644
--- a/builder/openstack/server.go
+++ b/builder/openstack/server.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StateRefreshFunc is a function type used for StateChangeConf that is
diff --git a/builder/openstack/ssh.go b/builder/openstack/ssh.go
index dab50dc24..95fb1e32c 100644
--- a/builder/openstack/ssh.go
+++ b/builder/openstack/ssh.go
@@ -9,7 +9,7 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // CommHost looks up the host for the communicator.
diff --git a/builder/openstack/step_add_image_members.go b/builder/openstack/step_add_image_members.go
index d8087c542..cbbb9f5e6 100644
--- a/builder/openstack/step_add_image_members.go
+++ b/builder/openstack/step_add_image_members.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/members"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepAddImageMembers struct{}
diff --git a/builder/openstack/step_allocate_ip.go b/builder/openstack/step_allocate_ip.go
index 8b0701491..6ba8c0262 100644
--- a/builder/openstack/step_allocate_ip.go
+++ b/builder/openstack/step_allocate_ip.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepAllocateIp struct {
diff --git a/builder/openstack/step_create_image.go b/builder/openstack/step_create_image.go
index 637e3c70e..b2f792d0d 100644
--- a/builder/openstack/step_create_image.go
+++ b/builder/openstack/step_create_image.go
@@ -11,8 +11,8 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateImage struct {
diff --git a/builder/openstack/step_create_volume.go b/builder/openstack/step_create_volume.go
index 1e74ba1e9..687d92a54 100644
--- a/builder/openstack/step_create_volume.go
+++ b/builder/openstack/step_create_volume.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/v3/volumes"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateVolume struct {
diff --git a/builder/openstack/step_detach_volume.go b/builder/openstack/step_detach_volume.go
index fe6d76922..d711e87a2 100644
--- a/builder/openstack/step_detach_volume.go
+++ b/builder/openstack/step_detach_volume.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/blockstorage/extensions/volumeactions"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDetachVolume struct {
diff --git a/builder/openstack/step_discover_network.go b/builder/openstack/step_discover_network.go
index 4f653685a..811c98a55 100644
--- a/builder/openstack/step_discover_network.go
+++ b/builder/openstack/step_discover_network.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDiscoverNetwork struct {
diff --git a/builder/openstack/step_get_password.go b/builder/openstack/step_get_password.go
index fd9bfa156..f039198fb 100644
--- a/builder/openstack/step_get_password.go
+++ b/builder/openstack/step_get_password.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/openstack/step_key_pair.go b/builder/openstack/step_key_pair.go
index 87a6ed011..1faa67787 100644
--- a/builder/openstack/step_key_pair.go
+++ b/builder/openstack/step_key_pair.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/openstack/step_load_flavor.go b/builder/openstack/step_load_flavor.go
index bc9d4aa35..7e7176640 100644
--- a/builder/openstack/step_load_flavor.go
+++ b/builder/openstack/step_load_flavor.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/flavors"
 	flavors_utils "github.com/gophercloud/utils/openstack/compute/v2/flavors"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepLoadFlavor gets the FlavorRef from a Flavor. It first assumes
diff --git a/builder/openstack/step_run_source_server.go b/builder/openstack/step_run_source_server.go
index 59cf63afe..007023de8 100644
--- a/builder/openstack/step_run_source_server.go
+++ b/builder/openstack/step_run_source_server.go
@@ -9,8 +9,8 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/bootfromvolume"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRunSourceServer struct {
diff --git a/builder/openstack/step_source_image_info.go b/builder/openstack/step_source_image_info.go
index 5344431fd..3b7c5b798 100644
--- a/builder/openstack/step_source_image_info.go
+++ b/builder/openstack/step_source_image_info.go
@@ -9,8 +9,8 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/imageimport"
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
 	"github.com/gophercloud/gophercloud/pagination"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSourceImageInfo struct {
diff --git a/builder/openstack/step_stop_server.go b/builder/openstack/step_stop_server.go
index 9e6f35b74..f4e00e25e 100644
--- a/builder/openstack/step_stop_server.go
+++ b/builder/openstack/step_stop_server.go
@@ -8,8 +8,8 @@ import (
 	"github.com/gophercloud/gophercloud"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/startstop"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepStopServer struct{}
diff --git a/builder/openstack/step_update_image_mindisk.go b/builder/openstack/step_update_image_mindisk.go
index 63ec2709d..15412f29b 100644
--- a/builder/openstack/step_update_image_mindisk.go
+++ b/builder/openstack/step_update_image_mindisk.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepUpdateImageMinDisk struct{}
diff --git a/builder/openstack/step_update_image_tags.go b/builder/openstack/step_update_image_tags.go
index 31d0c767f..8f0adf582 100644
--- a/builder/openstack/step_update_image_tags.go
+++ b/builder/openstack/step_update_image_tags.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepUpdateImageTags struct{}
diff --git a/builder/openstack/step_update_image_visibility.go b/builder/openstack/step_update_image_visibility.go
index a3ecaae18..fb2ab9fd1 100644
--- a/builder/openstack/step_update_image_visibility.go
+++ b/builder/openstack/step_update_image_visibility.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	imageservice "github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepUpdateImageVisibility struct{}
diff --git a/builder/openstack/step_wait_for_rackconnect.go b/builder/openstack/step_wait_for_rackconnect.go
index 3816962bf..3386642f5 100644
--- a/builder/openstack/step_wait_for_rackconnect.go
+++ b/builder/openstack/step_wait_for_rackconnect.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepWaitForRackConnect struct {
diff --git a/builder/openstack/version/version.go b/builder/openstack/version/version.go
new file mode 100644
index 000000000..26f7141ec
--- /dev/null
+++ b/builder/openstack/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var OpenstackPluginVersion *version.PluginVersion
+
+func init() {
+	OpenstackPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/oracle/classic/builder.go b/builder/oracle/classic/builder.go
index 6a49f808a..fc97066f1 100644
--- a/builder/oracle/classic/builder.go
+++ b/builder/oracle/classic/builder.go
@@ -12,10 +12,10 @@ import (
 	"github.com/hashicorp/go-oracle-terraform/opc"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ocommon "github.com/hashicorp/packer/builder/oracle/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // BuilderId uniquely identifies the builder
@@ -106,7 +106,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&common.StepProvision{},
+			&commonsteps.StepProvision{},
 			&stepTerminatePVMaster{},
 			&stepSecurity{
 				SecurityListKey: "security_list_builder",
@@ -142,7 +142,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			},
 			&stepCreateImage{},
 			&stepListImages{},
-			&common.StepCleanupTempKeys{
+			&commonsteps.StepCleanupTempKeys{
 				Comm: &b.config.Comm,
 			},
 		}
@@ -169,8 +169,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&common.StepProvision{},
-			&common.StepCleanupTempKeys{
+			&commonsteps.StepProvision{},
+			&commonsteps.StepCleanupTempKeys{
 				Comm: &b.config.Comm,
 			},
 			&stepSnapshot{},
@@ -179,7 +179,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/oracle/classic/builder.hcl2spec.go b/builder/oracle/classic/builder.hcl2spec.go
index a97463e68..6f7fdad38 100644
--- a/builder/oracle/classic/builder.hcl2spec.go
+++ b/builder/oracle/classic/builder.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string                  `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string                  `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                  `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool                    `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool                    `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string                  `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -102,6 +103,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/oracle/classic/config.go b/builder/oracle/classic/config.go
index 6f66d7a81..a463fe787 100644
--- a/builder/oracle/classic/config.go
+++ b/builder/oracle/classic/config.go
@@ -9,11 +9,11 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/builder/oracle/classic/pv_config.go b/builder/oracle/classic/pv_config.go
index e101dc8d8..8321dee5f 100644
--- a/builder/oracle/classic/pv_config.go
+++ b/builder/oracle/classic/pv_config.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/hashicorp/packer/helper/communicator"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const imageListDefault = "/oracle/public/OL_7.2_UEKR4_x86_64"
diff --git a/builder/oracle/classic/step_add_keys.go b/builder/oracle/classic/step_add_keys.go
index c68574d16..60a448560 100644
--- a/builder/oracle/classic/step_add_keys.go
+++ b/builder/oracle/classic/step_add_keys.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepAddKeysToAPI struct {
diff --git a/builder/oracle/classic/step_attach_volume.go b/builder/oracle/classic/step_attach_volume.go
index ffa525aa6..e0882f35b 100644
--- a/builder/oracle/classic/step_attach_volume.go
+++ b/builder/oracle/classic/step_attach_volume.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepAttachVolume struct {
diff --git a/builder/oracle/classic/step_connect_builder.go b/builder/oracle/classic/step_connect_builder.go
index 1e8aa021e..88639c793 100644
--- a/builder/oracle/classic/step_connect_builder.go
+++ b/builder/oracle/classic/step_connect_builder.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepConnectBuilder struct {
diff --git a/builder/oracle/classic/step_create_image.go b/builder/oracle/classic/step_create_image.go
index abff43c4d..481d03406 100644
--- a/builder/oracle/classic/step_create_image.go
+++ b/builder/oracle/classic/step_create_image.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateImage struct {
diff --git a/builder/oracle/classic/step_create_instance.go b/builder/oracle/classic/step_create_instance.go
index 0d685a983..35fd4e9b6 100644
--- a/builder/oracle/classic/step_create_instance.go
+++ b/builder/oracle/classic/step_create_instance.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateInstance struct{}
diff --git a/builder/oracle/classic/step_create_ip_reservation.go b/builder/oracle/classic/step_create_ip_reservation.go
index e1005657d..367ba9221 100644
--- a/builder/oracle/classic/step_create_ip_reservation.go
+++ b/builder/oracle/classic/step_create_ip_reservation.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type stepCreateIPReservation struct{}
diff --git a/builder/oracle/classic/step_create_persistent_volume.go b/builder/oracle/classic/step_create_persistent_volume.go
index 02438d343..349fc0b8b 100644
--- a/builder/oracle/classic/step_create_persistent_volume.go
+++ b/builder/oracle/classic/step_create_persistent_volume.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreatePersistentVolume struct {
diff --git a/builder/oracle/classic/step_create_pv_builder.go b/builder/oracle/classic/step_create_pv_builder.go
index b1f991f35..a544c9615 100644
--- a/builder/oracle/classic/step_create_pv_builder.go
+++ b/builder/oracle/classic/step_create_pv_builder.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreatePVBuilder struct {
diff --git a/builder/oracle/classic/step_create_pv_master.go b/builder/oracle/classic/step_create_pv_master.go
index e9f16903f..28e85fe6d 100644
--- a/builder/oracle/classic/step_create_pv_master.go
+++ b/builder/oracle/classic/step_create_pv_master.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreatePVMaster struct {
diff --git a/builder/oracle/classic/step_list_images.go b/builder/oracle/classic/step_list_images.go
index 0248bae84..8b30d2cbb 100644
--- a/builder/oracle/classic/step_list_images.go
+++ b/builder/oracle/classic/step_list_images.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepListImages struct{}
diff --git a/builder/oracle/classic/step_security.go b/builder/oracle/classic/step_security.go
index f69b6c9b0..d6ad9252c 100644
--- a/builder/oracle/classic/step_security.go
+++ b/builder/oracle/classic/step_security.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepSecurity struct {
diff --git a/builder/oracle/classic/step_snapshot.go b/builder/oracle/classic/step_snapshot.go
index f11f718e0..993bc2835 100644
--- a/builder/oracle/classic/step_snapshot.go
+++ b/builder/oracle/classic/step_snapshot.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepSnapshot struct {
diff --git a/builder/oracle/classic/step_terminate_pv_master.go b/builder/oracle/classic/step_terminate_pv_master.go
index 527d63ba6..0d4d2a013 100644
--- a/builder/oracle/classic/step_terminate_pv_master.go
+++ b/builder/oracle/classic/step_terminate_pv_master.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/go-oracle-terraform/compute"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepTerminatePVMaster struct {
diff --git a/builder/oracle/classic/step_upload_image.go b/builder/oracle/classic/step_upload_image.go
index 746637042..04fd1e896 100644
--- a/builder/oracle/classic/step_upload_image.go
+++ b/builder/oracle/classic/step_upload_image.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type stepUploadImage struct {
diff --git a/builder/oracle/common/step_ssh_key_pair.go b/builder/oracle/common/step_ssh_key_pair.go
index 187eb28af..3a87a824a 100644
--- a/builder/oracle/common/step_ssh_key_pair.go
+++ b/builder/oracle/common/step_ssh_key_pair.go
@@ -11,8 +11,8 @@ import (
 	"runtime"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/oracle/oci/builder.go b/builder/oracle/oci/builder.go
index 96eaee591..0368ac678 100644
--- a/builder/oracle/oci/builder.go
+++ b/builder/oracle/oci/builder.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ocommon "github.com/hashicorp/packer/builder/oracle/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"github.com/oracle/oci-go-sdk/core"
 )
 
@@ -70,15 +70,15 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      communicator.CommHost(b.config.Comm.Host(), "instance_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		&stepImage{},
 	}
 
 	// Run the steps
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/oracle/oci/config.go b/builder/oracle/oci/config.go
index cc47c893e..4f2ca5e50 100644
--- a/builder/oracle/oci/config.go
+++ b/builder/oracle/oci/config.go
@@ -13,11 +13,11 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	ocicommon "github.com/oracle/oci-go-sdk/common"
 	ociauth "github.com/oracle/oci-go-sdk/common/auth"
 )
diff --git a/builder/oracle/oci/config.hcl2spec.go b/builder/oracle/oci/config.hcl2spec.go
index 99603843e..3aef13236 100644
--- a/builder/oracle/oci/config.hcl2spec.go
+++ b/builder/oracle/oci/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string                           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string                           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool                             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool                             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string                           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -109,6 +110,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/oracle/oci/step_create_instance.go b/builder/oracle/oci/step_create_instance.go
index 6746fdad4..0ebe41eab 100644
--- a/builder/oracle/oci/step_create_instance.go
+++ b/builder/oracle/oci/step_create_instance.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCreateInstance struct{}
diff --git a/builder/oracle/oci/step_create_instance_test.go b/builder/oracle/oci/step_create_instance_test.go
index 6ab2ceb67..436802c69 100644
--- a/builder/oracle/oci/step_create_instance_test.go
+++ b/builder/oracle/oci/step_create_instance_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateInstance(t *testing.T) {
diff --git a/builder/oracle/oci/step_get_default_credentials.go b/builder/oracle/oci/step_get_default_credentials.go
index 0ed44b7f6..602565050 100644
--- a/builder/oracle/oci/step_get_default_credentials.go
+++ b/builder/oracle/oci/step_get_default_credentials.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepGetDefaultCredentials struct {
diff --git a/builder/oracle/oci/step_image.go b/builder/oracle/oci/step_image.go
index b3d37da0a..460aa9c91 100644
--- a/builder/oracle/oci/step_image.go
+++ b/builder/oracle/oci/step_image.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepImage struct{}
diff --git a/builder/oracle/oci/step_image_test.go b/builder/oracle/oci/step_image_test.go
index 955d557a9..c142872ec 100644
--- a/builder/oracle/oci/step_image_test.go
+++ b/builder/oracle/oci/step_image_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepImage(t *testing.T) {
diff --git a/builder/oracle/oci/step_instance_info.go b/builder/oracle/oci/step_instance_info.go
index 63b9120c1..e1052b5ed 100644
--- a/builder/oracle/oci/step_instance_info.go
+++ b/builder/oracle/oci/step_instance_info.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepInstanceInfo struct{}
diff --git a/builder/oracle/oci/step_instance_info_test.go b/builder/oracle/oci/step_instance_info_test.go
index d4e18dd44..6b13cc1a7 100644
--- a/builder/oracle/oci/step_instance_info_test.go
+++ b/builder/oracle/oci/step_instance_info_test.go
@@ -6,8 +6,8 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestInstanceInfo(t *testing.T) {
diff --git a/builder/oracle/oci/step_test.go b/builder/oracle/oci/step_test.go
index deeff1b1a..1c95870fd 100644
--- a/builder/oracle/oci/step_test.go
+++ b/builder/oracle/oci/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // TODO(apryde): It would be good not to have to write a key file to disk to
diff --git a/builder/oracle/version/version.go b/builder/oracle/version/version.go
new file mode 100644
index 000000000..81b5e2aba
--- /dev/null
+++ b/builder/oracle/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var OraclePluginVersion *version.PluginVersion
+
+func init() {
+	OraclePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go
index 83de3d0c0..0f05b93ad 100644
--- a/builder/osc/bsu/builder.go
+++ b/builder/osc/bsu/builder.go
@@ -13,12 +13,13 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -163,8 +164,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHInterface),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&osccommon.StepStopBSUBackedVm{
@@ -194,7 +195,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 	}
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/osc/bsu/builder.hcl2spec.go b/builder/osc/bsu/builder.hcl2spec.go
index 4351186e8..0b09c2099 100644
--- a/builder/osc/bsu/builder.hcl2spec.go
+++ b/builder/osc/bsu/builder.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName             *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType           *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion           *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                 *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                 *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError               *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -137,6 +138,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                    &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":                  &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":                  &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                         &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                         &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                      &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/osc/bsu/step_create_omi.go b/builder/osc/bsu/step_create_omi.go
index 015a1008f..0b7935173 100644
--- a/builder/osc/bsu/step_create_omi.go
+++ b/builder/osc/bsu/step_create_omi.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/antihax/optional"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/bsusurrogate/builder.go b/builder/osc/bsusurrogate/builder.go
index b38ea3d8d..b4e2f2db2 100644
--- a/builder/osc/bsusurrogate/builder.go
+++ b/builder/osc/bsusurrogate/builder.go
@@ -11,12 +11,13 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "oapi.outscale.bsusurrogate"
@@ -185,8 +186,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHInterface),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&osccommon.StepStopBSUBackedVm{
@@ -221,7 +222,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 	}
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/osc/bsusurrogate/builder.hcl2spec.go b/builder/osc/bsusurrogate/builder.hcl2spec.go
index e58e67e24..8912e9f35 100644
--- a/builder/osc/bsusurrogate/builder.hcl2spec.go
+++ b/builder/osc/bsusurrogate/builder.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName             *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType           *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion           *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                 *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                 *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError               *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -138,6 +139,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                    &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":                  &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":                  &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                         &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                         &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                      &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/osc/bsusurrogate/root_block_device.go b/builder/osc/bsusurrogate/root_block_device.go
index 78616f3d4..987636b12 100644
--- a/builder/osc/bsusurrogate/root_block_device.go
+++ b/builder/osc/bsusurrogate/root_block_device.go
@@ -3,7 +3,7 @@ package bsusurrogate
 import (
 	"errors"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type RootBlockDevice struct {
diff --git a/builder/osc/bsusurrogate/step_register_omi.go b/builder/osc/bsusurrogate/step_register_omi.go
index 3d8541df8..f63a87135 100644
--- a/builder/osc/bsusurrogate/step_register_omi.go
+++ b/builder/osc/bsusurrogate/step_register_omi.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/antihax/optional"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/bsusurrogate/step_snapshop_volumes.go b/builder/osc/bsusurrogate/step_snapshop_volumes.go
index cc0743e38..2f1d027dd 100644
--- a/builder/osc/bsusurrogate/step_snapshop_volumes.go
+++ b/builder/osc/bsusurrogate/step_snapshop_volumes.go
@@ -9,8 +9,8 @@ import (
 	"github.com/antihax/optional"
 	multierror "github.com/hashicorp/go-multierror"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/bsuvolume/block_device.go b/builder/osc/bsuvolume/block_device.go
index 3217fef7f..e2ee2d375 100644
--- a/builder/osc/bsuvolume/block_device.go
+++ b/builder/osc/bsuvolume/block_device.go
@@ -2,7 +2,7 @@ package bsuvolume
 
 import (
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type BlockDevice struct {
diff --git a/builder/osc/bsuvolume/builder.go b/builder/osc/bsuvolume/builder.go
index 48fd55e26..05a2f9c43 100644
--- a/builder/osc/bsuvolume/builder.go
+++ b/builder/osc/bsuvolume/builder.go
@@ -11,12 +11,13 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "oapi.outscale.bsuvolume"
@@ -173,8 +174,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.SSHInterface),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.RunConfig.Comm,
 		},
 		&osccommon.StepStopBSUBackedVm{
@@ -184,7 +185,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/osc/bsuvolume/builder.hcl2spec.go b/builder/osc/bsuvolume/builder.hcl2spec.go
index 5adf365d4..c7adc465b 100644
--- a/builder/osc/bsuvolume/builder.hcl2spec.go
+++ b/builder/osc/bsuvolume/builder.hcl2spec.go
@@ -51,6 +51,7 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 type FlatConfig struct {
 	PackerBuildName             *string                                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType           *string                                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion           *string                                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                 *bool                                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                 *bool                                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError               *string                                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -161,6 +162,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":                    &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":                  &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":                  &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                         &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                         &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                      &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/osc/bsuvolume/step_tag_bsu_volumes.go b/builder/osc/bsuvolume/step_tag_bsu_volumes.go
index 06ef9421f..4d313ffd3 100644
--- a/builder/osc/bsuvolume/step_tag_bsu_volumes.go
+++ b/builder/osc/bsuvolume/step_tag_bsu_volumes.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/chroot/builder.go b/builder/osc/chroot/builder.go
index 389fd60d3..7740bc357 100644
--- a/builder/osc/chroot/builder.go
+++ b/builder/osc/chroot/builder.go
@@ -13,11 +13,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -278,7 +279,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	)
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/osc/chroot/builder.hcl2spec.go b/builder/osc/chroot/builder.hcl2spec.go
index 6a40db920..cf16a909a 100644
--- a/builder/osc/chroot/builder.hcl2spec.go
+++ b/builder/osc/chroot/builder.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName         *string                      `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType       *string                      `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion       *string                      `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug             *bool                        `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce             *bool                        `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError           *string                      `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -76,6 +77,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/osc/chroot/cleanup.go b/builder/osc/chroot/cleanup.go
index 0befac174..37691305a 100644
--- a/builder/osc/chroot/cleanup.go
+++ b/builder/osc/chroot/cleanup.go
@@ -1,7 +1,7 @@
 package chroot
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Cleanup is an interface that some steps implement for early cleanup.
diff --git a/builder/osc/chroot/communicator.go b/builder/osc/chroot/communicator.go
index c5306fe2f..8fc79163e 100644
--- a/builder/osc/chroot/communicator.go
+++ b/builder/osc/chroot/communicator.go
@@ -14,7 +14,7 @@ import (
 	"syscall"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // Communicator is a special communicator that works by executing
diff --git a/builder/osc/chroot/run_local_commands.go b/builder/osc/chroot/run_local_commands.go
index 9a93f8791..175a2afa6 100644
--- a/builder/osc/chroot/run_local_commands.go
+++ b/builder/osc/chroot/run_local_commands.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func RunLocalCommands(commands []string, wrappedCommand CommandWrapper, ictx interpolate.Context, ui packer.Ui) error {
diff --git a/builder/osc/chroot/step_check_root_device.go b/builder/osc/chroot/step_check_root_device.go
index 22ec04c29..418fd3909 100644
--- a/builder/osc/chroot/step_check_root_device.go
+++ b/builder/osc/chroot/step_check_root_device.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go
index e621f2fb6..ef659c41b 100644
--- a/builder/osc/chroot/step_chroot_provision.go
+++ b/builder/osc/chroot/step_chroot_provision.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // StepChrootProvision provisions the instance within a chroot.
@@ -26,7 +26,7 @@ func (s *StepChrootProvision) Run(ctx context.Context, state multistep.StateBag)
 	}
 
 	// Loads hook data from builder's state, if it has been set.
-	hookData := common.PopulateProvisionHookData(state)
+	hookData := commonsteps.PopulateProvisionHookData(state)
 
 	// Update state generated_data with complete hookData
 	// to make them accessible by post-processors
diff --git a/builder/osc/chroot/step_copy_files.go b/builder/osc/chroot/step_copy_files.go
index 78625a8d3..a7c7adbcb 100644
--- a/builder/osc/chroot/step_copy_files.go
+++ b/builder/osc/chroot/step_copy_files.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCopyFiles copies some files from the host into the chroot environment.
diff --git a/builder/osc/chroot/step_create_omi.go b/builder/osc/chroot/step_create_omi.go
index b9f65ea28..cfd43fdb4 100644
--- a/builder/osc/chroot/step_create_omi.go
+++ b/builder/osc/chroot/step_create_omi.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/antihax/optional"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/chroot/step_create_volume.go b/builder/osc/chroot/step_create_volume.go
index cd6bfc499..f2fdc7ab3 100644
--- a/builder/osc/chroot/step_create_volume.go
+++ b/builder/osc/chroot/step_create_volume.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/antihax/optional"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/chroot/step_early_cleanup.go b/builder/osc/chroot/step_early_cleanup.go
index 42d7d66c5..e84ac77e2 100644
--- a/builder/osc/chroot/step_early_cleanup.go
+++ b/builder/osc/chroot/step_early_cleanup.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepEarlyCleanup performs some of the cleanup steps early in order to
diff --git a/builder/osc/chroot/step_early_unflock.go b/builder/osc/chroot/step_early_unflock.go
index b16becc61..3a39fb7fe 100644
--- a/builder/osc/chroot/step_early_unflock.go
+++ b/builder/osc/chroot/step_early_unflock.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepEarlyUnflock unlocks the flock.
diff --git a/builder/osc/chroot/step_flock.go b/builder/osc/chroot/step_flock.go
index f3fd9d29e..5465a72fe 100644
--- a/builder/osc/chroot/step_flock.go
+++ b/builder/osc/chroot/step_flock.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepFlock provisions the instance within a chroot.
diff --git a/builder/osc/chroot/step_link_volume.go b/builder/osc/chroot/step_link_volume.go
index 7e51caebd..6940e64c4 100644
--- a/builder/osc/chroot/step_link_volume.go
+++ b/builder/osc/chroot/step_link_volume.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/antihax/optional"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/chroot/step_mount_device.go b/builder/osc/chroot/step_mount_device.go
index 5a27c1403..936425ac0 100644
--- a/builder/osc/chroot/step_mount_device.go
+++ b/builder/osc/chroot/step_mount_device.go
@@ -9,9 +9,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type mountPathData struct {
diff --git a/builder/osc/chroot/step_mount_extra.go b/builder/osc/chroot/step_mount_extra.go
index 089bf7e75..f9b70dc4f 100644
--- a/builder/osc/chroot/step_mount_extra.go
+++ b/builder/osc/chroot/step_mount_extra.go
@@ -8,8 +8,8 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepMountExtra mounts the attached device.
diff --git a/builder/osc/chroot/step_post_mount_commands.go b/builder/osc/chroot/step_post_mount_commands.go
index 704af428f..303ddeee5 100644
--- a/builder/osc/chroot/step_post_mount_commands.go
+++ b/builder/osc/chroot/step_post_mount_commands.go
@@ -3,8 +3,8 @@ package chroot
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type postMountCommandsData struct {
diff --git a/builder/osc/chroot/step_pre_mount_commands.go b/builder/osc/chroot/step_pre_mount_commands.go
index 9a60256fe..26e93adf3 100644
--- a/builder/osc/chroot/step_pre_mount_commands.go
+++ b/builder/osc/chroot/step_pre_mount_commands.go
@@ -3,8 +3,8 @@ package chroot
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type preMountCommandsData struct {
diff --git a/builder/osc/chroot/step_prepare_device.go b/builder/osc/chroot/step_prepare_device.go
index 0939d33cd..65af71acf 100644
--- a/builder/osc/chroot/step_prepare_device.go
+++ b/builder/osc/chroot/step_prepare_device.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepPrepareDevice finds an available device and sets it.
diff --git a/builder/osc/chroot/step_snapshot.go b/builder/osc/chroot/step_snapshot.go
index cb9ee6add..04e036462 100644
--- a/builder/osc/chroot/step_snapshot.go
+++ b/builder/osc/chroot/step_snapshot.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/antihax/optional"
 	osccommon "github.com/hashicorp/packer/builder/osc/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/chroot/step_vm_info.go b/builder/osc/chroot/step_vm_info.go
index 3662ad9a8..fa9d6079e 100644
--- a/builder/osc/chroot/step_vm_info.go
+++ b/builder/osc/chroot/step_vm_info.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/access_config.go b/builder/osc/common/access_config.go
index e02d335c7..beb040dfe 100644
--- a/builder/osc/common/access_config.go
+++ b/builder/osc/common/access_config.go
@@ -7,7 +7,7 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
@@ -47,6 +47,11 @@ func (c *AccessConfig) NewOSCClient() *osc.APIClient {
 
 	if c.CustomEndpointOAPI == "" {
 		c.CustomEndpointOAPI = "outscale.com/oapi/latest"
+
+		if c.RawRegion == "cn-southeast-1" {
+			c.CustomEndpointOAPI = "outscale.hk/oapi/latest"
+		}
+
 	}
 
 	if c.X509certPath == "" {
diff --git a/builder/osc/common/block_device.go b/builder/osc/common/block_device.go
index 765adbc80..32484de3e 100644
--- a/builder/osc/common/block_device.go
+++ b/builder/osc/common/block_device.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/interpolate_build_info.go b/builder/osc/common/interpolate_build_info.go
index 00f530319..820c63296 100644
--- a/builder/osc/common/interpolate_build_info.go
+++ b/builder/osc/common/interpolate_build_info.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/interpolate_build_info_test.go b/builder/osc/common/interpolate_build_info_test.go
index 5e2deef3a..949e73c04 100644
--- a/builder/osc/common/interpolate_build_info_test.go
+++ b/builder/osc/common/interpolate_build_info_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/omi_config.go b/builder/osc/common/omi_config.go
index c4c8e5e0d..a316d0298 100644
--- a/builder/osc/common/omi_config.go
+++ b/builder/osc/common/omi_config.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // OMIConfig is for common configuration related to creating OMIs.
diff --git a/common/retry.go b/builder/osc/common/retry/retry.go
similarity index 88%
rename from common/retry.go
rename to builder/osc/common/retry/retry.go
index b820cf817..531000335 100644
--- a/common/retry.go
+++ b/builder/osc/common/retry/retry.go
@@ -1,4 +1,4 @@
-package common
+package retry
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ var RetryExhaustedError error = fmt.Errorf("Function never succeeded in Retry")
 type RetryableFunc func(uint) (bool, error)
 
 /*
-Retry retries a function up to numTries times with exponential backoff.
+Run retries a function up to numTries times with exponential backoff.
 If numTries == 0, retry indefinitely.
 If interval == 0, Retry will not delay retrying and there will be no
 exponential backoff.
@@ -24,7 +24,7 @@ Intervals are in seconds.
 Returns an error if initial > max intervals, if retries are exhausted, or if the passed function returns
 an error.
 */
-func Retry(initialInterval float64, maxInterval float64, numTries uint, function RetryableFunc) error {
+func Run(initialInterval float64, maxInterval float64, numTries uint, function RetryableFunc) error {
 	if maxInterval == 0 {
 		maxInterval = math.Inf(1)
 	} else if initialInterval < 0 || initialInterval > maxInterval {
diff --git a/common/retry_test.go b/builder/osc/common/retry/retry_test.go
similarity index 87%
rename from common/retry_test.go
rename to builder/osc/common/retry/retry_test.go
index 364f31a5c..9936b2652 100644
--- a/common/retry_test.go
+++ b/builder/osc/common/retry/retry_test.go
@@ -1,4 +1,4 @@
-package common
+package retry
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 func TestRetry(t *testing.T) {
 	numTries := uint(0)
 	// Test that a passing function only gets called once.
-	err := Retry(0, 0, 0, func(i uint) (bool, error) {
+	err := Run(0, 0, 0, func(i uint) (bool, error) {
 		numTries++
 		return true, nil
 	})
@@ -22,7 +22,7 @@ func TestRetry(t *testing.T) {
 	// Test that a failing function gets retried (once in this example).
 	numTries = 0
 	results := []bool{false, true}
-	err = Retry(0, 0, 0, func(i uint) (bool, error) {
+	err = Run(0, 0, 0, func(i uint) (bool, error) {
 		result := results[numTries]
 		numTries++
 		return result, nil
@@ -37,7 +37,7 @@ func TestRetry(t *testing.T) {
 	// Test that a function error gets returned, and the function does not get called again.
 	numTries = 0
 	funcErr := fmt.Errorf("This function had an error!")
-	err = Retry(0, 0, 0, func(i uint) (bool, error) {
+	err = Run(0, 0, 0, func(i uint) (bool, error) {
 		numTries++
 		return false, funcErr
 	})
@@ -51,7 +51,7 @@ func TestRetry(t *testing.T) {
 	// Test when a function exhausts its retries.
 	numTries = 0
 	expectedTries := uint(3)
-	err = Retry(0, 0, expectedTries, func(i uint) (bool, error) {
+	err = Run(0, 0, expectedTries, func(i uint) (bool, error) {
 		numTries++
 		return false, nil
 	})
diff --git a/builder/osc/common/run_config.go b/builder/osc/common/run_config.go
index ff79d6bc6..088f1ca8c 100644
--- a/builder/osc/common/run_config.go
+++ b/builder/osc/common/run_config.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
@@ -21,9 +21,9 @@ var reShutdownBehavior = regexp.MustCompile("^(stop|terminate)$")
 // docs at
 // https://wiki.outscale.net/display/EN/Getting+Information+About+Your+OMIs
 type OmiFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
-	Owners                       []string
-	MostRecent                   bool `mapstructure:"most_recent"`
+	config.NameValueFilter `mapstructure:",squash"`
+	Owners                 []string
+	MostRecent             bool `mapstructure:"most_recent"`
 }
 
 func (d *OmiFilterOptions) Empty() bool {
@@ -37,20 +37,20 @@ func (d *OmiFilterOptions) NoOwner() bool {
 // docs at
 // https://wiki.outscale.net/display/EN/Getting+Information+About+Your+Subnets
 type SubnetFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
-	MostFree                     bool `mapstructure:"most_free"`
-	Random                       bool `mapstructure:"random"`
+	config.NameValueFilter `mapstructure:",squash"`
+	MostFree               bool `mapstructure:"most_free"`
+	Random                 bool `mapstructure:"random"`
 }
 
 // docs at https://docs.outscale.com/api#tocsfiltersnet
 type NetFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
+	config.NameValueFilter `mapstructure:",squash"`
 }
 
 // docs at
 // https://wiki.outscale.net/display/EN/Getting+Information+About+Your+Security+Groups
 type SecurityGroupFilterOptions struct {
-	hcl2template.NameValueFilter `mapstructure:",squash"`
+	config.NameValueFilter `mapstructure:",squash"`
 }
 
 // RunConfig contains configuration for running an vm from a source
diff --git a/builder/osc/common/run_config.hcl2spec.go b/builder/osc/common/run_config.hcl2spec.go
index c3906cbdc..47ee128f7 100644
--- a/builder/osc/common/run_config.hcl2spec.go
+++ b/builder/osc/common/run_config.hcl2spec.go
@@ -3,7 +3,7 @@ package common
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -47,8 +47,8 @@ func (*FlatBlockDevice) HCL2Spec() map[string]hcldec.Spec {
 // FlatNetFilterOptions is an auto-generated flat version of NetFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatNetFilterOptions struct {
-	Filters map[string]string            `cty:"filters" hcl:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string      `cty:"filters" hcl:"filters"`
+	Filter  []config.FlatNameValue `cty:"filter" hcl:"filter"`
 }
 
 // FlatMapstructure returns a new FlatNetFilterOptions.
@@ -64,7 +64,7 @@ func (*NetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 func (*FlatNetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -72,10 +72,10 @@ func (*FlatNetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatOmiFilterOptions is an auto-generated flat version of OmiFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatOmiFilterOptions struct {
-	Filters    map[string]string            `cty:"filters" hcl:"filters"`
-	Filter     []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
-	Owners     []string                     `cty:"owners" hcl:"owners"`
-	MostRecent *bool                        `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"`
+	Filters    map[string]string      `cty:"filters" hcl:"filters"`
+	Filter     []config.FlatNameValue `cty:"filter" hcl:"filter"`
+	Owners     []string               `cty:"owners" hcl:"owners"`
+	MostRecent *bool                  `mapstructure:"most_recent" cty:"most_recent" hcl:"most_recent"`
 }
 
 // FlatMapstructure returns a new FlatOmiFilterOptions.
@@ -91,7 +91,7 @@ func (*OmiFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]hcl
 func (*FlatOmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters":     &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":      &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":      &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"owners":      &hcldec.AttrSpec{Name: "owners", Type: cty.List(cty.String), Required: false},
 		"most_recent": &hcldec.AttrSpec{Name: "most_recent", Type: cty.Bool, Required: false},
 	}
@@ -101,8 +101,8 @@ func (*FlatOmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatSecurityGroupFilterOptions is an auto-generated flat version of SecurityGroupFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSecurityGroupFilterOptions struct {
-	Filters map[string]string            `cty:"filters" hcl:"filters"`
-	Filter  []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
+	Filters map[string]string      `cty:"filters" hcl:"filters"`
+	Filter  []config.FlatNameValue `cty:"filter" hcl:"filter"`
 }
 
 // FlatMapstructure returns a new FlatSecurityGroupFilterOptions.
@@ -118,7 +118,7 @@ func (*SecurityGroupFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[
 func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters": &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":  &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 	}
 	return s
 }
@@ -126,10 +126,10 @@ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 // FlatSubnetFilterOptions is an auto-generated flat version of SubnetFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSubnetFilterOptions struct {
-	Filters  map[string]string            `cty:"filters" hcl:"filters"`
-	Filter   []hcl2template.FlatNameValue `cty:"filter" hcl:"filter"`
-	MostFree *bool                        `mapstructure:"most_free" cty:"most_free" hcl:"most_free"`
-	Random   *bool                        `mapstructure:"random" cty:"random" hcl:"random"`
+	Filters  map[string]string      `cty:"filters" hcl:"filters"`
+	Filter   []config.FlatNameValue `cty:"filter" hcl:"filter"`
+	MostFree *bool                  `mapstructure:"most_free" cty:"most_free" hcl:"most_free"`
+	Random   *bool                  `mapstructure:"random" cty:"random" hcl:"random"`
 }
 
 // FlatMapstructure returns a new FlatSubnetFilterOptions.
@@ -145,7 +145,7 @@ func (*SubnetFilterOptions) FlatMapstructure() interface{ HCL2Spec() map[string]
 func (*FlatSubnetFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"filters":   &hcldec.AttrSpec{Name: "filters", Type: cty.Map(cty.String), Required: false},
-		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"filter":    &hcldec.BlockListSpec{TypeName: "filter", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"most_free": &hcldec.AttrSpec{Name: "most_free", Type: cty.Bool, Required: false},
 		"random":    &hcldec.AttrSpec{Name: "random", Type: cty.Bool, Required: false},
 	}
diff --git a/builder/osc/common/run_config_test.go b/builder/osc/common/run_config_test.go
index 93df79849..345b693cc 100644
--- a/builder/osc/common/run_config_test.go
+++ b/builder/osc/common/run_config_test.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 func init() {
@@ -74,7 +74,7 @@ func TestRunConfigPrepare_SourceOmiFilterOwnersBlank(t *testing.T) {
 	filter_key := "name"
 	filter_value := "foo"
 	c.SourceOmiFilter = OmiFilterOptions{
-		NameValueFilter: hcl2template.NameValueFilter{
+		NameValueFilter: config.NameValueFilter{
 			Filters: map[string]string{filter_key: filter_value},
 		},
 	}
@@ -90,7 +90,7 @@ func TestRunConfigPrepare_SourceOmiFilterGood(t *testing.T) {
 	filter_value := "foo"
 	goodFilter := OmiFilterOptions{
 		Owners: []string{owner},
-		NameValueFilter: hcl2template.NameValueFilter{
+		NameValueFilter: config.NameValueFilter{
 			Filters: map[string]string{filter_key: filter_value},
 		},
 	}
diff --git a/builder/osc/common/ssh.go b/builder/osc/common/ssh.go
index 38d0c0f8a..46cc4368f 100644
--- a/builder/osc/common/ssh.go
+++ b/builder/osc/common/ssh.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/state.go b/builder/osc/common/state.go
index a2e0e53a7..302df6d24 100644
--- a/builder/osc/common/state.go
+++ b/builder/osc/common/state.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/builder/osc/common/retry"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
@@ -68,7 +68,7 @@ func WaitUntilOscSnapshotDone(conn *osc.APIClient, snapshotID string) error {
 }
 
 func waitForState(errCh chan<- error, target string, refresh stateRefreshFunc) {
-	err := common.Retry(2, 2, 0, func(_ uint) (bool, error) {
+	err := retry.Run(2, 2, 0, func(_ uint) (bool, error) {
 		state, err := refresh()
 		if err != nil {
 			return false, err
diff --git a/builder/osc/common/step_cleanup_volumes.go b/builder/osc/common/step_cleanup_volumes.go
index 92bda011d..171dfaa40 100644
--- a/builder/osc/common/step_cleanup_volumes.go
+++ b/builder/osc/common/step_cleanup_volumes.go
@@ -6,8 +6,8 @@ import (
 	"reflect"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_create_tags.go b/builder/osc/common/step_create_tags.go
index f9a8e46b9..db06dec96 100644
--- a/builder/osc/common/step_create_tags.go
+++ b/builder/osc/common/step_create_tags.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/antihax/optional"
 	"github.com/aws/aws-sdk-go/aws/awserr"
-	retry "github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/builder/osc/common/retry"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
@@ -90,7 +90,7 @@ func (s *StepCreateTags) Run(_ context.Context, state multistep.StateBag) multis
 		snapshotTags.Report(ui)
 
 		// Retry creating tags for about 2.5 minutes
-		err = retry.Retry(0.2, 30, 11, func(_ uint) (bool, error) {
+		err = retry.Run(0.2, 30, 11, func(_ uint) (bool, error) {
 			// Tag images and snapshots
 			_, _, err := regionconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{
 				CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{
diff --git a/builder/osc/common/step_deregister_omi.go b/builder/osc/common/step_deregister_omi.go
index 390810092..f080d3d3c 100644
--- a/builder/osc/common/step_deregister_omi.go
+++ b/builder/osc/common/step_deregister_omi.go
@@ -8,8 +8,8 @@ import (
 	"github.com/antihax/optional"
 	"github.com/outscale/osc-sdk-go/osc"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepDeregisterOMI struct {
diff --git a/builder/osc/common/step_get_password.go b/builder/osc/common/step_get_password.go
index df1e42740..ccef02481 100644
--- a/builder/osc/common/step_get_password.go
+++ b/builder/osc/common/step_get_password.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/antihax/optional"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_key_pair.go b/builder/osc/common/step_key_pair.go
index 006499acd..6589c4831 100644
--- a/builder/osc/common/step_key_pair.go
+++ b/builder/osc/common/step_key_pair.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/antihax/optional"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_network_info.go b/builder/osc/common/step_network_info.go
index 20372a362..e1fdb8bfe 100644
--- a/builder/osc/common/step_network_info.go
+++ b/builder/osc/common/step_network_info.go
@@ -8,8 +8,8 @@ import (
 	"sort"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_pre_validate.go b/builder/osc/common/step_pre_validate.go
index a5d44e030..7c3151505 100644
--- a/builder/osc/common/step_pre_validate.go
+++ b/builder/osc/common/step_pre_validate.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_public_ip.go b/builder/osc/common/step_public_ip.go
index 9702a0b91..51d4f2c8c 100644
--- a/builder/osc/common/step_public_ip.go
+++ b/builder/osc/common/step_public_ip.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/antihax/optional"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_run_source_vm.go b/builder/osc/common/step_run_source_vm.go
index 996973a34..36188058a 100644
--- a/builder/osc/common/step_run_source_vm.go
+++ b/builder/osc/common/step_run_source_vm.go
@@ -12,11 +12,11 @@ import (
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/outscale/osc-sdk-go/osc"
 
-	retry "github.com/hashicorp/packer/common"
+	"github.com/hashicorp/packer/builder/osc/common/retry"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const (
@@ -234,7 +234,7 @@ func (s *StepRunSourceVm) Run(ctx context.Context, state multistep.StateBag) mul
 	if s.IsRestricted {
 		oscTags.Report(ui)
 		// Retry creating tags for about 2.5 minutes
-		err = retry.Retry(0.2, 30, 11, func(_ uint) (bool, error) {
+		err = retry.Run(0.2, 30, 11, func(_ uint) (bool, error) {
 			_, _, err := oscconn.TagApi.CreateTags(context.Background(), &osc.CreateTagsOpts{
 				CreateTagsRequest: optional.NewInterface(osc.CreateTagsRequest{
 					Tags:        oscTags,
diff --git a/builder/osc/common/step_security_group.go b/builder/osc/common/step_security_group.go
index 7c4bceba1..789f101e7 100644
--- a/builder/osc/common/step_security_group.go
+++ b/builder/osc/common/step_security_group.go
@@ -7,10 +7,10 @@ import (
 	"strings"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_source_omi_info.go b/builder/osc/common/step_source_omi_info.go
index 1bc6e05cb..64e1df704 100644
--- a/builder/osc/common/step_source_omi_info.go
+++ b/builder/osc/common/step_source_omi_info.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/step_stop_bsu_backed_vm.go b/builder/osc/common/step_stop_bsu_backed_vm.go
index 9c31a3c8b..5c45a126b 100644
--- a/builder/osc/common/step_stop_bsu_backed_vm.go
+++ b/builder/osc/common/step_stop_bsu_backed_vm.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/antihax/optional"
 	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/builder/osc/common/retry"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
@@ -41,7 +41,7 @@ func (s *StepStopBSUBackedVm) Run(ctx context.Context, state multistep.StateBag)
 		// does not exist.
 
 		// Work around this by retrying a few times, up to about 5 minutes.
-		err := common.Retry(10, 60, 6, func(i uint) (bool, error) {
+		err := retry.Run(10, 60, 6, func(i uint) (bool, error) {
 			ui.Message(fmt.Sprintf("Stopping vm, attempt %d", i+1))
 
 			_, _, err = oscconn.VmApi.StopVms(context.Background(), &osc.StopVmsOpts{
diff --git a/builder/osc/common/step_update_bsu_vm.go b/builder/osc/common/step_update_bsu_vm.go
index e348916a8..48cbbcd13 100644
--- a/builder/osc/common/step_update_bsu_vm.go
+++ b/builder/osc/common/step_update_bsu_vm.go
@@ -3,7 +3,7 @@ package common
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUpdateBSUBackedVm struct {
diff --git a/builder/osc/common/step_update_omi.go b/builder/osc/common/step_update_omi.go
index 2be6b4e4f..d523426de 100644
--- a/builder/osc/common/step_update_omi.go
+++ b/builder/osc/common/step_update_omi.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/common/tags.go b/builder/osc/common/tags.go
index 77b6525bf..446c191bb 100644
--- a/builder/osc/common/tags.go
+++ b/builder/osc/common/tags.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 
 	"github.com/antihax/optional"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/outscale/osc-sdk-go/osc"
 )
 
diff --git a/builder/osc/version/version.go b/builder/osc/version/version.go
new file mode 100644
index 000000000..e5d6e429d
--- /dev/null
+++ b/builder/osc/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var OutscalePluginVersion *version.PluginVersion
+
+func init() {
+	OutscalePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/parallels/common/driver_9.go b/builder/parallels/common/driver_9.go
index 5a5d9393f..9e088f10a 100644
--- a/builder/parallels/common/driver_9.go
+++ b/builder/parallels/common/driver_9.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/ChrisTrenkamp/goxpath"
 	"github.com/ChrisTrenkamp/goxpath/tree/xmltree"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // Parallels9Driver is a base type for Parallels builders.
diff --git a/builder/parallels/common/hw_config.go b/builder/parallels/common/hw_config.go
index f803450c8..06e27c411 100644
--- a/builder/parallels/common/hw_config.go
+++ b/builder/parallels/common/hw_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type HWConfig struct {
diff --git a/builder/parallels/common/hw_config_test.go b/builder/parallels/common/hw_config_test.go
index 9576eecc7..d6b40ea13 100644
--- a/builder/parallels/common/hw_config_test.go
+++ b/builder/parallels/common/hw_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestHWConfigPrepare(t *testing.T) {
diff --git a/builder/parallels/common/output_config.go b/builder/parallels/common/output_config.go
index 8508c427e..57f65b308 100644
--- a/builder/parallels/common/output_config.go
+++ b/builder/parallels/common/output_config.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // OutputConfig contains the configuration for builder's output.
diff --git a/builder/parallels/common/output_config_test.go b/builder/parallels/common/output_config_test.go
index 0256b5730..ca251c38c 100644
--- a/builder/parallels/common/output_config_test.go
+++ b/builder/parallels/common/output_config_test.go
@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/builder/parallels/common/prlctl_config.go b/builder/parallels/common/prlctl_config.go
index d22217651..4db738c82 100644
--- a/builder/parallels/common/prlctl_config.go
+++ b/builder/parallels/common/prlctl_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // PrlctlConfig contains the configuration for running "prlctl" commands
diff --git a/builder/parallels/common/prlctl_config_test.go b/builder/parallels/common/prlctl_config_test.go
index 31bb5ae91..006ee44d3 100644
--- a/builder/parallels/common/prlctl_config_test.go
+++ b/builder/parallels/common/prlctl_config_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestPrlctlConfigPrepare_Prlctl(t *testing.T) {
diff --git a/builder/parallels/common/prlctl_post_config.go b/builder/parallels/common/prlctl_post_config.go
index 6b8dc43cc..c071e24e9 100644
--- a/builder/parallels/common/prlctl_post_config.go
+++ b/builder/parallels/common/prlctl_post_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // PrlctlPostConfig contains the configuration for running "prlctl" commands
diff --git a/builder/parallels/common/prlctl_post_config_test.go b/builder/parallels/common/prlctl_post_config_test.go
index bbbcfad89..0f6abf065 100644
--- a/builder/parallels/common/prlctl_post_config_test.go
+++ b/builder/parallels/common/prlctl_post_config_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestPrlctlPostConfigPrepare_PrlctlPost(t *testing.T) {
diff --git a/builder/parallels/common/prlctl_version_config.go b/builder/parallels/common/prlctl_version_config.go
index fd6a5e54e..cd6e7de2e 100644
--- a/builder/parallels/common/prlctl_version_config.go
+++ b/builder/parallels/common/prlctl_version_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // PrlctlVersionConfig contains the configuration for `prlctl` version.
diff --git a/builder/parallels/common/prlctl_version_config_test.go b/builder/parallels/common/prlctl_version_config_test.go
index cadfb8a4f..32f24f0a6 100644
--- a/builder/parallels/common/prlctl_version_config_test.go
+++ b/builder/parallels/common/prlctl_version_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestPrlctlVersionConfigPrepare_BootWait(t *testing.T) {
diff --git a/builder/parallels/common/ssh.go b/builder/parallels/common/ssh.go
index 50f4e4e9c..6059b4a42 100644
--- a/builder/parallels/common/ssh.go
+++ b/builder/parallels/common/ssh.go
@@ -3,7 +3,7 @@ package common
 import (
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // CommHost returns the VM's IP address which should be used to access it by SSH.
diff --git a/builder/parallels/common/ssh_config.go b/builder/parallels/common/ssh_config.go
index 14ba9d1df..270239b35 100644
--- a/builder/parallels/common/ssh_config.go
+++ b/builder/parallels/common/ssh_config.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // SSHConfig contains the configuration for SSH communicator.
diff --git a/builder/parallels/common/ssh_config_test.go b/builder/parallels/common/ssh_config_test.go
index 5b190ba6d..e9b42c69a 100644
--- a/builder/parallels/common/ssh_config_test.go
+++ b/builder/parallels/common/ssh_config_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testSSHConfig() *SSHConfig {
diff --git a/builder/parallels/common/step_attach_floppy.go b/builder/parallels/common/step_attach_floppy.go
index cdedb9922..7d310ab75 100644
--- a/builder/parallels/common/step_attach_floppy.go
+++ b/builder/parallels/common/step_attach_floppy.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepAttachFloppy is a step that attaches a floppy to the virtual machine.
diff --git a/builder/parallels/common/step_attach_floppy_test.go b/builder/parallels/common/step_attach_floppy_test.go
index 2d951cf05..87b07d0f5 100644
--- a/builder/parallels/common/step_attach_floppy_test.go
+++ b/builder/parallels/common/step_attach_floppy_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepAttachFloppy_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_attach_parallels_tools.go b/builder/parallels/common/step_attach_parallels_tools.go
index 5745ce4f9..638408115 100644
--- a/builder/parallels/common/step_attach_parallels_tools.go
+++ b/builder/parallels/common/step_attach_parallels_tools.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepAttachParallelsTools is a step that attaches Parallels Tools ISO image
diff --git a/builder/parallels/common/step_compact_disk.go b/builder/parallels/common/step_compact_disk.go
index 14c6fa49d..e757336ef 100644
--- a/builder/parallels/common/step_compact_disk.go
+++ b/builder/parallels/common/step_compact_disk.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCompactDisk is a step that removes all empty blocks from expanding
diff --git a/builder/parallels/common/step_compact_disk_test.go b/builder/parallels/common/step_compact_disk_test.go
index e32ef217b..79b54d6f0 100644
--- a/builder/parallels/common/step_compact_disk_test.go
+++ b/builder/parallels/common/step_compact_disk_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCompactDisk_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_output_dir.go b/builder/parallels/common/step_output_dir.go
index c71f61bce..97115d8e4 100644
--- a/builder/parallels/common/step_output_dir.go
+++ b/builder/parallels/common/step_output_dir.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/builder/parallels/common/step_output_dir_test.go b/builder/parallels/common/step_output_dir_test.go
index 53c1d885c..70380fd51 100644
--- a/builder/parallels/common/step_output_dir_test.go
+++ b/builder/parallels/common/step_output_dir_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testStepOutputDir(t *testing.T) *StepOutputDir {
diff --git a/builder/parallels/common/step_prepare_parallels_tools.go b/builder/parallels/common/step_prepare_parallels_tools.go
index 251018cea..075f36bfe 100644
--- a/builder/parallels/common/step_prepare_parallels_tools.go
+++ b/builder/parallels/common/step_prepare_parallels_tools.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepPrepareParallelsTools is a step that prepares parameters related
diff --git a/builder/parallels/common/step_prepare_parallels_tools_test.go b/builder/parallels/common/step_prepare_parallels_tools_test.go
index 4f46fc642..5fd2e065c 100644
--- a/builder/parallels/common/step_prepare_parallels_tools_test.go
+++ b/builder/parallels/common/step_prepare_parallels_tools_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepPrepareParallelsTools_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_prlctl.go b/builder/parallels/common/step_prlctl.go
index eac00f916..5f31812b6 100644
--- a/builder/parallels/common/step_prlctl.go
+++ b/builder/parallels/common/step_prlctl.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type commandTemplate struct {
diff --git a/builder/parallels/common/step_run.go b/builder/parallels/common/step_run.go
index 062312069..a0772fdd0 100644
--- a/builder/parallels/common/step_run.go
+++ b/builder/parallels/common/step_run.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepRun is a step that starts the virtual machine.
diff --git a/builder/parallels/common/step_shutdown.go b/builder/parallels/common/step_shutdown.go
index f2c7b7e5a..cd1f5a232 100644
--- a/builder/parallels/common/step_shutdown.go
+++ b/builder/parallels/common/step_shutdown.go
@@ -8,8 +8,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepShutdown is a step that shuts down the machine. It first attempts to do
diff --git a/builder/parallels/common/step_shutdown_test.go b/builder/parallels/common/step_shutdown_test.go
index 0d137431f..861be6cd7 100644
--- a/builder/parallels/common/step_shutdown_test.go
+++ b/builder/parallels/common/step_shutdown_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepShutdown_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_test.go b/builder/parallels/common/step_test.go
index 0964784f7..4dc7bd18b 100644
--- a/builder/parallels/common/step_test.go
+++ b/builder/parallels/common/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/parallels/common/step_type_boot_command.go b/builder/parallels/common/step_type_boot_command.go
index fdb54ae97..31f55e8f7 100644
--- a/builder/parallels/common/step_type_boot_command.go
+++ b/builder/parallels/common/step_type_boot_command.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type bootCommandTemplateData struct {
diff --git a/builder/parallels/common/step_upload_parallels_tools.go b/builder/parallels/common/step_upload_parallels_tools.go
index 85620ff93..f70e7b60b 100644
--- a/builder/parallels/common/step_upload_parallels_tools.go
+++ b/builder/parallels/common/step_upload_parallels_tools.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // This step uploads the Parallels Tools ISO to the virtual machine.
diff --git a/builder/parallels/common/step_upload_parallels_tools_test.go b/builder/parallels/common/step_upload_parallels_tools_test.go
index aeff516d3..5e8b3f8d7 100644
--- a/builder/parallels/common/step_upload_parallels_tools_test.go
+++ b/builder/parallels/common/step_upload_parallels_tools_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepUploadParallelsTools_impl(t *testing.T) {
diff --git a/builder/parallels/common/step_upload_version.go b/builder/parallels/common/step_upload_version.go
index 6731b8c32..072bece70 100644
--- a/builder/parallels/common/step_upload_version.go
+++ b/builder/parallels/common/step_upload_version.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepUploadVersion is a step that uploads a file containing the version of
diff --git a/builder/parallels/common/step_upload_version_test.go b/builder/parallels/common/step_upload_version_test.go
index 998d35f0e..ddce60e3c 100644
--- a/builder/parallels/common/step_upload_version_test.go
+++ b/builder/parallels/common/step_upload_version_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepUploadVersion_impl(t *testing.T) {
diff --git a/builder/parallels/common/tools_config.go b/builder/parallels/common/tools_config.go
index 470f25840..00565d1fa 100644
--- a/builder/parallels/common/tools_config.go
+++ b/builder/parallels/common/tools_config.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // These are the different valid mode values for "parallels_tools_mode" which
diff --git a/builder/parallels/common/tools_config_test.go b/builder/parallels/common/tools_config_test.go
index 59321a524..89156fdcd 100644
--- a/builder/parallels/common/tools_config_test.go
+++ b/builder/parallels/common/tools_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testToolsConfig() *ToolsConfig {
diff --git a/builder/parallels/iso/builder.go b/builder/parallels/iso/builder.go
index 92ca28f42..0fa823f0a 100644
--- a/builder/parallels/iso/builder.go
+++ b/builder/parallels/iso/builder.go
@@ -10,14 +10,15 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "rickard-von-essen.parallels"
@@ -29,9 +30,9 @@ type Builder struct {
 
 type Config struct {
 	common.PackerConfig                 `mapstructure:",squash"`
-	common.HTTPConfig                   `mapstructure:",squash"`
-	common.ISOConfig                    `mapstructure:",squash"`
-	common.FloppyConfig                 `mapstructure:",squash"`
+	commonsteps.HTTPConfig              `mapstructure:",squash"`
+	commonsteps.ISOConfig               `mapstructure:",squash"`
+	commonsteps.FloppyConfig            `mapstructure:",squash"`
 	bootcommand.BootConfig              `mapstructure:",squash"`
 	parallelscommon.OutputConfig        `mapstructure:",squash"`
 	parallelscommon.HWConfig            `mapstructure:",squash"`
@@ -191,7 +192,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ParallelsToolsFlavor: b.config.ParallelsToolsFlavor,
 			ParallelsToolsMode:   b.config.ParallelsToolsMode,
 		},
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			Extension:   b.config.TargetExtension,
@@ -203,12 +204,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -249,8 +250,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ParallelsToolsMode:      b.config.ParallelsToolsMode,
 			Ctx:                     b.config.ctx,
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.SSHConfig.Comm,
 		},
 		&parallelscommon.StepShutdown{
@@ -275,7 +276,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("ui", ui)
 
 	// Run
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/parallels/iso/builder.hcl2spec.go b/builder/parallels/iso/builder.hcl2spec.go
index 09074a00d..c1a121ea2 100644
--- a/builder/parallels/iso/builder.hcl2spec.go
+++ b/builder/parallels/iso/builder.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -117,6 +118,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/parallels/iso/builder_test.go b/builder/parallels/iso/builder_test.go
index 76af90d1b..06be93302 100644
--- a/builder/parallels/iso/builder_test.go
+++ b/builder/parallels/iso/builder_test.go
@@ -65,7 +65,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/parallels/iso/step_attach_iso.go b/builder/parallels/iso/step_attach_iso.go
index 509fcbdd2..ccaced1c0 100644
--- a/builder/parallels/iso/step_attach_iso.go
+++ b/builder/parallels/iso/step_attach_iso.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step attaches the ISO to the virtual machine.
diff --git a/builder/parallels/iso/step_create_disk.go b/builder/parallels/iso/step_create_disk.go
index d7b62fbf2..dbe71e4b7 100644
--- a/builder/parallels/iso/step_create_disk.go
+++ b/builder/parallels/iso/step_create_disk.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step creates the virtual disk that will be used as the
diff --git a/builder/parallels/iso/step_create_vm.go b/builder/parallels/iso/step_create_vm.go
index 801f83899..ad7a32f81 100644
--- a/builder/parallels/iso/step_create_vm.go
+++ b/builder/parallels/iso/step_create_vm.go
@@ -6,8 +6,8 @@ import (
 	"strconv"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step creates the actual virtual machine.
diff --git a/builder/parallels/iso/step_set_boot_order.go b/builder/parallels/iso/step_set_boot_order.go
index 3b052407c..7d50251be 100644
--- a/builder/parallels/iso/step_set_boot_order.go
+++ b/builder/parallels/iso/step_set_boot_order.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step sets the device boot order for the virtual machine.
diff --git a/builder/parallels/pvm/builder.go b/builder/parallels/pvm/builder.go
index 5add2b27a..532c37658 100644
--- a/builder/parallels/pvm/builder.go
+++ b/builder/parallels/pvm/builder.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual Parallels
@@ -59,7 +59,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
@@ -99,12 +99,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ParallelsToolsMode:      b.config.ParallelsToolsMode,
 			Ctx:                     b.config.ctx,
 		},
-		new(common.StepProvision),
+		new(commonsteps.StepProvision),
 		&parallelscommon.StepShutdown{
 			Command: b.config.ShutdownCommand,
 			Timeout: b.config.ShutdownTimeout,
 		},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.SSHConfig.Comm,
 		},
 		&parallelscommon.StepPrlctl{
@@ -117,7 +117,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps.
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/parallels/pvm/config.go b/builder/parallels/pvm/config.go
index bd9b421f6..27e7b5a43 100644
--- a/builder/parallels/pvm/config.go
+++ b/builder/parallels/pvm/config.go
@@ -8,18 +8,19 @@ import (
 	"os"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
 type Config struct {
 	common.PackerConfig                 `mapstructure:",squash"`
-	common.FloppyConfig                 `mapstructure:",squash"`
+	commonsteps.FloppyConfig            `mapstructure:",squash"`
 	parallelscommon.OutputConfig        `mapstructure:",squash"`
 	parallelscommon.PrlctlConfig        `mapstructure:",squash"`
 	parallelscommon.PrlctlPostConfig    `mapstructure:",squash"`
diff --git a/builder/parallels/pvm/config.hcl2spec.go b/builder/parallels/pvm/config.hcl2spec.go
index 5663ae09d..623ce9180 100644
--- a/builder/parallels/pvm/config.hcl2spec.go
+++ b/builder/parallels/pvm/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -100,6 +101,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/parallels/pvm/config_test.go b/builder/parallels/pvm/config_test.go
index e7a2a5d59..701eff59c 100644
--- a/builder/parallels/pvm/config_test.go
+++ b/builder/parallels/pvm/config_test.go
@@ -74,7 +74,7 @@ func TestNewConfig_sourcePath(t *testing.T) {
 
 func TestNewConfig_FloppyFiles(t *testing.T) {
 	c := testConfig(t)
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	c["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	_, err := (&Config{}).Prepare(c)
 	if err != nil {
diff --git a/builder/parallels/pvm/step_import.go b/builder/parallels/pvm/step_import.go
index dcbc1cf6e..1530ee301 100644
--- a/builder/parallels/pvm/step_import.go
+++ b/builder/parallels/pvm/step_import.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step imports an PVM VM into Parallels.
diff --git a/builder/parallels/pvm/step_test.go b/builder/parallels/pvm/step_test.go
index 9d891c637..6c9983a82 100644
--- a/builder/parallels/pvm/step_test.go
+++ b/builder/parallels/pvm/step_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	parallelscommon "github.com/hashicorp/packer/builder/parallels/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/parallels/version/version.go b/builder/parallels/version/version.go
new file mode 100644
index 000000000..bb7db22bb
--- /dev/null
+++ b/builder/parallels/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ParallelsPluginVersion *version.PluginVersion
+
+func init() {
+	ParallelsPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/profitbricks/builder.go b/builder/profitbricks/builder.go
index f55d6ae0b..2261a96f5 100644
--- a/builder/profitbricks/builder.go
+++ b/builder/profitbricks/builder.go
@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 const BuilderId = "packer.profitbricks"
@@ -46,8 +46,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      communicator.CommHost(b.config.Comm.Host(), "server_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		new(stepTakeSnapshot),
@@ -55,7 +55,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	config := state.Get("config").(*Config)
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/profitbricks/config.go b/builder/profitbricks/config.go
index 275f7b5f2..3c9b994d3 100644
--- a/builder/profitbricks/config.go
+++ b/builder/profitbricks/config.go
@@ -6,11 +6,11 @@ import (
 	"errors"
 	"os"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/builder/profitbricks/config.hcl2spec.go b/builder/profitbricks/config.hcl2spec.go
index 47003efdc..c8e57de99 100644
--- a/builder/profitbricks/config.hcl2spec.go
+++ b/builder/profitbricks/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -93,6 +94,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/profitbricks/step_create_server.go b/builder/profitbricks/step_create_server.go
index 7798ace73..21464c673 100644
--- a/builder/profitbricks/step_create_server.go
+++ b/builder/profitbricks/step_create_server.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/profitbricks/profitbricks-sdk-go"
 )
 
diff --git a/builder/profitbricks/step_create_ssh_key.go b/builder/profitbricks/step_create_ssh_key.go
index 8490dffc3..19d8a2044 100644
--- a/builder/profitbricks/step_create_ssh_key.go
+++ b/builder/profitbricks/step_create_ssh_key.go
@@ -6,8 +6,8 @@ import (
 	"encoding/pem"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/profitbricks/step_take_snapshot.go b/builder/profitbricks/step_take_snapshot.go
index dfb1ff61a..c545f8521 100644
--- a/builder/profitbricks/step_take_snapshot.go
+++ b/builder/profitbricks/step_take_snapshot.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/profitbricks/profitbricks-sdk-go"
 )
 
diff --git a/builder/profitbricks/version/version.go b/builder/profitbricks/version/version.go
new file mode 100644
index 000000000..01f67d615
--- /dev/null
+++ b/builder/profitbricks/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ProfitbricksPluginVersion *version.PluginVersion
+
+func init() {
+	ProfitbricksPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/proxmox/clone/builder.go b/builder/proxmox/clone/builder.go
index 178f73587..f84fb216e 100644
--- a/builder/proxmox/clone/builder.go
+++ b/builder/proxmox/clone/builder.go
@@ -4,8 +4,8 @@ import (
 	proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	proxmox "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"context"
 	"fmt"
diff --git a/builder/proxmox/clone/config.go b/builder/proxmox/clone/config.go
index e9a8721d6..01fa6971d 100644
--- a/builder/proxmox/clone/config.go
+++ b/builder/proxmox/clone/config.go
@@ -4,8 +4,8 @@ package proxmoxclone
 
 import (
 	proxmox "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type Config struct {
diff --git a/builder/proxmox/clone/config.hcl2spec.go b/builder/proxmox/clone/config.hcl2spec.go
index 074f82d6f..5642f4631 100644
--- a/builder/proxmox/clone/config.hcl2spec.go
+++ b/builder/proxmox/clone/config.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string                     `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                     `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -83,6 +84,7 @@ type FlatConfig struct {
 	Pool                      *string                     `mapstructure:"pool" cty:"pool" hcl:"pool"`
 	VMName                    *string                     `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"`
 	VMID                      *int                        `mapstructure:"vm_id" cty:"vm_id" hcl:"vm_id"`
+	Boot                      *string                     `mapstructure:"boot" cty:"boot" hcl:"boot"`
 	Memory                    *int                        `mapstructure:"memory" cty:"memory" hcl:"memory"`
 	Cores                     *int                        `mapstructure:"cores" cty:"cores" hcl:"cores"`
 	CPUType                   *string                     `mapstructure:"cpu_type" cty:"cpu_type" hcl:"cpu_type"`
@@ -119,6 +121,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -190,6 +193,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"pool":                         &hcldec.AttrSpec{Name: "pool", Type: cty.String, Required: false},
 		"vm_name":                      &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false},
 		"vm_id":                        &hcldec.AttrSpec{Name: "vm_id", Type: cty.Number, Required: false},
+		"boot":                         &hcldec.AttrSpec{Name: "boot", Type: cty.String, Required: false},
 		"memory":                       &hcldec.AttrSpec{Name: "memory", Type: cty.Number, Required: false},
 		"cores":                        &hcldec.AttrSpec{Name: "cores", Type: cty.Number, Required: false},
 		"cpu_type":                     &hcldec.AttrSpec{Name: "cpu_type", Type: cty.String, Required: false},
diff --git a/builder/proxmox/clone/step_ssh_key_pair.go b/builder/proxmox/clone/step_ssh_key_pair.go
index 2aad603bb..3626f80c8 100644
--- a/builder/proxmox/clone/step_ssh_key_pair.go
+++ b/builder/proxmox/clone/step_ssh_key_pair.go
@@ -6,10 +6,10 @@ import (
 	"os"
 
 	common "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/helper/ssh"
+	"github.com/hashicorp/packer/helper/communicator/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // StepSshKeyPair executes the business logic for setting the SSH key pair in
diff --git a/builder/proxmox/common/bootcommand_driver.go b/builder/proxmox/common/bootcommand_driver.go
index 304db3ef4..21fbaef1e 100644
--- a/builder/proxmox/common/bootcommand_driver.go
+++ b/builder/proxmox/common/bootcommand_driver.go
@@ -7,7 +7,7 @@ import (
 	"unicode"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
 )
 
 type proxmoxDriver struct {
diff --git a/builder/proxmox/common/builder.go b/builder/proxmox/common/builder.go
index a4b407520..b592a6fdb 100644
--- a/builder/proxmox/common/builder.go
+++ b/builder/proxmox/common/builder.go
@@ -7,10 +7,10 @@ import (
 	"fmt"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 func NewSharedBuilder(id string, config Config, preSteps []multistep.Step, postSteps []multistep.Step, vmCreator ProxmoxVMCreator) *Builder {
@@ -61,7 +61,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook, state
 		&stepStartVM{
 			vmCreator: b.vmCreator,
 		},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -76,8 +76,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook, state
 			Host:      commHost((*comm).Host()),
 			SSHConfig: (*comm).SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		&stepConvertToTemplate{},
@@ -87,7 +87,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook, state
 	steps := append(b.preSteps, coreSteps...)
 	steps = append(steps, b.postSteps...)
 	// Run the steps
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 	// If there was an error, return that
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/proxmox/common/config.go b/builder/proxmox/common/config.go
index 1428345f9..916b3fdb7 100644
--- a/builder/proxmox/common/config.go
+++ b/builder/proxmox/common/config.go
@@ -11,19 +11,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/mapstructure"
 )
 
 type Config struct {
 	common.PackerConfig    `mapstructure:",squash"`
-	common.HTTPConfig      `mapstructure:",squash"`
+	commonsteps.HTTPConfig `mapstructure:",squash"`
 	bootcommand.BootConfig `mapstructure:",squash"`
 	BootKeyInterval        time.Duration       `mapstructure:"boot_key_interval"`
 	Comm                   communicator.Config `mapstructure:",squash"`
@@ -39,6 +40,7 @@ type Config struct {
 	VMName string `mapstructure:"vm_name"`
 	VMID   int    `mapstructure:"vm_id"`
 
+	Boot           string       `mapstructure:"boot"`
 	Memory         int          `mapstructure:"memory"`
 	Cores          int          `mapstructure:"cores"`
 	CPUType        string       `mapstructure:"cpu_type"`
@@ -65,13 +67,13 @@ type Config struct {
 }
 
 type storageConfig struct {
-	common.ISOConfig `mapstructure:",squash"`
-	Device           string `mapstructure:"device"`
-	ISOFile          string `mapstructure:"iso_file"`
-	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
-	Unmount          bool   `mapstructure:"unmount"`
-	ShouldUploadISO  bool
-	DownloadPathKey  string
+	commonsteps.ISOConfig `mapstructure:",squash"`
+	Device                string `mapstructure:"device"`
+	ISOFile               string `mapstructure:"iso_file"`
+	ISOStoragePool        string `mapstructure:"iso_storage_pool"`
+	Unmount               bool   `mapstructure:"unmount"`
+	ShouldUploadISO       bool
+	DownloadPathKey       string
 }
 
 type nicConfig struct {
@@ -132,9 +134,9 @@ func (c *Config) Prepare(upper interface{}, raws ...interface{}) ([]string, []st
 	if c.Password == "" {
 		c.Password = os.Getenv("PROXMOX_PASSWORD")
 	}
-	if c.BootKeyInterval == 0 && os.Getenv(common.PackerKeyEnv) != "" {
+	if c.BootKeyInterval == 0 && os.Getenv(bootcommand.PackerKeyEnv) != "" {
 		var err error
-		c.BootKeyInterval, err = time.ParseDuration(os.Getenv(common.PackerKeyEnv))
+		c.BootKeyInterval, err = time.ParseDuration(os.Getenv(bootcommand.PackerKeyEnv))
 		if err != nil {
 			errs = packer.MultiErrorAppend(errs, err)
 		}
diff --git a/builder/proxmox/common/config.hcl2spec.go b/builder/proxmox/common/config.hcl2spec.go
index 5675e2d69..a9fc552cf 100644
--- a/builder/proxmox/common/config.hcl2spec.go
+++ b/builder/proxmox/common/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string             `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string             `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string             `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool               `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool               `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string             `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -82,6 +83,7 @@ type FlatConfig struct {
 	Pool                      *string             `mapstructure:"pool" cty:"pool" hcl:"pool"`
 	VMName                    *string             `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"`
 	VMID                      *int                `mapstructure:"vm_id" cty:"vm_id" hcl:"vm_id"`
+	Boot                      *string             `mapstructure:"boot" cty:"boot" hcl:"boot"`
 	Memory                    *int                `mapstructure:"memory" cty:"memory" hcl:"memory"`
 	Cores                     *int                `mapstructure:"cores" cty:"cores" hcl:"cores"`
 	CPUType                   *string             `mapstructure:"cpu_type" cty:"cpu_type" hcl:"cpu_type"`
@@ -116,6 +118,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -187,6 +190,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"pool":                         &hcldec.AttrSpec{Name: "pool", Type: cty.String, Required: false},
 		"vm_name":                      &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false},
 		"vm_id":                        &hcldec.AttrSpec{Name: "vm_id", Type: cty.Number, Required: false},
+		"boot":                         &hcldec.AttrSpec{Name: "boot", Type: cty.String, Required: false},
 		"memory":                       &hcldec.AttrSpec{Name: "memory", Type: cty.Number, Required: false},
 		"cores":                        &hcldec.AttrSpec{Name: "cores", Type: cty.Number, Required: false},
 		"cpu_type":                     &hcldec.AttrSpec{Name: "cpu_type", Type: cty.String, Required: false},
diff --git a/builder/proxmox/common/step_convert_to_template.go b/builder/proxmox/common/step_convert_to_template.go
index b0fc13b47..3d177bfc9 100644
--- a/builder/proxmox/common/step_convert_to_template.go
+++ b/builder/proxmox/common/step_convert_to_template.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepConvertToTemplate takes the running VM configured in earlier steps, stops it, and
diff --git a/builder/proxmox/common/step_convert_to_template_test.go b/builder/proxmox/common/step_convert_to_template_test.go
index a7f472e3a..26fc7dfb3 100644
--- a/builder/proxmox/common/step_convert_to_template_test.go
+++ b/builder/proxmox/common/step_convert_to_template_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type converterMock struct {
diff --git a/builder/proxmox/common/step_finalize_template_config.go b/builder/proxmox/common/step_finalize_template_config.go
index 0aebb9aca..901d30bff 100644
--- a/builder/proxmox/common/step_finalize_template_config.go
+++ b/builder/proxmox/common/step_finalize_template_config.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepFinalizeTemplateConfig does any required modifications to the configuration _after_
diff --git a/builder/proxmox/common/step_finalize_template_config_test.go b/builder/proxmox/common/step_finalize_template_config_test.go
index 646e6f73d..38c691e17 100644
--- a/builder/proxmox/common/step_finalize_template_config_test.go
+++ b/builder/proxmox/common/step_finalize_template_config_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type finalizerMock struct {
diff --git a/builder/proxmox/common/step_start_vm.go b/builder/proxmox/common/step_start_vm.go
index 0e92334fb..09951660f 100644
--- a/builder/proxmox/common/step_start_vm.go
+++ b/builder/proxmox/common/step_start_vm.go
@@ -7,8 +7,8 @@ import (
 	"strconv"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepStartVM takes the given configuration and starts a VM on the given Proxmox node.
@@ -43,7 +43,7 @@ func (s *stepStartVM) Run(ctx context.Context, state multistep.StateBag) multist
 		Name:         c.VMName,
 		Agent:        agent,
 		QemuKVM:      kvm,
-		Boot:         "cdn", // Boot priority, c:CDROM -> d:Disk -> n:Network
+		Boot:         c.Boot, // Boot priority, example: "order=virtio0;ide2;net0", virtio0:Disk0 -> ide0:CDROM -> net0:Network
 		QemuCpu:      c.CPUType,
 		Description:  "Packer ephemeral build VM",
 		Memory:       c.Memory,
diff --git a/builder/proxmox/common/step_start_vm_test.go b/builder/proxmox/common/step_start_vm_test.go
index cb19670f5..e51577297 100644
--- a/builder/proxmox/common/step_start_vm_test.go
+++ b/builder/proxmox/common/step_start_vm_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type startedVMCleanerMock struct {
diff --git a/builder/proxmox/common/step_success.go b/builder/proxmox/common/step_success.go
index 06de9f21d..cbedd1684 100644
--- a/builder/proxmox/common/step_success.go
+++ b/builder/proxmox/common/step_success.go
@@ -3,7 +3,7 @@ package proxmox
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepSuccess runs after the full build has succeeded.
diff --git a/builder/proxmox/common/step_type_boot_command.go b/builder/proxmox/common/step_type_boot_command.go
index 17c1ec962..878d9b837 100644
--- a/builder/proxmox/common/step_type_boot_command.go
+++ b/builder/proxmox/common/step_type_boot_command.go
@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // stepTypeBootCommand takes the started VM, and sends the keystrokes required to start
diff --git a/builder/proxmox/common/step_type_boot_command_test.go b/builder/proxmox/common/step_type_boot_command_test.go
index c713e9cca..104c3fd60 100644
--- a/builder/proxmox/common/step_type_boot_command_test.go
+++ b/builder/proxmox/common/step_type_boot_command_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type commandTyperMock struct {
diff --git a/builder/proxmox/iso/builder.go b/builder/proxmox/iso/builder.go
index 3c7fb960b..8cc248aec 100644
--- a/builder/proxmox/iso/builder.go
+++ b/builder/proxmox/iso/builder.go
@@ -6,9 +6,9 @@ import (
 	proxmoxapi "github.com/Telmate/proxmox-api-go/proxmox"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	proxmox "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // The unique id for the builder
@@ -34,7 +34,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("iso-config", &b.config)
 
 	preSteps := []multistep.Step{
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			Extension:   b.config.TargetExtension,
@@ -44,7 +44,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 	}
 	for idx := range b.config.AdditionalISOFiles {
-		preSteps = append(preSteps, &common.StepDownload{
+		preSteps = append(preSteps, &commonsteps.StepDownload{
 			Checksum:    b.config.AdditionalISOFiles[idx].ISOChecksum,
 			Description: "additional ISO",
 			Extension:   b.config.AdditionalISOFiles[idx].TargetExtension,
diff --git a/builder/proxmox/iso/config.go b/builder/proxmox/iso/config.go
index a04c41c05..a5545f9eb 100644
--- a/builder/proxmox/iso/config.go
+++ b/builder/proxmox/iso/config.go
@@ -10,18 +10,18 @@ import (
 	"strings"
 
 	proxmox "github.com/hashicorp/packer/builder/proxmox/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type Config struct {
 	proxmox.Config `mapstructure:",squash"`
 
-	common.ISOConfig `mapstructure:",squash"`
-	ISOFile          string `mapstructure:"iso_file"`
-	ISOStoragePool   string `mapstructure:"iso_storage_pool"`
-	UnmountISO       bool   `mapstructure:"unmount_iso"`
-	shouldUploadISO  bool
+	commonsteps.ISOConfig `mapstructure:",squash"`
+	ISOFile               string `mapstructure:"iso_file"`
+	ISOStoragePool        string `mapstructure:"iso_storage_pool"`
+	UnmountISO            bool   `mapstructure:"unmount_iso"`
+	shouldUploadISO       bool
 }
 
 func (c *Config) Prepare(raws ...interface{}) ([]string, []string, error) {
diff --git a/builder/proxmox/iso/config.hcl2spec.go b/builder/proxmox/iso/config.hcl2spec.go
index 272f8a794..59858f4b1 100644
--- a/builder/proxmox/iso/config.hcl2spec.go
+++ b/builder/proxmox/iso/config.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string                     `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                     `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -83,6 +84,7 @@ type FlatConfig struct {
 	Pool                      *string                     `mapstructure:"pool" cty:"pool" hcl:"pool"`
 	VMName                    *string                     `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"`
 	VMID                      *int                        `mapstructure:"vm_id" cty:"vm_id" hcl:"vm_id"`
+	Boot                      *string                     `mapstructure:"boot" cty:"boot" hcl:"boot"`
 	Memory                    *int                        `mapstructure:"memory" cty:"memory" hcl:"memory"`
 	Cores                     *int                        `mapstructure:"cores" cty:"cores" hcl:"cores"`
 	CPUType                   *string                     `mapstructure:"cpu_type" cty:"cpu_type" hcl:"cpu_type"`
@@ -125,6 +127,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -196,6 +199,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"pool":                         &hcldec.AttrSpec{Name: "pool", Type: cty.String, Required: false},
 		"vm_name":                      &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false},
 		"vm_id":                        &hcldec.AttrSpec{Name: "vm_id", Type: cty.Number, Required: false},
+		"boot":                         &hcldec.AttrSpec{Name: "boot", Type: cty.String, Required: false},
 		"memory":                       &hcldec.AttrSpec{Name: "memory", Type: cty.Number, Required: false},
 		"cores":                        &hcldec.AttrSpec{Name: "cores", Type: cty.Number, Required: false},
 		"cpu_type":                     &hcldec.AttrSpec{Name: "cpu_type", Type: cty.String, Required: false},
diff --git a/builder/proxmox/iso/config_test.go b/builder/proxmox/iso/config_test.go
index fe519a05b..509d360a2 100644
--- a/builder/proxmox/iso/config_test.go
+++ b/builder/proxmox/iso/config_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 func TestBasicExampleFromDocsIsValid(t *testing.T) {
diff --git a/builder/proxmox/iso/step_finalize_iso.go b/builder/proxmox/iso/step_finalize_iso.go
index 88ef44bd2..ee504c0e7 100644
--- a/builder/proxmox/iso/step_finalize_iso.go
+++ b/builder/proxmox/iso/step_finalize_iso.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepFinalizeISOTemplate does any ISO-builder specific modifications after
diff --git a/builder/proxmox/iso/step_finalize_iso_test.go b/builder/proxmox/iso/step_finalize_iso_test.go
index a35a7f5a2..6556bb495 100644
--- a/builder/proxmox/iso/step_finalize_iso_test.go
+++ b/builder/proxmox/iso/step_finalize_iso_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type finalizerMock struct {
diff --git a/builder/proxmox/iso/step_upload_additional_isos.go b/builder/proxmox/iso/step_upload_additional_isos.go
index f23b949be..e2b7af894 100644
--- a/builder/proxmox/iso/step_upload_additional_isos.go
+++ b/builder/proxmox/iso/step_upload_additional_isos.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepUploadAdditionalISOs uploads all additional ISO files that are mountet
diff --git a/builder/proxmox/iso/step_upload_iso.go b/builder/proxmox/iso/step_upload_iso.go
index 79096bfe0..3edef379a 100644
--- a/builder/proxmox/iso/step_upload_iso.go
+++ b/builder/proxmox/iso/step_upload_iso.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 
 	"github.com/Telmate/proxmox-api-go/proxmox"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepUploadISO uploads an ISO file to Proxmox so we can boot from it
diff --git a/builder/proxmox/iso/step_upload_iso_test.go b/builder/proxmox/iso/step_upload_iso_test.go
index 418005a0c..d747594f8 100644
--- a/builder/proxmox/iso/step_upload_iso_test.go
+++ b/builder/proxmox/iso/step_upload_iso_test.go
@@ -6,9 +6,9 @@ import (
 	"io"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type uploaderMock struct {
@@ -51,7 +51,7 @@ func TestUploadISO(t *testing.T) {
 			builderConfig: &Config{
 				shouldUploadISO: true,
 				ISOStoragePool:  "local",
-				ISOConfig:       common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
+				ISOConfig:       commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
 			},
 			downloadPath: "testdata/test.iso",
 
@@ -64,7 +64,7 @@ func TestUploadISO(t *testing.T) {
 			builderConfig: &Config{
 				shouldUploadISO: true,
 				ISOStoragePool:  "local",
-				ISOConfig:       common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
+				ISOConfig:       commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
 			},
 			downloadPath: "testdata/test.iso",
 			failUpload:   true,
@@ -78,7 +78,7 @@ func TestUploadISO(t *testing.T) {
 			builderConfig: &Config{
 				shouldUploadISO: true,
 				ISOStoragePool:  "local",
-				ISOConfig:       common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
+				ISOConfig:       commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
 			},
 
 			expectError:        true,
@@ -90,7 +90,7 @@ func TestUploadISO(t *testing.T) {
 			builderConfig: &Config{
 				shouldUploadISO: true,
 				ISOStoragePool:  "local",
-				ISOConfig:       common.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
+				ISOConfig:       commonsteps.ISOConfig{ISOUrls: []string{"http://server.example/some-file.iso"}},
 			},
 			downloadPath: "testdata/non-existent.iso",
 
diff --git a/builder/proxmox/version/version.go b/builder/proxmox/version/version.go
new file mode 100644
index 000000000..b6ed24f2a
--- /dev/null
+++ b/builder/proxmox/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ProxmoxPluginVersion *version.PluginVersion
+
+func init() {
+	ProxmoxPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/qemu/builder.go b/builder/qemu/builder.go
index 6f0939f69..fc24b592c 100644
--- a/builder/qemu/builder.go
+++ b/builder/qemu/builder.go
@@ -10,10 +10,10 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 const BuilderId = "transcend.qemu"
@@ -43,7 +43,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	steps := []multistep.Step{}
 	if !b.config.ISOSkipCache {
-		steps = append(steps, &common.StepDownload{
+		steps = append(steps, &commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			Extension:   b.config.TargetExtension,
@@ -59,12 +59,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	steps = append(steps, new(stepPrepareOutputDir),
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -96,7 +96,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			QemuImgArgs:     b.config.QemuImgArgs,
 		},
 		new(stepHTTPIPDiscover),
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -126,8 +126,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SSHPort:   commPort,
 			WinRMPort: commPort,
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.CommConfig.Comm,
 		},
 		&stepShutdown{
@@ -154,7 +154,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("ui", ui)
 
 	// Run
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/qemu/comm_config.go b/builder/qemu/comm_config.go
index 46b3ab082..45fe39f5d 100644
--- a/builder/qemu/comm_config.go
+++ b/builder/qemu/comm_config.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type CommConfig struct {
diff --git a/builder/qemu/comm_config_test.go b/builder/qemu/comm_config_test.go
index 4912c7d96..150621d0f 100644
--- a/builder/qemu/comm_config_test.go
+++ b/builder/qemu/comm_config_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testCommConfig() *CommConfig {
diff --git a/builder/qemu/config.go b/builder/qemu/config.go
index 1af05df37..cc0814667 100644
--- a/builder/qemu/config.go
+++ b/builder/qemu/config.go
@@ -13,12 +13,13 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 var accels = map[string]struct{}{
@@ -65,13 +66,13 @@ type QemuImgArgs struct {
 
 type Config struct {
 	common.PackerConfig            `mapstructure:",squash"`
-	common.HTTPConfig              `mapstructure:",squash"`
-	common.ISOConfig               `mapstructure:",squash"`
+	commonsteps.HTTPConfig         `mapstructure:",squash"`
+	commonsteps.ISOConfig          `mapstructure:",squash"`
 	bootcommand.VNCConfig          `mapstructure:",squash"`
 	shutdowncommand.ShutdownConfig `mapstructure:",squash"`
 	CommConfig                     CommConfig `mapstructure:",squash"`
-	common.FloppyConfig            `mapstructure:",squash"`
-	common.CDConfig                `mapstructure:",squash"`
+	commonsteps.FloppyConfig       `mapstructure:",squash"`
+	commonsteps.CDConfig           `mapstructure:",squash"`
 	// Use iso from provided url. Qemu must support
 	// curl block device. This defaults to `false`.
 	ISOSkipCache bool `mapstructure:"iso_skip_cache" required:"false"`
diff --git a/builder/qemu/config.hcl2spec.go b/builder/qemu/config.hcl2spec.go
index 4db23c9e7..33c7fe131 100644
--- a/builder/qemu/config.hcl2spec.go
+++ b/builder/qemu/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -143,6 +144,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/qemu/config_test.go b/builder/qemu/config_test.go
index bd94d6eb8..bcb867004 100644
--- a/builder/qemu/config_test.go
+++ b/builder/qemu/config_test.go
@@ -327,7 +327,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", c.FloppyFiles)
 	}
 
-	floppies_path := "../../common/test-fixtures/floppies"
+	floppies_path := "../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	c = Config{}
 	warns, err = c.Prepare(config)
diff --git a/builder/qemu/driver.go b/builder/qemu/driver.go
index d4b600c11..9aeb8f279 100644
--- a/builder/qemu/driver.go
+++ b/builder/qemu/driver.go
@@ -15,7 +15,7 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type DriverCancelCallback func(state multistep.StateBag) bool
diff --git a/builder/qemu/ssh.go b/builder/qemu/ssh.go
index d722df9e1..25778c021 100644
--- a/builder/qemu/ssh.go
+++ b/builder/qemu/ssh.go
@@ -3,7 +3,7 @@ package qemu
 import (
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func commHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/qemu/step_configure_qmp.go b/builder/qemu/step_configure_qmp.go
index 8a2d10249..de87d99bf 100644
--- a/builder/qemu/step_configure_qmp.go
+++ b/builder/qemu/step_configure_qmp.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/digitalocean/go-qemu/qmp"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step configures the VM to enable the QMP listener.
diff --git a/builder/qemu/step_configure_vnc.go b/builder/qemu/step_configure_vnc.go
index 34aed791e..87a095dc7 100644
--- a/builder/qemu/step_configure_vnc.go
+++ b/builder/qemu/step_configure_vnc.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"math/rand"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step configures the VM to enable the VNC server.
diff --git a/builder/qemu/step_convert_disk.go b/builder/qemu/step_convert_disk.go
index 8e06cc821..1f7952248 100644
--- a/builder/qemu/step_convert_disk.go
+++ b/builder/qemu/step_convert_disk.go
@@ -7,10 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
 	"os"
 )
@@ -62,12 +61,13 @@ func (s *stepConvertDisk) Run(ctx context.Context, state multistep.StateBag) mul
 	})
 
 	if err != nil {
-		if err == common.RetryExhaustedError {
+		switch err.(type) {
+		case *retry.RetryExhaustedError:
 			err = fmt.Errorf("Exhausted retries for getting file lock: %s", err)
 			state.Put("error", err)
 			ui.Error(err.Error())
 			return multistep.ActionHalt
-		} else {
+		default:
 			err := fmt.Errorf("Error converting hard drive: %s", err)
 			state.Put("error", err)
 			ui.Error(err.Error())
diff --git a/builder/qemu/step_copy_disk.go b/builder/qemu/step_copy_disk.go
index 28a091426..c5600a31b 100644
--- a/builder/qemu/step_copy_disk.go
+++ b/builder/qemu/step_copy_disk.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step copies the virtual disk that will be used as the
diff --git a/builder/qemu/step_copy_disk_test.go b/builder/qemu/step_copy_disk_test.go
index b7241621e..efeb53401 100644
--- a/builder/qemu/step_copy_disk_test.go
+++ b/builder/qemu/step_copy_disk_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/qemu/step_create_disk.go b/builder/qemu/step_create_disk.go
index 288bb02dc..03de4fe7e 100644
--- a/builder/qemu/step_create_disk.go
+++ b/builder/qemu/step_create_disk.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step creates the virtual disk that will be used as the
diff --git a/builder/qemu/step_create_disk_test.go b/builder/qemu/step_create_disk_test.go
index 22fa59283..6756d7e58 100644
--- a/builder/qemu/step_create_disk_test.go
+++ b/builder/qemu/step_create_disk_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/qemu/step_http_ip_discover.go b/builder/qemu/step_http_ip_discover.go
index dd0f88dea..416cdac56 100644
--- a/builder/qemu/step_http_ip_discover.go
+++ b/builder/qemu/step_http_ip_discover.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Step to discover the http ip
diff --git a/builder/qemu/step_http_ip_discover_test.go b/builder/qemu/step_http_ip_discover_test.go
index 456602f8a..263bcb752 100644
--- a/builder/qemu/step_http_ip_discover_test.go
+++ b/builder/qemu/step_http_ip_discover_test.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepHTTPIPDiscover_Run(t *testing.T) {
diff --git a/builder/qemu/step_port_forward.go b/builder/qemu/step_port_forward.go
index ab5871fa2..77dcc1248 100644
--- a/builder/qemu/step_port_forward.go
+++ b/builder/qemu/step_port_forward.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step adds a NAT port forwarding definition so that SSH or WinRM is available
diff --git a/builder/qemu/step_prepare_output_dir.go b/builder/qemu/step_prepare_output_dir.go
index 09a3087ec..75118fdf0 100644
--- a/builder/qemu/step_prepare_output_dir.go
+++ b/builder/qemu/step_prepare_output_dir.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepPrepareOutputDir struct{}
diff --git a/builder/qemu/step_resize_disk.go b/builder/qemu/step_resize_disk.go
index 09863e327..c2daf20cf 100644
--- a/builder/qemu/step_resize_disk.go
+++ b/builder/qemu/step_resize_disk.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step resizes the virtual disk that will be used as the
diff --git a/builder/qemu/step_resize_disk_test.go b/builder/qemu/step_resize_disk_test.go
index 796ec20cb..ecfa5b6ea 100644
--- a/builder/qemu/step_resize_disk_test.go
+++ b/builder/qemu/step_resize_disk_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/qemu/step_run.go b/builder/qemu/step_run.go
index 8fe59f6dc..ab2b36886 100644
--- a/builder/qemu/step_run.go
+++ b/builder/qemu/step_run.go
@@ -8,9 +8,9 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-version"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // stepRun runs the virtual machine
diff --git a/builder/qemu/step_run_test.go b/builder/qemu/step_run_test.go
index 3bd5375c5..7f3bfe4c5 100644
--- a/builder/qemu/step_run_test.go
+++ b/builder/qemu/step_run_test.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -40,7 +40,7 @@ func Test_UserOverrides(t *testing.T) {
 	testcases := []testCase{
 		{
 			&Config{
-				HTTPConfig: common.HTTPConfig{
+				HTTPConfig: commonsteps.HTTPConfig{
 					HTTPDir: "http/directory",
 				},
 				OutputDir: "output/directory",
diff --git a/builder/qemu/step_set_iso.go b/builder/qemu/step_set_iso.go
index c5bfe6e95..3f6263be7 100644
--- a/builder/qemu/step_set_iso.go
+++ b/builder/qemu/step_set_iso.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"net/http"
 
-	commonhelper "github.com/hashicorp/packer/helper/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step set iso_patch to available url
@@ -29,7 +29,7 @@ func (s *stepSetISO) Run(ctx context.Context, state multistep.StateBag) multiste
 
 		req.Header.Set("User-Agent", "Packer")
 
-		httpClient := commonhelper.HttpClientWithEnvironmentProxy()
+		httpClient := net.HttpClientWithEnvironmentProxy()
 
 		res, err := httpClient.Do(req)
 		if err == nil && (res.StatusCode >= 200 && res.StatusCode < 300) {
diff --git a/builder/qemu/step_shutdown.go b/builder/qemu/step_shutdown.go
index 7fde1de77..3dbe1743a 100644
--- a/builder/qemu/step_shutdown.go
+++ b/builder/qemu/step_shutdown.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff --git a/builder/qemu/step_shutdown_test.go b/builder/qemu/step_shutdown_test.go
index 46ea3efb8..47214b4ee 100644
--- a/builder/qemu/step_shutdown_test.go
+++ b/builder/qemu/step_shutdown_test.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func Test_Shutdown_Null_success(t *testing.T) {
diff --git a/builder/qemu/step_test.go b/builder/qemu/step_test.go
index 4a782d1d4..ff015f747 100644
--- a/builder/qemu/step_test.go
+++ b/builder/qemu/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/qemu/step_type_boot_command.go b/builder/qemu/step_type_boot_command.go
index c836db9e3..27a6f8e48 100644
--- a/builder/qemu/step_type_boot_command.go
+++ b/builder/qemu/step_type_boot_command.go
@@ -7,10 +7,10 @@ import (
 	"net"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/go-vnc"
 )
 
diff --git a/builder/qemu/step_wait_guest_address.go b/builder/qemu/step_wait_guest_address.go
index 7e6f9ad1e..938083e5b 100644
--- a/builder/qemu/step_wait_guest_address.go
+++ b/builder/qemu/step_wait_guest_address.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/digitalocean/go-qemu/qmp"
 )
diff --git a/builder/qemu/version/version.go b/builder/qemu/version/version.go
new file mode 100644
index 000000000..f8d93cb5c
--- /dev/null
+++ b/builder/qemu/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var QemuPluginVersion *version.PluginVersion
+
+func init() {
+	QemuPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/scaleway/builder.go b/builder/scaleway/builder.go
index e25d4cd0e..9db7423cd 100644
--- a/builder/scaleway/builder.go
+++ b/builder/scaleway/builder.go
@@ -9,10 +9,10 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
@@ -82,8 +82,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      communicator.CommHost(b.config.Comm.Host(), "server_ip"),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Comm,
 		},
 		new(stepShutdown),
@@ -91,7 +91,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		new(stepImage),
 	}
 
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/scaleway/config.go b/builder/scaleway/config.go
index c88e4fea5..9b5ae70ad 100644
--- a/builder/scaleway/config.go
+++ b/builder/scaleway/config.go
@@ -9,13 +9,14 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/builder/scaleway/version"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/useragent"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/mitchellh/mapstructure"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -25,18 +26,23 @@ type Config struct {
 	common.PackerConfig `mapstructure:",squash"`
 	Comm                communicator.Config `mapstructure:",squash"`
 	// The AccessKey corresponding to the secret key.
+	// Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
 	// It can also be specified via the environment variable SCW_ACCESS_KEY.
 	AccessKey string `mapstructure:"access_key" required:"true"`
 	// The SecretKey to authenticate against the Scaleway API.
+	// Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
 	// It can also be specified via the environment variable SCW_SECRET_KEY.
 	SecretKey string `mapstructure:"secret_key" required:"true"`
 	// The Project ID in which the instances, volumes and snapshots will be created.
+	// Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
 	// It can also be specified via the environment variable SCW_DEFAULT_PROJECT_ID.
 	ProjectID string `mapstructure:"project_id" required:"true"`
 	// The Zone in which the instances, volumes and snapshots will be created.
+	// Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
 	// It can also be specified via the environment variable SCW_DEFAULT_ZONE
 	Zone string `mapstructure:"zone" required:"true"`
 	// The Scaleway API URL to use
+	// Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
 	// It can also be specified via the environment variable SCW_API_URL
 	APIURL string `mapstructure:"api_url"`
 
@@ -114,7 +120,22 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 
 	var warnings []string
 
-	c.UserAgent = useragent.String()
+	c.UserAgent = useragent.String(version.ScalewayPluginVersion.FormattedVersion())
+
+	configFile, err := scw.LoadConfig()
+	// If the config file do not exist, don't return an error as we may find config in ENV or flags.
+	if _, isNotFoundError := err.(*scw.ConfigFileNotFoundError); isNotFoundError {
+		configFile = &scw.Config{}
+	} else if err != nil {
+		return nil, err
+	}
+	activeProfile, err := configFile.GetActiveProfile()
+	if err != nil {
+		return nil, err
+	}
+
+	envProfile := scw.LoadEnvProfile()
+	profile := scw.MergeProfiles(activeProfile, envProfile)
 
 	// Deprecated variables
 	if c.Organization == "" {
@@ -144,23 +165,33 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	}
 
 	if c.AccessKey == "" {
-		c.AccessKey = os.Getenv(scw.ScwAccessKeyEnv)
+		if profile.AccessKey != nil {
+			c.AccessKey = *profile.AccessKey
+		}
 	}
 
 	if c.SecretKey == "" {
-		c.SecretKey = os.Getenv(scw.ScwSecretKeyEnv)
+		if profile.SecretKey != nil {
+			c.SecretKey = *profile.SecretKey
+		}
 	}
 
 	if c.ProjectID == "" {
-		c.ProjectID = os.Getenv(scw.ScwDefaultProjectIDEnv)
+		if profile.DefaultProjectID != nil {
+			c.ProjectID = *profile.DefaultProjectID
+		}
 	}
 
 	if c.Zone == "" {
-		c.Zone = os.Getenv(scw.ScwDefaultZoneEnv)
+		if profile.DefaultZone != nil {
+			c.Zone = *profile.DefaultZone
+		}
 	}
 
 	if c.APIURL == "" {
-		c.APIURL = os.Getenv(scw.ScwAPIURLEnv)
+		if profile.APIURL != nil {
+			c.APIURL = *profile.APIURL
+		}
 	}
 
 	if c.SnapshotName == "" {
@@ -196,12 +227,12 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	}
 	if c.ProjectID == "" {
 		errs = packer.MultiErrorAppend(
-			errs, errors.New("Scaleway Project ID must be specified"))
+			errs, errors.New("scaleway Project ID must be specified"))
 	}
 
 	if c.SecretKey == "" {
 		errs = packer.MultiErrorAppend(
-			errs, errors.New("Scaleway Secret Key must be specified"))
+			errs, errors.New("scaleway Secret Key must be specified"))
 	}
 
 	if c.AccessKey == "" {
@@ -211,7 +242,7 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 
 	if c.Zone == "" {
 		errs = packer.MultiErrorAppend(
-			errs, errors.New("Scaleway Zone is required"))
+			errs, errors.New("scaleway Zone is required"))
 	}
 
 	if c.CommercialType == "" {
@@ -229,5 +260,6 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	}
 
 	packer.LogSecretFilter.Set(c.Token)
+	packer.LogSecretFilter.Set(c.SecretKey)
 	return warnings, nil
 }
diff --git a/builder/scaleway/config.hcl2spec.go b/builder/scaleway/config.hcl2spec.go
index 08fbdb055..75f1acc0d 100644
--- a/builder/scaleway/config.hcl2spec.go
+++ b/builder/scaleway/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -97,6 +98,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/scaleway/step_create_image.go b/builder/scaleway/step_create_image.go
index 98085d3af..556a029e2 100644
--- a/builder/scaleway/step_create_image.go
+++ b/builder/scaleway/step_create_image.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/hashicorp/go-uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/api/marketplace/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
@@ -45,7 +45,7 @@ func (s *stepImage) Run(ctx context.Context, state multistep.StateBag) multistep
 
 	imageResp, err := instanceAPI.GetImage(&instance.GetImageRequest{
 		ImageID: imageID,
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error getting initial image info: %s", err)
 		state.Put("error", err)
@@ -62,7 +62,7 @@ func (s *stepImage) Run(ctx context.Context, state multistep.StateBag) multistep
 		DefaultBootscript: bootscriptID,
 		Name:              c.ImageName,
 		RootVolume:        snapshotID,
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error creating image: %s", err)
 		state.Put("error", err)
diff --git a/builder/scaleway/step_create_server.go b/builder/scaleway/step_create_server.go
index 3342305b1..08c4ec3c5 100644
--- a/builder/scaleway/step_create_server.go
+++ b/builder/scaleway/step_create_server.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
@@ -41,7 +41,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
 		Name:           c.ServerName,
 		Image:          c.Image,
 		Tags:           tags,
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error creating server: %s", err)
 		state.Put("error", err)
@@ -52,7 +52,7 @@ func (s *stepCreateServer) Run(ctx context.Context, state multistep.StateBag) mu
 	_, err = instanceAPI.ServerAction(&instance.ServerActionRequest{
 		Action:   instance.ServerActionPoweron,
 		ServerID: createServerResp.Server.ID,
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error starting server: %s", err)
 		state.Put("error", err)
diff --git a/builder/scaleway/step_create_ssh_key.go b/builder/scaleway/step_create_ssh_key.go
index 308913a7b..5d746029f 100644
--- a/builder/scaleway/step_create_ssh_key.go
+++ b/builder/scaleway/step_create_ssh_key.go
@@ -11,8 +11,8 @@ import (
 	"os"
 	"runtime"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/scaleway/step_pre_validate.go b/builder/scaleway/step_pre_validate.go
index 0e32b2e5d..f991b787a 100644
--- a/builder/scaleway/step_pre_validate.go
+++ b/builder/scaleway/step_pre_validate.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
@@ -32,7 +32,7 @@ func (s *stepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul
 	instanceAPI := instance.NewAPI(state.Get("client").(*scw.Client))
 	images, err := instanceAPI.ListImages(
 		&instance.ListImagesRequest{Name: &s.ImageName},
-		scw.WithAllPages())
+		scw.WithAllPages(), scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error: getting image list: %s", err)
 		state.Put("error", err)
@@ -54,7 +54,7 @@ func (s *stepPreValidate) Run(ctx context.Context, state multistep.StateBag) mul
 
 	snapshots, err := instanceAPI.ListSnapshots(
 		&instance.ListSnapshotsRequest{Name: &s.SnapshotName},
-		scw.WithAllPages())
+		scw.WithAllPages(), scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error: getting snapshot list: %s", err)
 		state.Put("error", err)
diff --git a/builder/scaleway/step_pre_validate_test.go b/builder/scaleway/step_pre_validate_test.go
index 51e7d927c..fb40998ab 100644
--- a/builder/scaleway/step_pre_validate_test.go
+++ b/builder/scaleway/step_pre_validate_test.go
@@ -10,8 +10,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/builder/scaleway/step_remove_volume.go b/builder/scaleway/step_remove_volume.go
index a9abc2d3b..451047b3c 100644
--- a/builder/scaleway/step_remove_volume.go
+++ b/builder/scaleway/step_remove_volume.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/builder/scaleway/step_server_info.go b/builder/scaleway/step_server_info.go
index 7d5f7d1ba..28dec4cd5 100644
--- a/builder/scaleway/step_server_info.go
+++ b/builder/scaleway/step_server_info.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
diff --git a/builder/scaleway/step_shutdown.go b/builder/scaleway/step_shutdown.go
index 60d76d907..8c8eb1471 100644
--- a/builder/scaleway/step_shutdown.go
+++ b/builder/scaleway/step_shutdown.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
@@ -22,7 +22,7 @@ func (s *stepShutdown) Run(ctx context.Context, state multistep.StateBag) multis
 	_, err := instanceAPI.ServerAction(&instance.ServerActionRequest{
 		Action:   instance.ServerActionPoweroff,
 		ServerID: serverID,
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error stopping server: %s", err)
 		state.Put("error", err)
diff --git a/builder/scaleway/step_snapshot.go b/builder/scaleway/step_snapshot.go
index 8b4fab470..e7e01637a 100644
--- a/builder/scaleway/step_snapshot.go
+++ b/builder/scaleway/step_snapshot.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
 	"github.com/scaleway/scaleway-sdk-go/scw"
 )
@@ -23,7 +23,7 @@ func (s *stepSnapshot) Run(ctx context.Context, state multistep.StateBag) multis
 	createSnapshotResp, err := instanceAPI.CreateSnapshot(&instance.CreateSnapshotRequest{
 		Name:     c.SnapshotName,
 		VolumeID: volumeID,
-	})
+	}, scw.WithContext(ctx))
 	if err != nil {
 		err := fmt.Errorf("Error creating snapshot: %s", err)
 		state.Put("error", err)
diff --git a/builder/scaleway/version/version.go b/builder/scaleway/version/version.go
new file mode 100644
index 000000000..f34f7d77d
--- /dev/null
+++ b/builder/scaleway/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ScalewayPluginVersion *version.PluginVersion
+
+func init() {
+	ScalewayPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/tencentcloud/cvm/access_config.go b/builder/tencentcloud/cvm/access_config.go
index 91eb484b8..a1c021fc6 100644
--- a/builder/tencentcloud/cvm/access_config.go
+++ b/builder/tencentcloud/cvm/access_config.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 )
diff --git a/builder/tencentcloud/cvm/builder.go b/builder/tencentcloud/cvm/builder.go
index 30cc4c42d..ecdfde864 100644
--- a/builder/tencentcloud/cvm/builder.go
+++ b/builder/tencentcloud/cvm/builder.go
@@ -7,12 +7,13 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "tencent.cloud"
@@ -123,8 +124,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			SSHConfig: b.config.TencentCloudRunConfig.Comm.SSHConfigFunc(),
 			Host:      SSHHost(b.config.AssociatePublicIpAddress),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.TencentCloudRunConfig.Comm,
 		},
 		// We need this step to detach keypair from instance, otherwise
@@ -140,7 +141,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 	}
 
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/tencentcloud/cvm/builder.hcl2spec.go b/builder/tencentcloud/cvm/builder.hcl2spec.go
index f0bd22163..e5612fc12 100644
--- a/builder/tencentcloud/cvm/builder.hcl2spec.go
+++ b/builder/tencentcloud/cvm/builder.hcl2spec.go
@@ -3,107 +3,108 @@ package cvm
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName           *string                     `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
-	PackerBuilderType         *string                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug               *bool                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce               *bool                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError             *string                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars            map[string]string           `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars       []string                    `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	SecretId                  *string                     `mapstructure:"secret_id" required:"true" cty:"secret_id" hcl:"secret_id"`
-	SecretKey                 *string                     `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	Region                    *string                     `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
-	Zone                      *string                     `mapstructure:"zone" required:"true" cty:"zone" hcl:"zone"`
-	SkipValidation            *bool                       `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
-	ImageName                 *string                     `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
-	ImageDescription          *string                     `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
-	Reboot                    *bool                       `mapstructure:"reboot" required:"false" cty:"reboot" hcl:"reboot"`
-	ForcePoweroff             *bool                       `mapstructure:"force_poweroff" required:"false" cty:"force_poweroff" hcl:"force_poweroff"`
-	Sysprep                   *bool                       `mapstructure:"sysprep" required:"false" cty:"sysprep" hcl:"sysprep"`
-	ImageForceDelete          *bool                       `mapstructure:"image_force_delete" cty:"image_force_delete" hcl:"image_force_delete"`
-	ImageCopyRegions          []string                    `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"`
-	ImageShareAccounts        []string                    `mapstructure:"image_share_accounts" required:"false" cty:"image_share_accounts" hcl:"image_share_accounts"`
-	AssociatePublicIpAddress  *bool                       `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
-	SourceImageId             *string                     `mapstructure:"source_image_id" required:"false" cty:"source_image_id" hcl:"source_image_id"`
-	SourceImageName           *string                     `mapstructure:"source_image_name" required:"false" cty:"source_image_name" hcl:"source_image_name"`
-	InstanceType              *string                     `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
-	InstanceName              *string                     `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"`
-	DiskType                  *string                     `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"`
-	DiskSize                  *int64                      `mapstructure:"disk_size" required:"false" cty:"disk_size" hcl:"disk_size"`
-	DataDisks                 []FlattencentCloudDataDisk  `mapstructure:"data_disks" cty:"data_disks" hcl:"data_disks"`
-	VpcId                     *string                     `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
-	VpcName                   *string                     `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"`
-	VpcIp                     *string                     `mapstructure:"vpc_ip" cty:"vpc_ip" hcl:"vpc_ip"`
-	SubnetId                  *string                     `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
-	SubnetName                *string                     `mapstructure:"subnet_name" required:"false" cty:"subnet_name" hcl:"subnet_name"`
-	CidrBlock                 *string                     `mapstructure:"cidr_block" required:"false" cty:"cidr_block" hcl:"cidr_block"`
-	SubnectCidrBlock          *string                     `mapstructure:"subnect_cidr_block" required:"false" cty:"subnect_cidr_block" hcl:"subnect_cidr_block"`
-	InternetChargeType        *string                     `mapstructure:"internet_charge_type" cty:"internet_charge_type" hcl:"internet_charge_type"`
-	InternetMaxBandwidthOut   *int64                      `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"`
-	SecurityGroupId           *string                     `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
-	SecurityGroupName         *string                     `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"`
-	UserData                  *string                     `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
-	UserDataFile              *string                     `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
-	HostName                  *string                     `mapstructure:"host_name" required:"false" cty:"host_name" hcl:"host_name"`
-	RunTags                   map[string]string           `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
-	RunTag                    []hcl2template.FlatKeyValue `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
-	Type                      *string                     `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect        *string                     `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                   *string                     `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                   *int                        `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername               *string                     `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword               *string                     `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName            *string                     `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName   *string                     `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	SSHTemporaryKeyPairType   *string                     `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits   *int                        `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                []string                    `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys    *bool                       `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos               []string                    `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile         *string                     `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile        *string                     `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                    *bool                       `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                *string                     `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout            *string                     `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth              *bool                       `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding *bool                       `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts      *int                        `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost            *string                     `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort            *int                        `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth       *bool                       `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername        *string                     `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword        *string                     `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive     *bool                       `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile  *string                     `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile *string                     `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod     *string                     `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost              *string                     `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort              *int                        `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername          *string                     `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword          *string                     `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval      *string                     `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout       *string                     `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels          []string                    `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels           []string                    `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey              []byte                      `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey             []byte                      `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                 *string                     `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword             *string                     `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                 *string                     `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy              *bool                       `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                 *int                        `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout              *string                     `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL               *bool                       `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure             *bool                       `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM              *bool                       `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
-	SSHPrivateIp              *bool                       `mapstructure:"ssh_private_ip" cty:"ssh_private_ip" hcl:"ssh_private_ip"`
+	PackerBuildName           *string                    `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
+	PackerBuilderType         *string                    `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                    `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
+	PackerDebug               *bool                      `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
+	PackerForce               *bool                      `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
+	PackerOnError             *string                    `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
+	PackerUserVars            map[string]string          `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
+	PackerSensitiveVars       []string                   `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
+	SecretId                  *string                    `mapstructure:"secret_id" required:"true" cty:"secret_id" hcl:"secret_id"`
+	SecretKey                 *string                    `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
+	Region                    *string                    `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
+	Zone                      *string                    `mapstructure:"zone" required:"true" cty:"zone" hcl:"zone"`
+	SkipValidation            *bool                      `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
+	ImageName                 *string                    `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
+	ImageDescription          *string                    `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
+	Reboot                    *bool                      `mapstructure:"reboot" required:"false" cty:"reboot" hcl:"reboot"`
+	ForcePoweroff             *bool                      `mapstructure:"force_poweroff" required:"false" cty:"force_poweroff" hcl:"force_poweroff"`
+	Sysprep                   *bool                      `mapstructure:"sysprep" required:"false" cty:"sysprep" hcl:"sysprep"`
+	ImageForceDelete          *bool                      `mapstructure:"image_force_delete" cty:"image_force_delete" hcl:"image_force_delete"`
+	ImageCopyRegions          []string                   `mapstructure:"image_copy_regions" required:"false" cty:"image_copy_regions" hcl:"image_copy_regions"`
+	ImageShareAccounts        []string                   `mapstructure:"image_share_accounts" required:"false" cty:"image_share_accounts" hcl:"image_share_accounts"`
+	AssociatePublicIpAddress  *bool                      `mapstructure:"associate_public_ip_address" required:"false" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
+	SourceImageId             *string                    `mapstructure:"source_image_id" required:"false" cty:"source_image_id" hcl:"source_image_id"`
+	SourceImageName           *string                    `mapstructure:"source_image_name" required:"false" cty:"source_image_name" hcl:"source_image_name"`
+	InstanceType              *string                    `mapstructure:"instance_type" required:"true" cty:"instance_type" hcl:"instance_type"`
+	InstanceName              *string                    `mapstructure:"instance_name" required:"false" cty:"instance_name" hcl:"instance_name"`
+	DiskType                  *string                    `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"`
+	DiskSize                  *int64                     `mapstructure:"disk_size" required:"false" cty:"disk_size" hcl:"disk_size"`
+	DataDisks                 []FlattencentCloudDataDisk `mapstructure:"data_disks" cty:"data_disks" hcl:"data_disks"`
+	VpcId                     *string                    `mapstructure:"vpc_id" required:"false" cty:"vpc_id" hcl:"vpc_id"`
+	VpcName                   *string                    `mapstructure:"vpc_name" required:"false" cty:"vpc_name" hcl:"vpc_name"`
+	VpcIp                     *string                    `mapstructure:"vpc_ip" cty:"vpc_ip" hcl:"vpc_ip"`
+	SubnetId                  *string                    `mapstructure:"subnet_id" required:"false" cty:"subnet_id" hcl:"subnet_id"`
+	SubnetName                *string                    `mapstructure:"subnet_name" required:"false" cty:"subnet_name" hcl:"subnet_name"`
+	CidrBlock                 *string                    `mapstructure:"cidr_block" required:"false" cty:"cidr_block" hcl:"cidr_block"`
+	SubnectCidrBlock          *string                    `mapstructure:"subnect_cidr_block" required:"false" cty:"subnect_cidr_block" hcl:"subnect_cidr_block"`
+	InternetChargeType        *string                    `mapstructure:"internet_charge_type" cty:"internet_charge_type" hcl:"internet_charge_type"`
+	InternetMaxBandwidthOut   *int64                     `mapstructure:"internet_max_bandwidth_out" required:"false" cty:"internet_max_bandwidth_out" hcl:"internet_max_bandwidth_out"`
+	SecurityGroupId           *string                    `mapstructure:"security_group_id" required:"false" cty:"security_group_id" hcl:"security_group_id"`
+	SecurityGroupName         *string                    `mapstructure:"security_group_name" required:"false" cty:"security_group_name" hcl:"security_group_name"`
+	UserData                  *string                    `mapstructure:"user_data" required:"false" cty:"user_data" hcl:"user_data"`
+	UserDataFile              *string                    `mapstructure:"user_data_file" required:"false" cty:"user_data_file" hcl:"user_data_file"`
+	HostName                  *string                    `mapstructure:"host_name" required:"false" cty:"host_name" hcl:"host_name"`
+	RunTags                   map[string]string          `mapstructure:"run_tags" required:"false" cty:"run_tags" hcl:"run_tags"`
+	RunTag                    []config.FlatKeyValue      `mapstructure:"run_tag" required:"false" cty:"run_tag" hcl:"run_tag"`
+	Type                      *string                    `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
+	PauseBeforeConnect        *string                    `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
+	SSHHost                   *string                    `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
+	SSHPort                   *int                       `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
+	SSHUsername               *string                    `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
+	SSHPassword               *string                    `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
+	SSHKeyPairName            *string                    `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName   *string                    `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
+	SSHTemporaryKeyPairType   *string                    `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
+	SSHTemporaryKeyPairBits   *int                       `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
+	SSHCiphers                []string                   `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
+	SSHClearAuthorizedKeys    *bool                      `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
+	SSHKEXAlgos               []string                   `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
+	SSHPrivateKeyFile         *string                    `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
+	SSHCertificateFile        *string                    `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
+	SSHPty                    *bool                      `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
+	SSHTimeout                *string                    `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
+	SSHWaitTimeout            *string                    `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
+	SSHAgentAuth              *bool                      `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
+	SSHDisableAgentForwarding *bool                      `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
+	SSHHandshakeAttempts      *int                       `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
+	SSHBastionHost            *string                    `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
+	SSHBastionPort            *int                       `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
+	SSHBastionAgentAuth       *bool                      `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
+	SSHBastionUsername        *string                    `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
+	SSHBastionPassword        *string                    `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
+	SSHBastionInteractive     *bool                      `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
+	SSHBastionPrivateKeyFile  *string                    `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
+	SSHBastionCertificateFile *string                    `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
+	SSHFileTransferMethod     *string                    `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
+	SSHProxyHost              *string                    `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
+	SSHProxyPort              *int                       `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
+	SSHProxyUsername          *string                    `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
+	SSHProxyPassword          *string                    `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
+	SSHKeepAliveInterval      *string                    `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
+	SSHReadWriteTimeout       *string                    `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
+	SSHRemoteTunnels          []string                   `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
+	SSHLocalTunnels           []string                   `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
+	SSHPublicKey              []byte                     `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
+	SSHPrivateKey             []byte                     `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
+	WinRMUser                 *string                    `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
+	WinRMPassword             *string                    `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
+	WinRMHost                 *string                    `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
+	WinRMNoProxy              *bool                      `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
+	WinRMPort                 *int                       `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
+	WinRMTimeout              *string                    `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
+	WinRMUseSSL               *bool                      `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
+	WinRMInsecure             *bool                      `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
+	WinRMUseNTLM              *bool                      `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
+	SSHPrivateIp              *bool                      `mapstructure:"ssh_private_ip" cty:"ssh_private_ip" hcl:"ssh_private_ip"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -120,6 +121,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -161,7 +163,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"user_data_file":               &hcldec.AttrSpec{Name: "user_data_file", Type: cty.String, Required: false},
 		"host_name":                    &hcldec.AttrSpec{Name: "host_name", Type: cty.String, Required: false},
 		"run_tags":                     &hcldec.AttrSpec{Name: "run_tags", Type: cty.Map(cty.String), Required: false},
-		"run_tag":                      &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"run_tag":                      &hcldec.BlockListSpec{TypeName: "run_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"communicator":                 &hcldec.AttrSpec{Name: "communicator", Type: cty.String, Required: false},
 		"pause_before_connecting":      &hcldec.AttrSpec{Name: "pause_before_connecting", Type: cty.String, Required: false},
 		"ssh_host":                     &hcldec.AttrSpec{Name: "ssh_host", Type: cty.String, Required: false},
diff --git a/builder/tencentcloud/cvm/common.go b/builder/tencentcloud/cvm/common.go
index 48deda926..d3fd7c398 100644
--- a/builder/tencentcloud/cvm/common.go
+++ b/builder/tencentcloud/cvm/common.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/errors"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
diff --git a/builder/tencentcloud/cvm/image_config.go b/builder/tencentcloud/cvm/image_config.go
index 3d5b3a324..91f89427f 100644
--- a/builder/tencentcloud/cvm/image_config.go
+++ b/builder/tencentcloud/cvm/image_config.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"unicode/utf8"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type TencentCloudImageConfig struct {
diff --git a/builder/tencentcloud/cvm/run_config.go b/builder/tencentcloud/cvm/run_config.go
index 52fb4d292..f13d4595d 100644
--- a/builder/tencentcloud/cvm/run_config.go
+++ b/builder/tencentcloud/cvm/run_config.go
@@ -8,10 +8,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"github.com/pkg/errors"
 )
 
@@ -91,7 +91,7 @@ type TencentCloudRunConfig struct {
 	// block containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	RunTag hcl2template.KeyValues `mapstructure:"run_tag" required:"false"`
+	RunTag config.KeyValues `mapstructure:"run_tag" required:"false"`
 
 	// Communicator settings
 	Comm         communicator.Config `mapstructure:",squash"`
diff --git a/builder/tencentcloud/cvm/step_check_source_image.go b/builder/tencentcloud/cvm/step_check_source_image.go
index 156525c2c..f2fc01265 100644
--- a/builder/tencentcloud/cvm/step_check_source_image.go
+++ b/builder/tencentcloud/cvm/step_check_source_image.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_config_key_pair.go b/builder/tencentcloud/cvm/step_config_key_pair.go
index a4ae97159..7d0534273 100644
--- a/builder/tencentcloud/cvm/step_config_key_pair.go
+++ b/builder/tencentcloud/cvm/step_config_key_pair.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_config_security_group.go b/builder/tencentcloud/cvm/step_config_security_group.go
index 97d70e3c1..97af73848 100644
--- a/builder/tencentcloud/cvm/step_config_security_group.go
+++ b/builder/tencentcloud/cvm/step_config_security_group.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_config_subnet.go b/builder/tencentcloud/cvm/step_config_subnet.go
index 91ab42b7f..10c9b01d3 100644
--- a/builder/tencentcloud/cvm/step_config_subnet.go
+++ b/builder/tencentcloud/cvm/step_config_subnet.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_config_vpc.go b/builder/tencentcloud/cvm/step_config_vpc.go
index 707afb467..e89ec86f6 100644
--- a/builder/tencentcloud/cvm/step_config_vpc.go
+++ b/builder/tencentcloud/cvm/step_config_vpc.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	vpc "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_copy_image.go b/builder/tencentcloud/cvm/step_copy_image.go
index abc30d86b..bcfbd171f 100644
--- a/builder/tencentcloud/cvm/step_copy_image.go
+++ b/builder/tencentcloud/cvm/step_copy_image.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
diff --git a/builder/tencentcloud/cvm/step_create_image.go b/builder/tencentcloud/cvm/step_create_image.go
index f0fee3bc2..f55ad28ce 100644
--- a/builder/tencentcloud/cvm/step_create_image.go
+++ b/builder/tencentcloud/cvm/step_create_image.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go
index 6c5533e4d..b8cc2ca67 100644
--- a/builder/tencentcloud/cvm/step_detach_temp_key_pair.go
+++ b/builder/tencentcloud/cvm/step_detach_temp_key_pair.go
@@ -3,7 +3,7 @@ package cvm
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
diff --git a/builder/tencentcloud/cvm/step_pre_validate.go b/builder/tencentcloud/cvm/step_pre_validate.go
index 400535579..d07d8f058 100644
--- a/builder/tencentcloud/cvm/step_pre_validate.go
+++ b/builder/tencentcloud/cvm/step_pre_validate.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_run_instance.go b/builder/tencentcloud/cvm/step_run_instance.go
index 09e889d3e..811b71ed9 100644
--- a/builder/tencentcloud/cvm/step_run_instance.go
+++ b/builder/tencentcloud/cvm/step_run_instance.go
@@ -7,7 +7,7 @@ import (
 	"io/ioutil"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
 
diff --git a/builder/tencentcloud/cvm/step_share_image.go b/builder/tencentcloud/cvm/step_share_image.go
index b7ae237f7..d83bb9fa5 100644
--- a/builder/tencentcloud/cvm/step_share_image.go
+++ b/builder/tencentcloud/cvm/step_share_image.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common"
 	cvm "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm/v20170312"
 )
diff --git a/examples/tencentcloud/basic-with-data-disk.json b/builder/tencentcloud/examples/basic-with-data-disk.json
similarity index 100%
rename from examples/tencentcloud/basic-with-data-disk.json
rename to builder/tencentcloud/examples/basic-with-data-disk.json
diff --git a/examples/tencentcloud/basic.json b/builder/tencentcloud/examples/basic.json
similarity index 100%
rename from examples/tencentcloud/basic.json
rename to builder/tencentcloud/examples/basic.json
diff --git a/examples/tencentcloud/centos.json b/builder/tencentcloud/examples/centos.json
similarity index 100%
rename from examples/tencentcloud/centos.json
rename to builder/tencentcloud/examples/centos.json
diff --git a/builder/tencentcloud/version/version.go b/builder/tencentcloud/version/version.go
new file mode 100644
index 000000000..20b9b6ed3
--- /dev/null
+++ b/builder/tencentcloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var TencentPluginVersion *version.PluginVersion
+
+func init() {
+	TencentPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/triton/access_config.go b/builder/triton/access_config.go
index 3617f9a90..92dded501 100644
--- a/builder/triton/access_config.go
+++ b/builder/triton/access_config.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/hashicorp/errwrap"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	tgo "github.com/joyent/triton-go"
 	"github.com/joyent/triton-go/authentication"
 	"github.com/joyent/triton-go/compute"
diff --git a/builder/triton/builder.go b/builder/triton/builder.go
index 70e8cd88d..ca41cb270 100644
--- a/builder/triton/builder.go
+++ b/builder/triton/builder.go
@@ -5,11 +5,11 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 const (
@@ -71,8 +71,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      commHost(b.config.Comm.Host()),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &config.Comm,
 		},
 		&StepStopMachine{},
@@ -80,7 +80,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&StepDeleteMachine{},
 	}
 
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/triton/config.go b/builder/triton/config.go
index e01fce6dc..bbf5e4de1 100644
--- a/builder/triton/config.go
+++ b/builder/triton/config.go
@@ -3,9 +3,9 @@
 package triton
 
 import (
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/builder/triton/config.hcl2spec.go b/builder/triton/config.hcl2spec.go
index 19ceb2197..fa8427aad 100644
--- a/builder/triton/config.hcl2spec.go
+++ b/builder/triton/config.hcl2spec.go
@@ -3,92 +3,93 @@ package triton
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName           *string                      `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
-	PackerBuilderType         *string                      `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug               *bool                        `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce               *bool                        `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError             *string                      `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars            map[string]string            `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars       []string                     `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	Endpoint                  *string                      `mapstructure:"triton_url" required:"false" cty:"triton_url" hcl:"triton_url"`
-	Account                   *string                      `mapstructure:"triton_account" required:"true" cty:"triton_account" hcl:"triton_account"`
-	Username                  *string                      `mapstructure:"triton_user" required:"false" cty:"triton_user" hcl:"triton_user"`
-	KeyID                     *string                      `mapstructure:"triton_key_id" required:"true" cty:"triton_key_id" hcl:"triton_key_id"`
-	KeyMaterial               *string                      `mapstructure:"triton_key_material" required:"false" cty:"triton_key_material" hcl:"triton_key_material"`
-	InsecureSkipTLSVerify     *bool                        `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
-	MachineName               *string                      `mapstructure:"source_machine_name" required:"false" cty:"source_machine_name" hcl:"source_machine_name"`
-	MachinePackage            *string                      `mapstructure:"source_machine_package" required:"true" cty:"source_machine_package" hcl:"source_machine_package"`
-	MachineImage              *string                      `mapstructure:"source_machine_image" required:"true" cty:"source_machine_image" hcl:"source_machine_image"`
-	MachineNetworks           []string                     `mapstructure:"source_machine_networks" required:"false" cty:"source_machine_networks" hcl:"source_machine_networks"`
-	MachineMetadata           map[string]string            `mapstructure:"source_machine_metadata" required:"false" cty:"source_machine_metadata" hcl:"source_machine_metadata"`
-	MachineTags               map[string]string            `mapstructure:"source_machine_tags" required:"false" cty:"source_machine_tags" hcl:"source_machine_tags"`
-	MachineTag                []hcl2template.FlatKeyValue  `mapstructure:"source_machine_tag" required:"false" cty:"source_machine_tag" hcl:"source_machine_tag"`
-	MachineFirewallEnabled    *bool                        `mapstructure:"source_machine_firewall_enabled" required:"false" cty:"source_machine_firewall_enabled" hcl:"source_machine_firewall_enabled"`
-	MachineImageFilters       *FlatMachineImageFilter      `mapstructure:"source_machine_image_filter" required:"false" cty:"source_machine_image_filter" hcl:"source_machine_image_filter"`
-	ImageName                 *string                      `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
-	ImageVersion              *string                      `mapstructure:"image_version" required:"true" cty:"image_version" hcl:"image_version"`
-	ImageDescription          *string                      `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
-	ImageHomepage             *string                      `mapstructure:"image_homepage" required:"false" cty:"image_homepage" hcl:"image_homepage"`
-	ImageEULA                 *string                      `mapstructure:"image_eula_url" required:"false" cty:"image_eula_url" hcl:"image_eula_url"`
-	ImageACL                  []string                     `mapstructure:"image_acls" required:"false" cty:"image_acls" hcl:"image_acls"`
-	ImageTags                 map[string]string            `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"`
-	ImageTag                  []hcl2template.FlatNameValue `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"`
-	Type                      *string                      `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
-	PauseBeforeConnect        *string                      `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
-	SSHHost                   *string                      `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
-	SSHPort                   *int                         `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
-	SSHUsername               *string                      `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
-	SSHPassword               *string                      `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
-	SSHKeyPairName            *string                      `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
-	SSHTemporaryKeyPairName   *string                      `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
-	SSHTemporaryKeyPairType   *string                      `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
-	SSHTemporaryKeyPairBits   *int                         `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
-	SSHCiphers                []string                     `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
-	SSHClearAuthorizedKeys    *bool                        `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
-	SSHKEXAlgos               []string                     `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
-	SSHPrivateKeyFile         *string                      `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
-	SSHCertificateFile        *string                      `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
-	SSHPty                    *bool                        `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
-	SSHTimeout                *string                      `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
-	SSHWaitTimeout            *string                      `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
-	SSHAgentAuth              *bool                        `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
-	SSHDisableAgentForwarding *bool                        `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
-	SSHHandshakeAttempts      *int                         `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
-	SSHBastionHost            *string                      `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
-	SSHBastionPort            *int                         `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
-	SSHBastionAgentAuth       *bool                        `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
-	SSHBastionUsername        *string                      `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
-	SSHBastionPassword        *string                      `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
-	SSHBastionInteractive     *bool                        `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
-	SSHBastionPrivateKeyFile  *string                      `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
-	SSHBastionCertificateFile *string                      `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
-	SSHFileTransferMethod     *string                      `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
-	SSHProxyHost              *string                      `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
-	SSHProxyPort              *int                         `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
-	SSHProxyUsername          *string                      `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
-	SSHProxyPassword          *string                      `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
-	SSHKeepAliveInterval      *string                      `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
-	SSHReadWriteTimeout       *string                      `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
-	SSHRemoteTunnels          []string                     `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
-	SSHLocalTunnels           []string                     `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
-	SSHPublicKey              []byte                       `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
-	SSHPrivateKey             []byte                       `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
-	WinRMUser                 *string                      `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
-	WinRMPassword             *string                      `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
-	WinRMHost                 *string                      `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
-	WinRMNoProxy              *bool                        `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
-	WinRMPort                 *int                         `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
-	WinRMTimeout              *string                      `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
-	WinRMUseSSL               *bool                        `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
-	WinRMInsecure             *bool                        `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
-	WinRMUseNTLM              *bool                        `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
+	PackerBuildName           *string                 `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
+	PackerBuilderType         *string                 `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                 `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
+	PackerDebug               *bool                   `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
+	PackerForce               *bool                   `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
+	PackerOnError             *string                 `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
+	PackerUserVars            map[string]string       `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
+	PackerSensitiveVars       []string                `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
+	Endpoint                  *string                 `mapstructure:"triton_url" required:"false" cty:"triton_url" hcl:"triton_url"`
+	Account                   *string                 `mapstructure:"triton_account" required:"true" cty:"triton_account" hcl:"triton_account"`
+	Username                  *string                 `mapstructure:"triton_user" required:"false" cty:"triton_user" hcl:"triton_user"`
+	KeyID                     *string                 `mapstructure:"triton_key_id" required:"true" cty:"triton_key_id" hcl:"triton_key_id"`
+	KeyMaterial               *string                 `mapstructure:"triton_key_material" required:"false" cty:"triton_key_material" hcl:"triton_key_material"`
+	InsecureSkipTLSVerify     *bool                   `mapstructure:"insecure_skip_tls_verify" required:"false" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
+	MachineName               *string                 `mapstructure:"source_machine_name" required:"false" cty:"source_machine_name" hcl:"source_machine_name"`
+	MachinePackage            *string                 `mapstructure:"source_machine_package" required:"true" cty:"source_machine_package" hcl:"source_machine_package"`
+	MachineImage              *string                 `mapstructure:"source_machine_image" required:"true" cty:"source_machine_image" hcl:"source_machine_image"`
+	MachineNetworks           []string                `mapstructure:"source_machine_networks" required:"false" cty:"source_machine_networks" hcl:"source_machine_networks"`
+	MachineMetadata           map[string]string       `mapstructure:"source_machine_metadata" required:"false" cty:"source_machine_metadata" hcl:"source_machine_metadata"`
+	MachineTags               map[string]string       `mapstructure:"source_machine_tags" required:"false" cty:"source_machine_tags" hcl:"source_machine_tags"`
+	MachineTag                []config.FlatKeyValue   `mapstructure:"source_machine_tag" required:"false" cty:"source_machine_tag" hcl:"source_machine_tag"`
+	MachineFirewallEnabled    *bool                   `mapstructure:"source_machine_firewall_enabled" required:"false" cty:"source_machine_firewall_enabled" hcl:"source_machine_firewall_enabled"`
+	MachineImageFilters       *FlatMachineImageFilter `mapstructure:"source_machine_image_filter" required:"false" cty:"source_machine_image_filter" hcl:"source_machine_image_filter"`
+	ImageName                 *string                 `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
+	ImageVersion              *string                 `mapstructure:"image_version" required:"true" cty:"image_version" hcl:"image_version"`
+	ImageDescription          *string                 `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
+	ImageHomepage             *string                 `mapstructure:"image_homepage" required:"false" cty:"image_homepage" hcl:"image_homepage"`
+	ImageEULA                 *string                 `mapstructure:"image_eula_url" required:"false" cty:"image_eula_url" hcl:"image_eula_url"`
+	ImageACL                  []string                `mapstructure:"image_acls" required:"false" cty:"image_acls" hcl:"image_acls"`
+	ImageTags                 map[string]string       `mapstructure:"image_tags" required:"false" cty:"image_tags" hcl:"image_tags"`
+	ImageTag                  []config.FlatNameValue  `mapstructure:"image_tag" required:"false" cty:"image_tag" hcl:"image_tag"`
+	Type                      *string                 `mapstructure:"communicator" cty:"communicator" hcl:"communicator"`
+	PauseBeforeConnect        *string                 `mapstructure:"pause_before_connecting" cty:"pause_before_connecting" hcl:"pause_before_connecting"`
+	SSHHost                   *string                 `mapstructure:"ssh_host" cty:"ssh_host" hcl:"ssh_host"`
+	SSHPort                   *int                    `mapstructure:"ssh_port" cty:"ssh_port" hcl:"ssh_port"`
+	SSHUsername               *string                 `mapstructure:"ssh_username" cty:"ssh_username" hcl:"ssh_username"`
+	SSHPassword               *string                 `mapstructure:"ssh_password" cty:"ssh_password" hcl:"ssh_password"`
+	SSHKeyPairName            *string                 `mapstructure:"ssh_keypair_name" undocumented:"true" cty:"ssh_keypair_name" hcl:"ssh_keypair_name"`
+	SSHTemporaryKeyPairName   *string                 `mapstructure:"temporary_key_pair_name" undocumented:"true" cty:"temporary_key_pair_name" hcl:"temporary_key_pair_name"`
+	SSHTemporaryKeyPairType   *string                 `mapstructure:"temporary_key_pair_type" cty:"temporary_key_pair_type" hcl:"temporary_key_pair_type"`
+	SSHTemporaryKeyPairBits   *int                    `mapstructure:"temporary_key_pair_bits" cty:"temporary_key_pair_bits" hcl:"temporary_key_pair_bits"`
+	SSHCiphers                []string                `mapstructure:"ssh_ciphers" cty:"ssh_ciphers" hcl:"ssh_ciphers"`
+	SSHClearAuthorizedKeys    *bool                   `mapstructure:"ssh_clear_authorized_keys" cty:"ssh_clear_authorized_keys" hcl:"ssh_clear_authorized_keys"`
+	SSHKEXAlgos               []string                `mapstructure:"ssh_key_exchange_algorithms" cty:"ssh_key_exchange_algorithms" hcl:"ssh_key_exchange_algorithms"`
+	SSHPrivateKeyFile         *string                 `mapstructure:"ssh_private_key_file" undocumented:"true" cty:"ssh_private_key_file" hcl:"ssh_private_key_file"`
+	SSHCertificateFile        *string                 `mapstructure:"ssh_certificate_file" cty:"ssh_certificate_file" hcl:"ssh_certificate_file"`
+	SSHPty                    *bool                   `mapstructure:"ssh_pty" cty:"ssh_pty" hcl:"ssh_pty"`
+	SSHTimeout                *string                 `mapstructure:"ssh_timeout" cty:"ssh_timeout" hcl:"ssh_timeout"`
+	SSHWaitTimeout            *string                 `mapstructure:"ssh_wait_timeout" undocumented:"true" cty:"ssh_wait_timeout" hcl:"ssh_wait_timeout"`
+	SSHAgentAuth              *bool                   `mapstructure:"ssh_agent_auth" undocumented:"true" cty:"ssh_agent_auth" hcl:"ssh_agent_auth"`
+	SSHDisableAgentForwarding *bool                   `mapstructure:"ssh_disable_agent_forwarding" cty:"ssh_disable_agent_forwarding" hcl:"ssh_disable_agent_forwarding"`
+	SSHHandshakeAttempts      *int                    `mapstructure:"ssh_handshake_attempts" cty:"ssh_handshake_attempts" hcl:"ssh_handshake_attempts"`
+	SSHBastionHost            *string                 `mapstructure:"ssh_bastion_host" cty:"ssh_bastion_host" hcl:"ssh_bastion_host"`
+	SSHBastionPort            *int                    `mapstructure:"ssh_bastion_port" cty:"ssh_bastion_port" hcl:"ssh_bastion_port"`
+	SSHBastionAgentAuth       *bool                   `mapstructure:"ssh_bastion_agent_auth" cty:"ssh_bastion_agent_auth" hcl:"ssh_bastion_agent_auth"`
+	SSHBastionUsername        *string                 `mapstructure:"ssh_bastion_username" cty:"ssh_bastion_username" hcl:"ssh_bastion_username"`
+	SSHBastionPassword        *string                 `mapstructure:"ssh_bastion_password" cty:"ssh_bastion_password" hcl:"ssh_bastion_password"`
+	SSHBastionInteractive     *bool                   `mapstructure:"ssh_bastion_interactive" cty:"ssh_bastion_interactive" hcl:"ssh_bastion_interactive"`
+	SSHBastionPrivateKeyFile  *string                 `mapstructure:"ssh_bastion_private_key_file" cty:"ssh_bastion_private_key_file" hcl:"ssh_bastion_private_key_file"`
+	SSHBastionCertificateFile *string                 `mapstructure:"ssh_bastion_certificate_file" cty:"ssh_bastion_certificate_file" hcl:"ssh_bastion_certificate_file"`
+	SSHFileTransferMethod     *string                 `mapstructure:"ssh_file_transfer_method" cty:"ssh_file_transfer_method" hcl:"ssh_file_transfer_method"`
+	SSHProxyHost              *string                 `mapstructure:"ssh_proxy_host" cty:"ssh_proxy_host" hcl:"ssh_proxy_host"`
+	SSHProxyPort              *int                    `mapstructure:"ssh_proxy_port" cty:"ssh_proxy_port" hcl:"ssh_proxy_port"`
+	SSHProxyUsername          *string                 `mapstructure:"ssh_proxy_username" cty:"ssh_proxy_username" hcl:"ssh_proxy_username"`
+	SSHProxyPassword          *string                 `mapstructure:"ssh_proxy_password" cty:"ssh_proxy_password" hcl:"ssh_proxy_password"`
+	SSHKeepAliveInterval      *string                 `mapstructure:"ssh_keep_alive_interval" cty:"ssh_keep_alive_interval" hcl:"ssh_keep_alive_interval"`
+	SSHReadWriteTimeout       *string                 `mapstructure:"ssh_read_write_timeout" cty:"ssh_read_write_timeout" hcl:"ssh_read_write_timeout"`
+	SSHRemoteTunnels          []string                `mapstructure:"ssh_remote_tunnels" cty:"ssh_remote_tunnels" hcl:"ssh_remote_tunnels"`
+	SSHLocalTunnels           []string                `mapstructure:"ssh_local_tunnels" cty:"ssh_local_tunnels" hcl:"ssh_local_tunnels"`
+	SSHPublicKey              []byte                  `mapstructure:"ssh_public_key" undocumented:"true" cty:"ssh_public_key" hcl:"ssh_public_key"`
+	SSHPrivateKey             []byte                  `mapstructure:"ssh_private_key" undocumented:"true" cty:"ssh_private_key" hcl:"ssh_private_key"`
+	WinRMUser                 *string                 `mapstructure:"winrm_username" cty:"winrm_username" hcl:"winrm_username"`
+	WinRMPassword             *string                 `mapstructure:"winrm_password" cty:"winrm_password" hcl:"winrm_password"`
+	WinRMHost                 *string                 `mapstructure:"winrm_host" cty:"winrm_host" hcl:"winrm_host"`
+	WinRMNoProxy              *bool                   `mapstructure:"winrm_no_proxy" cty:"winrm_no_proxy" hcl:"winrm_no_proxy"`
+	WinRMPort                 *int                    `mapstructure:"winrm_port" cty:"winrm_port" hcl:"winrm_port"`
+	WinRMTimeout              *string                 `mapstructure:"winrm_timeout" cty:"winrm_timeout" hcl:"winrm_timeout"`
+	WinRMUseSSL               *bool                   `mapstructure:"winrm_use_ssl" cty:"winrm_use_ssl" hcl:"winrm_use_ssl"`
+	WinRMInsecure             *bool                   `mapstructure:"winrm_insecure" cty:"winrm_insecure" hcl:"winrm_insecure"`
+	WinRMUseNTLM              *bool                   `mapstructure:"winrm_use_ntlm" cty:"winrm_use_ntlm" hcl:"winrm_use_ntlm"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -105,6 +106,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":               &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":             &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":             &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                    &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                    &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                 &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -122,7 +124,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"source_machine_networks":         &hcldec.AttrSpec{Name: "source_machine_networks", Type: cty.List(cty.String), Required: false},
 		"source_machine_metadata":         &hcldec.AttrSpec{Name: "source_machine_metadata", Type: cty.Map(cty.String), Required: false},
 		"source_machine_tags":             &hcldec.AttrSpec{Name: "source_machine_tags", Type: cty.Map(cty.String), Required: false},
-		"source_machine_tag":              &hcldec.BlockListSpec{TypeName: "source_machine_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"source_machine_tag":              &hcldec.BlockListSpec{TypeName: "source_machine_tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"source_machine_firewall_enabled": &hcldec.AttrSpec{Name: "source_machine_firewall_enabled", Type: cty.Bool, Required: false},
 		"source_machine_image_filter":     &hcldec.BlockSpec{TypeName: "source_machine_image_filter", Nested: hcldec.ObjectSpec((*FlatMachineImageFilter)(nil).HCL2Spec())},
 		"image_name":                      &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
@@ -132,7 +134,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"image_eula_url":                  &hcldec.AttrSpec{Name: "image_eula_url", Type: cty.String, Required: false},
 		"image_acls":                      &hcldec.AttrSpec{Name: "image_acls", Type: cty.List(cty.String), Required: false},
 		"image_tags":                      &hcldec.AttrSpec{Name: "image_tags", Type: cty.Map(cty.String), Required: false},
-		"image_tag":                       &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatNameValue)(nil).HCL2Spec())},
+		"image_tag":                       &hcldec.BlockListSpec{TypeName: "image_tag", Nested: hcldec.ObjectSpec((*config.FlatNameValue)(nil).HCL2Spec())},
 		"communicator":                    &hcldec.AttrSpec{Name: "communicator", Type: cty.String, Required: false},
 		"pause_before_connecting":         &hcldec.AttrSpec{Name: "pause_before_connecting", Type: cty.String, Required: false},
 		"ssh_host":                        &hcldec.AttrSpec{Name: "ssh_host", Type: cty.String, Required: false},
diff --git a/builder/triton/source_machine_config.go b/builder/triton/source_machine_config.go
index 8733a06b0..18db29d59 100644
--- a/builder/triton/source_machine_config.go
+++ b/builder/triton/source_machine_config.go
@@ -6,8 +6,8 @@ package triton
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/hcl2template"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // SourceMachineConfig represents the configuration to run a machine using
@@ -59,7 +59,7 @@ type SourceMachineConfig struct {
 	// singular block containing a `key` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	MachineTag hcl2template.KeyValues `mapstructure:"source_machine_tag" required:"false"`
+	MachineTag config.KeyValues `mapstructure:"source_machine_tag" required:"false"`
 	// Whether or not the firewall
 	// of the VM used to create an image of is enabled. The Triton firewall only
 	// filters inbound traffic to the VM. All outbound traffic is always allowed.
diff --git a/builder/triton/ssh.go b/builder/triton/ssh.go
index bc34fd6a9..0adf15c45 100644
--- a/builder/triton/ssh.go
+++ b/builder/triton/ssh.go
@@ -3,7 +3,7 @@ package triton
 import (
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func commHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/triton/step_create_image_from_machine.go b/builder/triton/step_create_image_from_machine.go
index b7df6a0f6..bb2d66255 100644
--- a/builder/triton/step_create_image_from_machine.go
+++ b/builder/triton/step_create_image_from_machine.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCreateImageFromMachine creates an image with the specified attributes
diff --git a/builder/triton/step_create_image_from_machine_test.go b/builder/triton/step_create_image_from_machine_test.go
index 34eb95c8c..8423e85d5 100644
--- a/builder/triton/step_create_image_from_machine_test.go
+++ b/builder/triton/step_create_image_from_machine_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateImageFromMachine(t *testing.T) {
diff --git a/builder/triton/step_create_source_machine.go b/builder/triton/step_create_source_machine.go
index 24080ba23..0da7f603e 100644
--- a/builder/triton/step_create_source_machine.go
+++ b/builder/triton/step_create_source_machine.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCreateSourceMachine creates an machine with the specified attributes
diff --git a/builder/triton/step_create_source_machine_test.go b/builder/triton/step_create_source_machine_test.go
index 78d97ad5e..d70bfd6a0 100644
--- a/builder/triton/step_create_source_machine_test.go
+++ b/builder/triton/step_create_source_machine_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateSourceMachine(t *testing.T) {
diff --git a/builder/triton/step_delete_machine.go b/builder/triton/step_delete_machine.go
index aacb0d426..d1d005c25 100644
--- a/builder/triton/step_delete_machine.go
+++ b/builder/triton/step_delete_machine.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepDeleteMachine deletes the machine with the ID specified in state["machine"]
diff --git a/builder/triton/step_delete_machine_test.go b/builder/triton/step_delete_machine_test.go
index 421024d58..1615f4f7d 100644
--- a/builder/triton/step_delete_machine_test.go
+++ b/builder/triton/step_delete_machine_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepDeleteMachine(t *testing.T) {
diff --git a/builder/triton/step_stop_machine.go b/builder/triton/step_stop_machine.go
index 2e859dec6..f6b243a23 100644
--- a/builder/triton/step_stop_machine.go
+++ b/builder/triton/step_stop_machine.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepStopMachine stops the machine with the given Machine ID, and waits
diff --git a/builder/triton/step_stop_machine_test.go b/builder/triton/step_stop_machine_test.go
index 8f0f39d2d..ded3e5053 100644
--- a/builder/triton/step_stop_machine_test.go
+++ b/builder/triton/step_stop_machine_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepStopMachine(t *testing.T) {
diff --git a/builder/triton/step_test.go b/builder/triton/step_test.go
index bccc398c7..448a33a8f 100644
--- a/builder/triton/step_test.go
+++ b/builder/triton/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/triton/step_wait_for_stop_to_not_fail.go b/builder/triton/step_wait_for_stop_to_not_fail.go
index e6c6ced64..ce226c871 100644
--- a/builder/triton/step_wait_for_stop_to_not_fail.go
+++ b/builder/triton/step_wait_for_stop_to_not_fail.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepWaitForStopNotToFail waits for 10 seconds before returning with continue
diff --git a/builder/triton/target_image_config.go b/builder/triton/target_image_config.go
index a9ce24695..545240565 100644
--- a/builder/triton/target_image_config.go
+++ b/builder/triton/target_image_config.go
@@ -5,8 +5,8 @@ package triton
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/hcl2template"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // TargetImageConfig represents the configuration for the image to be created
@@ -41,7 +41,7 @@ type TargetImageConfig struct {
 	// block containing a `name` and a `value` field. In HCL2 mode the
 	// [`dynamic_block`](/docs/configuration/from-1.5/expressions#dynamic-blocks)
 	// will allow you to create those programatically.
-	ImageTag hcl2template.NameValues `mapstructure:"image_tag" required:"false"`
+	ImageTag config.NameValues `mapstructure:"image_tag" required:"false"`
 }
 
 // Prepare performs basic validation on a TargetImageConfig struct.
diff --git a/builder/triton/version/version.go b/builder/triton/version/version.go
new file mode 100644
index 000000000..71a6bbaf7
--- /dev/null
+++ b/builder/triton/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var TritonPluginVersion *version.PluginVersion
+
+func init() {
+	TritonPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/ucloud/common/access_config.go b/builder/ucloud/common/access_config.go
index f29a0f107..192fd35b9 100644
--- a/builder/ucloud/common/access_config.go
+++ b/builder/ucloud/common/access_config.go
@@ -10,8 +10,8 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/hashicorp/packer/template/interpolate"
-	"github.com/hashicorp/packer/version"
+	"github.com/hashicorp/packer/builder/ucloud/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/ucloud/ucloud-sdk-go/external"
 	"github.com/ucloud/ucloud-sdk-go/private/protocol/http"
 	"github.com/ucloud/ucloud-sdk-go/services/uaccount"
@@ -68,7 +68,7 @@ func (c *AccessConfig) Client() (*UCloudClient, error) {
 		cfg.BaseUrl = c.BaseUrl
 	}
 	cfg.LogLevel = log.PanicLevel
-	cfg.UserAgent = fmt.Sprintf("Packer-UCloud/%s", version.FormattedVersion())
+	cfg.UserAgent = fmt.Sprintf("Packer-UCloud/%s", version.UcloudPluginVersion.FormattedVersion())
 	// set default max retry count
 	cfg.MaxRetries = 3
 
diff --git a/builder/ucloud/common/image_config.go b/builder/ucloud/common/image_config.go
index 2f327b484..cf312000c 100644
--- a/builder/ucloud/common/image_config.go
+++ b/builder/ucloud/common/image_config.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type ImageDestination struct {
diff --git a/builder/ucloud/common/run_config.go b/builder/ucloud/common/run_config.go
index 84539ba58..a4d4be9c4 100644
--- a/builder/ucloud/common/run_config.go
+++ b/builder/ucloud/common/run_config.go
@@ -6,9 +6,9 @@ import (
 	"os"
 	"regexp"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type RunConfig struct {
diff --git a/builder/ucloud/common/utils.go b/builder/ucloud/common/utils.go
index b922608d1..71d2bb04b 100644
--- a/builder/ucloud/common/utils.go
+++ b/builder/ucloud/common/utils.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 )
 
diff --git a/examples/ucloud/basic.json b/builder/ucloud/examples/basic.json
similarity index 100%
rename from examples/ucloud/basic.json
rename to builder/ucloud/examples/basic.json
diff --git a/examples/ucloud/local/http/centos-6.10/ks.cfg b/builder/ucloud/examples/local/http/centos-6.10/ks.cfg
similarity index 100%
rename from examples/ucloud/local/http/centos-6.10/ks.cfg
rename to builder/ucloud/examples/local/http/centos-6.10/ks.cfg
diff --git a/examples/ucloud/local/local.json b/builder/ucloud/examples/local/local.json
similarity index 100%
rename from examples/ucloud/local/local.json
rename to builder/ucloud/examples/local/local.json
diff --git a/examples/ucloud/ubuntu.json b/builder/ucloud/examples/ubuntu.json
similarity index 100%
rename from examples/ucloud/ubuntu.json
rename to builder/ucloud/examples/ubuntu.json
diff --git a/builder/ucloud/uhost/builder.go b/builder/ucloud/uhost/builder.go
index ecabecb48..c2cd520f1 100644
--- a/builder/ucloud/uhost/builder.go
+++ b/builder/ucloud/uhost/builder.go
@@ -9,12 +9,13 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The unique ID for this builder
@@ -125,7 +126,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				b.config.UseSSHPrivateIp),
 			SSHConfig: b.config.RunConfig.Comm.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
+		&commonsteps.StepProvision{},
 		&stepStopInstance{},
 		&stepCreateImage{},
 		&stepCopyUCloudImage{
@@ -137,7 +138,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/ucloud/uhost/builder.hcl2spec.go b/builder/ucloud/uhost/builder.hcl2spec.go
index 499b9ff51..025ce96e6 100644
--- a/builder/ucloud/uhost/builder.hcl2spec.go
+++ b/builder/ucloud/uhost/builder.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string                       `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string                       `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string                       `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool                         `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool                         `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string                       `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -107,6 +108,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/ucloud/uhost/step_check_source_image.go b/builder/ucloud/uhost/step_check_source_image.go
index d1feae7b6..afeec3978 100644
--- a/builder/ucloud/uhost/step_check_source_image.go
+++ b/builder/ucloud/uhost/step_check_source_image.go
@@ -3,9 +3,10 @@ package uhost
 import (
 	"context"
 	"fmt"
+
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepCheckSourceImageId struct {
diff --git a/builder/ucloud/uhost/step_config_security_group.go b/builder/ucloud/uhost/step_config_security_group.go
index f561bd003..297f7d002 100644
--- a/builder/ucloud/uhost/step_config_security_group.go
+++ b/builder/ucloud/uhost/step_config_security_group.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
 )
 
diff --git a/builder/ucloud/uhost/step_config_subnet.go b/builder/ucloud/uhost/step_config_subnet.go
index affb43ccd..6170b3f95 100644
--- a/builder/ucloud/uhost/step_config_subnet.go
+++ b/builder/ucloud/uhost/step_config_subnet.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepConfigSubnet struct {
diff --git a/builder/ucloud/uhost/step_config_vpc.go b/builder/ucloud/uhost/step_config_vpc.go
index b6792318c..dc54ddcf7 100644
--- a/builder/ucloud/uhost/step_config_vpc.go
+++ b/builder/ucloud/uhost/step_config_vpc.go
@@ -6,8 +6,8 @@ import (
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepConfigVPC struct {
diff --git a/builder/ucloud/uhost/step_copy_image.go b/builder/ucloud/uhost/step_copy_image.go
index 67bb141bb..4f8eec37e 100644
--- a/builder/ucloud/uhost/step_copy_image.go
+++ b/builder/ucloud/uhost/step_copy_image.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
 )
 
diff --git a/builder/ucloud/uhost/step_create_image.go b/builder/ucloud/uhost/step_create_image.go
index e0004a1ce..58e5da238 100644
--- a/builder/ucloud/uhost/step_create_image.go
+++ b/builder/ucloud/uhost/step_create_image.go
@@ -6,10 +6,10 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
 )
diff --git a/builder/ucloud/uhost/step_create_instance.go b/builder/ucloud/uhost/step_create_instance.go
index 45ececb22..03d863a40 100644
--- a/builder/ucloud/uhost/step_create_instance.go
+++ b/builder/ucloud/uhost/step_create_instance.go
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
 )
diff --git a/builder/ucloud/uhost/step_pre_validate.go b/builder/ucloud/uhost/step_pre_validate.go
index becb80b29..41b50e9a6 100644
--- a/builder/ucloud/uhost/step_pre_validate.go
+++ b/builder/ucloud/uhost/step_pre_validate.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepPreValidate struct {
diff --git a/builder/ucloud/uhost/step_stop_instance.go b/builder/ucloud/uhost/step_stop_instance.go
index 7266d851c..214d5e312 100644
--- a/builder/ucloud/uhost/step_stop_instance.go
+++ b/builder/ucloud/uhost/step_stop_instance.go
@@ -6,10 +6,10 @@ import (
 	"time"
 
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
 )
diff --git a/builder/ucloud/version/version.go b/builder/ucloud/version/version.go
new file mode 100644
index 000000000..279a8646e
--- /dev/null
+++ b/builder/ucloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var UcloudPluginVersion *version.PluginVersion
+
+func init() {
+	UcloudPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/vagrant/builder.go b/builder/vagrant/builder.go
index f1bbefc99..3dc56f179 100644
--- a/builder/vagrant/builder.go
+++ b/builder/vagrant/builder.go
@@ -14,13 +14,14 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
@@ -31,11 +32,11 @@ type Builder struct {
 }
 
 type Config struct {
-	common.PackerConfig    `mapstructure:",squash"`
-	common.HTTPConfig      `mapstructure:",squash"`
-	common.ISOConfig       `mapstructure:",squash"`
-	common.FloppyConfig    `mapstructure:",squash"`
-	bootcommand.BootConfig `mapstructure:",squash"`
+	common.PackerConfig      `mapstructure:",squash"`
+	commonsteps.HTTPConfig   `mapstructure:",squash"`
+	commonsteps.ISOConfig    `mapstructure:",squash"`
+	commonsteps.FloppyConfig `mapstructure:",squash"`
+	bootcommand.BootConfig   `mapstructure:",squash"`
 
 	Comm communicator.Config `mapstructure:",squash"`
 	// The directory to create that will contain your output box. We always
@@ -90,9 +91,6 @@ type Config struct {
 	// This parameter is required when source_path have more than one provider,
 	// or when using vagrant-cloud post-processor. Defaults to unset.
 	Provider string `mapstructure:"provider" required:"false"`
-
-	Communicator string `mapstructure:"communicator"`
-
 	// Options for the "vagrant init" command
 
 	// What vagrantfile to use
@@ -298,7 +296,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	steps := []multistep.Step{}
 	// Download if source box isn't from vagrant cloud.
 	if strings.HasSuffix(b.config.SourceBox, ".box") {
-		steps = append(steps, &common.StepDownload{
+		steps = append(steps, &commonsteps.StepDownload{
 			Checksum:    b.config.Checksum,
 			Description: "Box",
 			Extension:   "box",
@@ -307,7 +305,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		})
 	}
 	steps = append(steps,
-		&common.StepOutputDir{
+		&commonsteps.StepOutputDir{
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
@@ -347,7 +345,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      CommHost(),
 			SSHConfig: b.config.Comm.SSHConfigFunc(),
 		},
-		new(common.StepProvision),
+		new(commonsteps.StepProvision),
 		&StepPackage{
 			SkipPackage: b.config.SkipPackage,
 			Include:     b.config.PackageInclude,
@@ -356,7 +354,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		})
 
 	// Run the steps.
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/vagrant/builder.hcl2spec.go b/builder/vagrant/builder.hcl2spec.go
index 4ba3ea3a2..90efb5b7e 100644
--- a/builder/vagrant/builder.hcl2spec.go
+++ b/builder/vagrant/builder.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -119,6 +120,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/vagrant/driver_2_2.go b/builder/vagrant/driver_2_2.go
index c1df9ea98..cb2243ad5 100644
--- a/builder/vagrant/driver_2_2.go
+++ b/builder/vagrant/driver_2_2.go
@@ -154,8 +154,10 @@ func (d *Vagrant_2_2_Driver) SSHConfig(id string) (*VagrantSSHConfig, error) {
 	sshConf := &VagrantSSHConfig{}
 
 	stdout, stderr, err := d.vagrantCmd(args...)
-	if stderr != "" {
-		err := fmt.Errorf("ssh-config command returned error: %s", stderr)
+	if err != nil {
+		if stderr != "" {
+			err = fmt.Errorf("ssh-config command returned errors: %s", stderr)
+		}
 		return sshConf, err
 	}
 	lines := strings.Split(stdout, "\n")
diff --git a/builder/vagrant/ssh.go b/builder/vagrant/ssh.go
index d4a56cb17..4d15819cb 100644
--- a/builder/vagrant/ssh.go
+++ b/builder/vagrant/ssh.go
@@ -1,7 +1,7 @@
 package vagrant
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CommHost() func(multistep.StateBag) (string, error) {
diff --git a/builder/vagrant/step_add_box.go b/builder/vagrant/step_add_box.go
index 00b8af9b9..43693d184 100644
--- a/builder/vagrant/step_add_box.go
+++ b/builder/vagrant/step_add_box.go
@@ -5,8 +5,8 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepAddBox struct {
diff --git a/builder/vagrant/step_add_box_test.go b/builder/vagrant/step_add_box_test.go
index 29feca5d1..475bcf501 100644
--- a/builder/vagrant/step_add_box_test.go
+++ b/builder/vagrant/step_add_box_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepAdd_Impl(t *testing.T) {
diff --git a/builder/vagrant/step_create_vagrantfile.go b/builder/vagrant/step_create_vagrantfile.go
index ec6262dcc..b6ec461af 100644
--- a/builder/vagrant/step_create_vagrantfile.go
+++ b/builder/vagrant/step_create_vagrantfile.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"text/template"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateVagrantfile struct {
diff --git a/builder/vagrant/step_create_vagrantfile_test.go b/builder/vagrant/step_create_vagrantfile_test.go
index 58df30284..2d8ff805c 100644
--- a/builder/vagrant/step_create_vagrantfile_test.go
+++ b/builder/vagrant/step_create_vagrantfile_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateVagrantfile_Impl(t *testing.T) {
diff --git a/builder/vagrant/step_package.go b/builder/vagrant/step_package.go
index 4cb9e2c18..8b2bd023f 100644
--- a/builder/vagrant/step_package.go
+++ b/builder/vagrant/step_package.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPackage struct {
diff --git a/builder/vagrant/step_ssh_config.go b/builder/vagrant/step_ssh_config.go
index cdeab0361..e5a6c96d2 100644
--- a/builder/vagrant/step_ssh_config.go
+++ b/builder/vagrant/step_ssh_config.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"strconv"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Vagrant already sets up ssh on the guests; our job is to find out what
diff --git a/builder/vagrant/step_ssh_config_test.go b/builder/vagrant/step_ssh_config_test.go
index d781ef338..cf7f42a56 100644
--- a/builder/vagrant/step_ssh_config_test.go
+++ b/builder/vagrant/step_ssh_config_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepSSHConfig_Impl(t *testing.T) {
diff --git a/builder/vagrant/step_up.go b/builder/vagrant/step_up.go
index e78834f36..d427de57a 100644
--- a/builder/vagrant/step_up.go
+++ b/builder/vagrant/step_up.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepUp struct {
diff --git a/builder/vagrant/version/version.go b/builder/vagrant/version/version.go
new file mode 100644
index 000000000..3a7ae432c
--- /dev/null
+++ b/builder/vagrant/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VagrantPluginVersion *version.PluginVersion
+
+func init() {
+	VagrantPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/virtualbox/common/comm.go b/builder/virtualbox/common/comm.go
index cd43522db..a8811ae8d 100644
--- a/builder/virtualbox/common/comm.go
+++ b/builder/virtualbox/common/comm.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CommHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/virtualbox/common/comm_config.go b/builder/virtualbox/common/comm_config.go
index 03256814a..8fa25b0d3 100644
--- a/builder/virtualbox/common/comm_config.go
+++ b/builder/virtualbox/common/comm_config.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type CommConfig struct {
diff --git a/builder/virtualbox/common/comm_config_test.go b/builder/virtualbox/common/comm_config_test.go
index 777dca492..eb0bc4060 100644
--- a/builder/virtualbox/common/comm_config_test.go
+++ b/builder/virtualbox/common/comm_config_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testCommConfig() *CommConfig {
diff --git a/builder/virtualbox/common/driver_4_2.go b/builder/virtualbox/common/driver_4_2.go
index b710720dc..465506ace 100644
--- a/builder/virtualbox/common/driver_4_2.go
+++ b/builder/virtualbox/common/driver_4_2.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	versionUtil "github.com/hashicorp/go-version"
-	"github.com/hashicorp/packer/common/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type VBox42Driver struct {
diff --git a/builder/virtualbox/common/export_config.go b/builder/virtualbox/common/export_config.go
index f8a468265..113d6cb64 100644
--- a/builder/virtualbox/common/export_config.go
+++ b/builder/virtualbox/common/export_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"errors"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type ExportConfig struct {
diff --git a/builder/virtualbox/common/export_config_test.go b/builder/virtualbox/common/export_config_test.go
index fdf6ccc6d..a08a047c0 100644
--- a/builder/virtualbox/common/export_config_test.go
+++ b/builder/virtualbox/common/export_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestExportConfigPrepare_BootWait(t *testing.T) {
diff --git a/builder/virtualbox/common/guest_additions_config.go b/builder/virtualbox/common/guest_additions_config.go
index 5b57c154c..673f4a3d1 100644
--- a/builder/virtualbox/common/guest_additions_config.go
+++ b/builder/virtualbox/common/guest_additions_config.go
@@ -5,8 +5,6 @@ package common
 import (
 	"fmt"
 	"strings"
-
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 // These are the different valid mode values for "guest_additions_mode" which
@@ -18,7 +16,6 @@ const (
 )
 
 type GuestAdditionsConfig struct {
-	Communicator string `mapstructure:"communicator"`
 	// The method by which guest additions are
 	// made available to the guest for installation. Valid options are `upload`,
 	// `attach`, or `disable`. If the mode is `attach` the guest additions ISO will
@@ -52,14 +49,9 @@ type GuestAdditionsConfig struct {
 	GuestAdditionsURL string `mapstructure:"guest_additions_url" required:"false"`
 }
 
-func (c *GuestAdditionsConfig) Prepare(ctx *interpolate.Context) []error {
+func (c *GuestAdditionsConfig) Prepare(communicatorType string) []error {
 	var errs []error
 
-	if c.Communicator == "none" && c.GuestAdditionsMode != "disable" {
-		errs = append(errs, fmt.Errorf("guest_additions_mode has to be "+
-			"'disable' when communicator = 'none'."))
-	}
-
 	if c.GuestAdditionsMode == "" {
 		c.GuestAdditionsMode = "upload"
 	}
@@ -91,5 +83,10 @@ func (c *GuestAdditionsConfig) Prepare(ctx *interpolate.Context) []error {
 			fmt.Errorf("guest_additions_mode is invalid. Must be one of: %v", validModes))
 	}
 
+	if communicatorType == "none" && c.GuestAdditionsMode != "disable" {
+		errs = append(errs, fmt.Errorf("guest_additions_mode has to be "+
+			"'disable' when communicator = 'none'."))
+	}
+
 	return errs
 }
diff --git a/builder/virtualbox/common/guest_additions_config_test.go b/builder/virtualbox/common/guest_additions_config_test.go
index 210dd2d81..900b4e83e 100644
--- a/builder/virtualbox/common/guest_additions_config_test.go
+++ b/builder/virtualbox/common/guest_additions_config_test.go
@@ -2,8 +2,6 @@ package common
 
 import (
 	"testing"
-
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func TestGuestAdditionsConfigPrepare(t *testing.T) {
@@ -11,8 +9,7 @@ func TestGuestAdditionsConfigPrepare(t *testing.T) {
 	var errs []error
 
 	c.GuestAdditionsMode = "disable"
-	c.Communicator = "none"
-	errs = c.Prepare(interpolate.NewContext())
+	errs = c.Prepare("none")
 	if len(errs) > 0 {
 		t.Fatalf("should not have error: %s", errs)
 	}
diff --git a/builder/virtualbox/common/hw_config.go b/builder/virtualbox/common/hw_config.go
index 739bc1850..2b86383e4 100644
--- a/builder/virtualbox/common/hw_config.go
+++ b/builder/virtualbox/common/hw_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type HWConfig struct {
diff --git a/builder/virtualbox/common/hw_config_test.go b/builder/virtualbox/common/hw_config_test.go
index 9576eecc7..d6b40ea13 100644
--- a/builder/virtualbox/common/hw_config_test.go
+++ b/builder/virtualbox/common/hw_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestHWConfigPrepare(t *testing.T) {
diff --git a/builder/virtualbox/common/output_config.go b/builder/virtualbox/common/output_config.go
index aedfa5cf7..a7a1e2588 100644
--- a/builder/virtualbox/common/output_config.go
+++ b/builder/virtualbox/common/output_config.go
@@ -5,8 +5,8 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type OutputConfig struct {
diff --git a/builder/virtualbox/common/output_config_test.go b/builder/virtualbox/common/output_config_test.go
index a5aa0b8fe..278969a42 100644
--- a/builder/virtualbox/common/output_config_test.go
+++ b/builder/virtualbox/common/output_config_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/builder/virtualbox/common/run_config.go b/builder/virtualbox/common/run_config.go
index 14c2bf923..a2f8a7ff8 100644
--- a/builder/virtualbox/common/run_config.go
+++ b/builder/virtualbox/common/run_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type RunConfig struct {
diff --git a/builder/virtualbox/common/run_config_test.go b/builder/virtualbox/common/run_config_test.go
index b29fb5ee8..e96d50c6a 100644
--- a/builder/virtualbox/common/run_config_test.go
+++ b/builder/virtualbox/common/run_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestRunConfigPrepare_VRDPBindAddress(t *testing.T) {
diff --git a/builder/virtualbox/common/shutdown_config.go b/builder/virtualbox/common/shutdown_config.go
index 29f0b0b72..963f32d91 100644
--- a/builder/virtualbox/common/shutdown_config.go
+++ b/builder/virtualbox/common/shutdown_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type ShutdownConfig struct {
diff --git a/builder/virtualbox/common/shutdown_config_test.go b/builder/virtualbox/common/shutdown_config_test.go
index 3e177fd5f..4d68d6e1c 100644
--- a/builder/virtualbox/common/shutdown_config_test.go
+++ b/builder/virtualbox/common/shutdown_config_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testShutdownConfig() *ShutdownConfig {
diff --git a/builder/virtualbox/common/step_attach_floppy.go b/builder/virtualbox/common/step_attach_floppy.go
index 2003d4301..c607fbe32 100644
--- a/builder/virtualbox/common/step_attach_floppy.go
+++ b/builder/virtualbox/common/step_attach_floppy.go
@@ -8,9 +8,9 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // This step attaches the ISO to the virtual machine.
diff --git a/builder/virtualbox/common/step_attach_floppy_test.go b/builder/virtualbox/common/step_attach_floppy_test.go
index 75d51c333..e34308799 100644
--- a/builder/virtualbox/common/step_attach_floppy_test.go
+++ b/builder/virtualbox/common/step_attach_floppy_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepAttachFloppy_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/step_attach_isos.go b/builder/virtualbox/common/step_attach_isos.go
index efbe26254..b72d9eccf 100644
--- a/builder/virtualbox/common/step_attach_isos.go
+++ b/builder/virtualbox/common/step_attach_isos.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step attaches the boot ISO, cd_files iso, and guest additions to the
diff --git a/builder/virtualbox/common/step_configure_vrdp.go b/builder/virtualbox/common/step_configure_vrdp.go
index 731238b3c..77a6a7aca 100644
--- a/builder/virtualbox/common/step_configure_vrdp.go
+++ b/builder/virtualbox/common/step_configure_vrdp.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step configures the VM to enable the VRDP server
diff --git a/builder/virtualbox/common/step_download_guest_additions.go b/builder/virtualbox/common/step_download_guest_additions.go
index ba111fea2..e812ab436 100644
--- a/builder/virtualbox/common/step_download_guest_additions.go
+++ b/builder/virtualbox/common/step_download_guest_additions.go
@@ -9,11 +9,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 var additionsVersionMap = map[string]string{
@@ -121,7 +121,7 @@ func (s *StepDownloadGuestAdditions) Run(ctx context.Context, state multistep.St
 	log.Printf("Guest additions URL: %s", url)
 
 	// We're good, so let's go ahead and download this thing..
-	downStep := &common.StepDownload{
+	downStep := &commonsteps.StepDownload{
 		Checksum:    checksum,
 		Description: "Guest additions",
 		ResultKey:   "guest_additions_path",
@@ -151,7 +151,7 @@ func (s *StepDownloadGuestAdditions) downloadAdditionsSHA256(ctx context.Context
 	defer os.Remove(checksumsFile.Name())
 	checksumsFile.Close()
 
-	downStep := &common.StepDownload{
+	downStep := &commonsteps.StepDownload{
 		Description: "Guest additions checksums",
 		ResultKey:   "guest_additions_checksums_path",
 		Url:         []string{checksumsUrl},
diff --git a/builder/virtualbox/common/step_export.go b/builder/virtualbox/common/step_export.go
index 7a3dd13f4..b1c5d6987 100644
--- a/builder/virtualbox/common/step_export.go
+++ b/builder/virtualbox/common/step_export.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step cleans up forwarded ports and exports the VM to an OVF.
diff --git a/builder/virtualbox/common/step_export_test.go b/builder/virtualbox/common/step_export_test.go
index c5adc0a45..71fabf56b 100644
--- a/builder/virtualbox/common/step_export_test.go
+++ b/builder/virtualbox/common/step_export_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepExport_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/step_http_ip_discover.go b/builder/virtualbox/common/step_http_ip_discover.go
index ce4c2d7f5..17bbe42b9 100644
--- a/builder/virtualbox/common/step_http_ip_discover.go
+++ b/builder/virtualbox/common/step_http_ip_discover.go
@@ -2,7 +2,8 @@ package common
 
 import (
 	"context"
-	"github.com/hashicorp/packer/helper/multistep"
+
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Step to discover the http ip
diff --git a/builder/virtualbox/common/step_http_ip_discover_test.go b/builder/virtualbox/common/step_http_ip_discover_test.go
index dbdccdb96..0a5bc8d47 100644
--- a/builder/virtualbox/common/step_http_ip_discover_test.go
+++ b/builder/virtualbox/common/step_http_ip_discover_test.go
@@ -2,8 +2,9 @@ package common
 
 import (
 	"context"
-	"github.com/hashicorp/packer/helper/multistep"
 	"testing"
+
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepHTTPIPDiscover_Run(t *testing.T) {
diff --git a/builder/virtualbox/common/step_port_forwarding.go b/builder/virtualbox/common/step_port_forwarding.go
index 5a0657414..19b3a6689 100644
--- a/builder/virtualbox/common/step_port_forwarding.go
+++ b/builder/virtualbox/common/step_port_forwarding.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/common/net"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step adds a NAT port forwarding definition so that SSH or WinRM is available
diff --git a/builder/virtualbox/common/step_remove_devices.go b/builder/virtualbox/common/step_remove_devices.go
index 53bc97cca..fbbce66da 100644
--- a/builder/virtualbox/common/step_remove_devices.go
+++ b/builder/virtualbox/common/step_remove_devices.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 // This step removes any devices (floppy disks, ISOs, etc.) from the
diff --git a/builder/virtualbox/common/step_remove_devices_test.go b/builder/virtualbox/common/step_remove_devices_test.go
index d28de98c4..95174bec5 100644
--- a/builder/virtualbox/common/step_remove_devices_test.go
+++ b/builder/virtualbox/common/step_remove_devices_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRemoveDevices_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/step_run.go b/builder/virtualbox/common/step_run.go
index 8144087b2..ca148a876 100644
--- a/builder/virtualbox/common/step_run.go
+++ b/builder/virtualbox/common/step_run.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step starts the virtual machine.
diff --git a/builder/virtualbox/common/step_shutdown.go b/builder/virtualbox/common/step_shutdown.go
index 75d570977..acc3c3513 100644
--- a/builder/virtualbox/common/step_shutdown.go
+++ b/builder/virtualbox/common/step_shutdown.go
@@ -7,8 +7,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff --git a/builder/virtualbox/common/step_shutdown_test.go b/builder/virtualbox/common/step_shutdown_test.go
index c0cec95ed..001195bbb 100644
--- a/builder/virtualbox/common/step_shutdown_test.go
+++ b/builder/virtualbox/common/step_shutdown_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepShutdown_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/step_ssh_key_pair.go b/builder/virtualbox/common/step_ssh_key_pair.go
index 282461f27..7383ed93c 100644
--- a/builder/virtualbox/common/step_ssh_key_pair.go
+++ b/builder/virtualbox/common/step_ssh_key_pair.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/helper/ssh"
+	"github.com/hashicorp/packer/helper/communicator/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // StepSshKeyPair executes the business logic for setting the SSH key pair in
diff --git a/builder/virtualbox/common/step_suppress_messages.go b/builder/virtualbox/common/step_suppress_messages.go
index 0a9def96c..52d69d5f9 100644
--- a/builder/virtualbox/common/step_suppress_messages.go
+++ b/builder/virtualbox/common/step_suppress_messages.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step sets some variables in VirtualBox so that annoying
diff --git a/builder/virtualbox/common/step_suppress_messages_test.go b/builder/virtualbox/common/step_suppress_messages_test.go
index c37af7826..e93ca958b 100644
--- a/builder/virtualbox/common/step_suppress_messages_test.go
+++ b/builder/virtualbox/common/step_suppress_messages_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepSuppressMessages_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/step_test.go b/builder/virtualbox/common/step_test.go
index c8a12abb6..7cb9dd45e 100644
--- a/builder/virtualbox/common/step_test.go
+++ b/builder/virtualbox/common/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/virtualbox/common/step_type_boot_command.go b/builder/virtualbox/common/step_type_boot_command.go
index 404a02a32..4e7587eae 100644
--- a/builder/virtualbox/common/step_type_boot_command.go
+++ b/builder/virtualbox/common/step_type_boot_command.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const KeyLeftShift uint32 = 0xFFE1
diff --git a/builder/virtualbox/common/step_upload_guest_additions.go b/builder/virtualbox/common/step_upload_guest_additions.go
index 98f46a982..272ac5f1f 100644
--- a/builder/virtualbox/common/step_upload_guest_additions.go
+++ b/builder/virtualbox/common/step_upload_guest_additions.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type guestAdditionsPathTemplate struct {
diff --git a/builder/virtualbox/common/step_upload_version.go b/builder/virtualbox/common/step_upload_version.go
index 3d84e00ba..638aa1dac 100644
--- a/builder/virtualbox/common/step_upload_version.go
+++ b/builder/virtualbox/common/step_upload_version.go
@@ -6,8 +6,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step uploads a file containing the VirtualBox version, which
diff --git a/builder/virtualbox/common/step_upload_version_test.go b/builder/virtualbox/common/step_upload_version_test.go
index 998d35f0e..ddce60e3c 100644
--- a/builder/virtualbox/common/step_upload_version_test.go
+++ b/builder/virtualbox/common/step_upload_version_test.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepUploadVersion_impl(t *testing.T) {
diff --git a/builder/virtualbox/common/step_vboxmanage.go b/builder/virtualbox/common/step_vboxmanage.go
index 12fe42671..6950fcb4f 100644
--- a/builder/virtualbox/common/step_vboxmanage.go
+++ b/builder/virtualbox/common/step_vboxmanage.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type commandTemplate struct {
diff --git a/builder/virtualbox/common/vbox_version_config.go b/builder/virtualbox/common/vbox_version_config.go
index 4e81f4fa0..568765e8f 100644
--- a/builder/virtualbox/common/vbox_version_config.go
+++ b/builder/virtualbox/common/vbox_version_config.go
@@ -4,12 +4,9 @@ package common
 
 import (
 	"fmt"
-
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type VBoxVersionConfig struct {
-	Communicator string `mapstructure:"communicator"`
 	// The path within the virtual machine to
 	// upload a file that contains the VirtualBox version that was used to create
 	// the machine. This information can be useful for provisioning. By default
@@ -19,7 +16,7 @@ type VBoxVersionConfig struct {
 	VBoxVersionFile *string `mapstructure:"virtualbox_version_file" required:"false"`
 }
 
-func (c *VBoxVersionConfig) Prepare(ctx *interpolate.Context) []error {
+func (c *VBoxVersionConfig) Prepare(communicatorType string) []error {
 	var errs []error
 
 	if c.VBoxVersionFile == nil {
@@ -27,7 +24,7 @@ func (c *VBoxVersionConfig) Prepare(ctx *interpolate.Context) []error {
 		c.VBoxVersionFile = &default_file
 	}
 
-	if c.Communicator == "none" && *c.VBoxVersionFile != "" {
+	if communicatorType == "none" && *c.VBoxVersionFile != "" {
 		errs = append(errs, fmt.Errorf("virtualbox_version_file has to be an "+
 			"empty string when communicator = 'none'."))
 	}
diff --git a/builder/virtualbox/common/vbox_version_config_test.go b/builder/virtualbox/common/vbox_version_config_test.go
index 398a0aa11..3f2e8fefb 100644
--- a/builder/virtualbox/common/vbox_version_config_test.go
+++ b/builder/virtualbox/common/vbox_version_config_test.go
@@ -2,8 +2,6 @@ package common
 
 import (
 	"testing"
-
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 func TestVBoxVersionConfigPrepare_BootWait(t *testing.T) {
@@ -12,7 +10,7 @@ func TestVBoxVersionConfigPrepare_BootWait(t *testing.T) {
 
 	// Test empty
 	c = new(VBoxVersionConfig)
-	errs = c.Prepare(interpolate.NewContext())
+	errs = c.Prepare("ssh")
 	if len(errs) > 0 {
 		t.Fatalf("should not have error: %s", errs)
 	}
@@ -25,7 +23,7 @@ func TestVBoxVersionConfigPrepare_BootWait(t *testing.T) {
 	c = new(VBoxVersionConfig)
 	filename := "foo"
 	c.VBoxVersionFile = &filename
-	errs = c.Prepare(interpolate.NewContext())
+	errs = c.Prepare("ssh")
 	if len(errs) > 0 {
 		t.Fatalf("should not have error: %s", errs)
 	}
@@ -42,7 +40,7 @@ func TestVBoxVersionConfigPrepare_empty(t *testing.T) {
 	// Test with nil value
 	c = new(VBoxVersionConfig)
 	c.VBoxVersionFile = nil
-	errs = c.Prepare(interpolate.NewContext())
+	errs = c.Prepare("ssh")
 	if len(errs) > 0 {
 		t.Fatalf("should not have error: %s", errs)
 	}
@@ -55,7 +53,7 @@ func TestVBoxVersionConfigPrepare_empty(t *testing.T) {
 	c = new(VBoxVersionConfig)
 	filename := ""
 	c.VBoxVersionFile = &filename
-	errs = c.Prepare(interpolate.NewContext())
+	errs = c.Prepare("ssh")
 	if len(errs) > 0 {
 		t.Fatalf("should not have error: %s", errs)
 	}
@@ -73,8 +71,7 @@ func TestVBoxVersionConfigPrepare_communicator(t *testing.T) {
 	c = new(VBoxVersionConfig)
 	filename := "test"
 	c.VBoxVersionFile = &filename
-	c.Communicator = "none"
-	errs = c.Prepare(interpolate.NewContext())
+	errs = c.Prepare("none")
 	if len(errs) == 0 {
 		t.Fatalf("should have an error")
 	}
diff --git a/builder/virtualbox/common/vboxbundle_config.go b/builder/virtualbox/common/vboxbundle_config.go
index 8936eacf2..8386a7f63 100644
--- a/builder/virtualbox/common/vboxbundle_config.go
+++ b/builder/virtualbox/common/vboxbundle_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type VBoxBundleConfig struct {
diff --git a/builder/virtualbox/common/vboxbundle_config_test.go b/builder/virtualbox/common/vboxbundle_config_test.go
index 53ccca8b6..2509a2f34 100644
--- a/builder/virtualbox/common/vboxbundle_config_test.go
+++ b/builder/virtualbox/common/vboxbundle_config_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestVBoxBundleConfigPrepare_VBoxBundle(t *testing.T) {
diff --git a/builder/virtualbox/common/vboxmanage_config.go b/builder/virtualbox/common/vboxmanage_config.go
index c73010c2a..3664d3098 100644
--- a/builder/virtualbox/common/vboxmanage_config.go
+++ b/builder/virtualbox/common/vboxmanage_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 //In order to perform extra customization of the virtual machine, a template can
diff --git a/builder/virtualbox/common/vboxmanage_config_test.go b/builder/virtualbox/common/vboxmanage_config_test.go
index a35fe2cae..1b7f0c671 100644
--- a/builder/virtualbox/common/vboxmanage_config_test.go
+++ b/builder/virtualbox/common/vboxmanage_config_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestVBoxManageConfigPrepare_VBoxManage(t *testing.T) {
diff --git a/builder/virtualbox/iso/builder.go b/builder/virtualbox/iso/builder.go
index 207473f7a..810451f95 100644
--- a/builder/virtualbox/iso/builder.go
+++ b/builder/virtualbox/iso/builder.go
@@ -10,13 +10,14 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "mitchellh.virtualbox"
@@ -28,10 +29,10 @@ type Builder struct {
 
 type Config struct {
 	common.PackerConfig             `mapstructure:",squash"`
-	common.HTTPConfig               `mapstructure:",squash"`
-	common.ISOConfig                `mapstructure:",squash"`
-	common.FloppyConfig             `mapstructure:",squash"`
-	common.CDConfig                 `mapstructure:",squash"`
+	commonsteps.HTTPConfig          `mapstructure:",squash"`
+	commonsteps.ISOConfig           `mapstructure:",squash"`
+	commonsteps.FloppyConfig        `mapstructure:",squash"`
+	commonsteps.CDConfig            `mapstructure:",squash"`
 	bootcommand.BootConfig          `mapstructure:",squash"`
 	vboxcommon.ExportConfig         `mapstructure:",squash"`
 	vboxcommon.OutputConfig         `mapstructure:",squash"`
@@ -155,9 +156,9 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) {
 	errs = packer.MultiErrorAppend(errs, b.config.HWConfig.Prepare(&b.config.ctx)...)
 	errs = packer.MultiErrorAppend(errs, b.config.VBoxBundleConfig.Prepare(&b.config.ctx)...)
 	errs = packer.MultiErrorAppend(errs, b.config.VBoxManageConfig.Prepare(&b.config.ctx)...)
-	errs = packer.MultiErrorAppend(errs, b.config.VBoxVersionConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs, b.config.VBoxVersionConfig.Prepare(b.config.CommConfig.Comm.Type)...)
 	errs = packer.MultiErrorAppend(errs, b.config.BootConfig.Prepare(&b.config.ctx)...)
-	errs = packer.MultiErrorAppend(errs, b.config.GuestAdditionsConfig.Prepare(&b.config.ctx)...)
+	errs = packer.MultiErrorAppend(errs, b.config.GuestAdditionsConfig.Prepare(b.config.CommConfig.Comm.Type)...)
 
 	if b.config.DiskSize == 0 {
 		b.config.DiskSize = 40000
@@ -243,7 +244,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsSHA256: b.config.GuestAdditionsSHA256,
 			Ctx:                  b.config.ctx,
 		},
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			Extension:   b.config.TargetExtension,
@@ -251,21 +252,21 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			TargetPath:  b.config.TargetPath,
 			Url:         b.config.ISOUrls,
 		},
-		&common.StepOutputDir{
+		&commonsteps.StepOutputDir{
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
 		new(vboxcommon.StepHTTPIPDiscover),
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -327,8 +328,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsPath: b.config.GuestAdditionsPath,
 			Ctx:                b.config.ctx,
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.CommConfig.Comm,
 		},
 		&vboxcommon.StepShutdown{
@@ -365,7 +366,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("ui", ui)
 
 	// Run
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/virtualbox/iso/builder.hcl2spec.go b/builder/virtualbox/iso/builder.hcl2spec.go
index 220babd6a..1c67d106a 100644
--- a/builder/virtualbox/iso/builder.hcl2spec.go
+++ b/builder/virtualbox/iso/builder.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -142,6 +143,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/virtualbox/iso/builder_test.go b/builder/virtualbox/iso/builder_test.go
index d78556445..194b6f782 100644
--- a/builder/virtualbox/iso/builder_test.go
+++ b/builder/virtualbox/iso/builder_test.go
@@ -105,7 +105,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/virtualbox/iso/step_create_disk.go b/builder/virtualbox/iso/step_create_disk.go
index 1a8a80ad6..14869ce71 100644
--- a/builder/virtualbox/iso/step_create_disk.go
+++ b/builder/virtualbox/iso/step_create_disk.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"path/filepath"
 	"strconv"
diff --git a/builder/virtualbox/iso/step_create_vm.go b/builder/virtualbox/iso/step_create_vm.go
index 604ce8fea..2a6597b18 100644
--- a/builder/virtualbox/iso/step_create_vm.go
+++ b/builder/virtualbox/iso/step_create_vm.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step creates the actual virtual machine.
diff --git a/builder/virtualbox/ovf/builder.go b/builder/virtualbox/ovf/builder.go
index 14949c1fc..e15dd870b 100644
--- a/builder/virtualbox/ovf/builder.go
+++ b/builder/virtualbox/ovf/builder.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
@@ -50,22 +50,22 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	// Build the steps.
 	steps := []multistep.Step{
-		&common.StepOutputDir{
+		&commonsteps.StepOutputDir{
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		},
 		new(vboxcommon.StepSuppressMessages),
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
 		new(vboxcommon.StepHTTPIPDiscover),
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -82,7 +82,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsSHA256: b.config.GuestAdditionsSHA256,
 			Ctx:                  b.config.ctx,
 		},
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.Checksum,
 			Description: "OVF/OVA",
 			Extension:   "ova",
@@ -143,8 +143,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsPath: b.config.GuestAdditionsPath,
 			Ctx:                b.config.ctx,
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.CommConfig.Comm,
 		},
 		&vboxcommon.StepShutdown{
@@ -170,7 +170,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps.
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/virtualbox/ovf/config.go b/builder/virtualbox/ovf/config.go
index ac8be5e7b..8b57166ff 100644
--- a/builder/virtualbox/ovf/config.go
+++ b/builder/virtualbox/ovf/config.go
@@ -7,19 +7,20 @@ import (
 	"fmt"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
 type Config struct {
 	common.PackerConfig             `mapstructure:",squash"`
-	common.HTTPConfig               `mapstructure:",squash"`
-	common.FloppyConfig             `mapstructure:",squash"`
-	common.CDConfig                 `mapstructure:",squash"`
+	commonsteps.HTTPConfig          `mapstructure:",squash"`
+	commonsteps.FloppyConfig        `mapstructure:",squash"`
+	commonsteps.CDConfig            `mapstructure:",squash"`
 	bootcommand.BootConfig          `mapstructure:",squash"`
 	vboxcommon.ExportConfig         `mapstructure:",squash"`
 	vboxcommon.OutputConfig         `mapstructure:",squash"`
@@ -117,9 +118,9 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	errs = packer.MultiErrorAppend(errs, c.ShutdownConfig.Prepare(&c.ctx)...)
 	errs = packer.MultiErrorAppend(errs, c.CommConfig.Prepare(&c.ctx)...)
 	errs = packer.MultiErrorAppend(errs, c.VBoxManageConfig.Prepare(&c.ctx)...)
-	errs = packer.MultiErrorAppend(errs, c.VBoxVersionConfig.Prepare(&c.ctx)...)
+	errs = packer.MultiErrorAppend(errs, c.VBoxVersionConfig.Prepare(c.CommConfig.Comm.Type)...)
 	errs = packer.MultiErrorAppend(errs, c.BootConfig.Prepare(&c.ctx)...)
-	errs = packer.MultiErrorAppend(errs, c.GuestAdditionsConfig.Prepare(&c.ctx)...)
+	errs = packer.MultiErrorAppend(errs, c.GuestAdditionsConfig.Prepare(c.CommConfig.Comm.Type)...)
 
 	if c.SourcePath == "" {
 		errs = packer.MultiErrorAppend(errs, fmt.Errorf("source_path is required"))
diff --git a/builder/virtualbox/ovf/config.hcl2spec.go b/builder/virtualbox/ovf/config.hcl2spec.go
index c34436fdc..e6e3a5a41 100644
--- a/builder/virtualbox/ovf/config.hcl2spec.go
+++ b/builder/virtualbox/ovf/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -129,6 +130,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/virtualbox/ovf/config_test.go b/builder/virtualbox/ovf/config_test.go
index 240d3c0e4..707b2419e 100644
--- a/builder/virtualbox/ovf/config_test.go
+++ b/builder/virtualbox/ovf/config_test.go
@@ -32,7 +32,7 @@ func getTempFile(t *testing.T) *os.File {
 
 func TestNewConfig_FloppyFiles(t *testing.T) {
 	cfg := testConfig(t)
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	cfg["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	var c Config
 	_, err := c.Prepare(cfg)
diff --git a/builder/virtualbox/ovf/step_import.go b/builder/virtualbox/ovf/step_import.go
index b3dd53a19..fcb081a9c 100644
--- a/builder/virtualbox/ovf/step_import.go
+++ b/builder/virtualbox/ovf/step_import.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step imports an OVF VM into VirtualBox.
diff --git a/builder/virtualbox/ovf/step_import_test.go b/builder/virtualbox/ovf/step_import_test.go
index ae7425a22..69c2d5462 100644
--- a/builder/virtualbox/ovf/step_import_test.go
+++ b/builder/virtualbox/ovf/step_import_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepImport_impl(t *testing.T) {
diff --git a/builder/virtualbox/ovf/step_test.go b/builder/virtualbox/ovf/step_test.go
index 4f9a0f9d8..59b251a99 100644
--- a/builder/virtualbox/ovf/step_test.go
+++ b/builder/virtualbox/ovf/step_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/virtualbox/version/version.go b/builder/virtualbox/version/version.go
new file mode 100644
index 000000000..7d745a93b
--- /dev/null
+++ b/builder/virtualbox/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VirtualboxPluginVersion *version.PluginVersion
+
+func init() {
+	VirtualboxPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/virtualbox/vm/builder.go b/builder/virtualbox/vm/builder.go
index 1e7e5f083..4118d8827 100644
--- a/builder/virtualbox/vm/builder.go
+++ b/builder/virtualbox/vm/builder.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual VirtualBox
@@ -50,11 +50,11 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	// Build the steps.
 	steps := []multistep.Step{
 		new(vboxcommon.StepSuppressMessages),
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -64,7 +64,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			KeepRegistered: b.config.KeepRegistered,
 		},
 		new(vboxcommon.StepHTTPIPDiscover),
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -127,8 +127,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			GuestAdditionsPath: b.config.GuestAdditionsPath,
 			Ctx:                b.config.ctx,
 		},
-		new(common.StepProvision),
-		&common.StepCleanupTempKeys{
+		new(commonsteps.StepProvision),
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.CommConfig.Comm,
 		},
 		&vboxcommon.StepShutdown{
@@ -160,13 +160,13 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	if !b.config.SkipExport {
 		steps = append(steps, nil)
 		copy(steps[1:], steps)
-		steps[0] = &common.StepOutputDir{
+		steps[0] = &commonsteps.StepOutputDir{
 			Force: b.config.PackerForce,
 			Path:  b.config.OutputDir,
 		}
 	}
 	// Run the steps.
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/virtualbox/vm/config.go b/builder/virtualbox/vm/config.go
index 6f4b6b823..b4940b97a 100644
--- a/builder/virtualbox/vm/config.go
+++ b/builder/virtualbox/vm/config.go
@@ -9,19 +9,20 @@ import (
 	"time"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
 type Config struct {
 	common.PackerConfig             `mapstructure:",squash"`
-	common.HTTPConfig               `mapstructure:",squash"`
-	common.FloppyConfig             `mapstructure:",squash"`
-	common.CDConfig                 `mapstructure:",squash"`
+	commonsteps.HTTPConfig          `mapstructure:",squash"`
+	commonsteps.FloppyConfig        `mapstructure:",squash"`
+	commonsteps.CDConfig            `mapstructure:",squash"`
 	bootcommand.BootConfig          `mapstructure:",squash"`
 	vboxcommon.ExportConfig         `mapstructure:",squash"`
 	vboxcommon.OutputConfig         `mapstructure:",squash"`
@@ -99,9 +100,9 @@ func (c *Config) Prepare(raws ...interface{}) ([]string, error) {
 	errs = packer.MultiErrorAppend(errs, c.ShutdownConfig.Prepare(&c.ctx)...)
 	errs = packer.MultiErrorAppend(errs, c.CommConfig.Prepare(&c.ctx)...)
 	errs = packer.MultiErrorAppend(errs, c.VBoxManageConfig.Prepare(&c.ctx)...)
-	errs = packer.MultiErrorAppend(errs, c.VBoxVersionConfig.Prepare(&c.ctx)...)
+	errs = packer.MultiErrorAppend(errs, c.VBoxVersionConfig.Prepare(c.CommConfig.Comm.Type)...)
 	errs = packer.MultiErrorAppend(errs, c.BootConfig.Prepare(&c.ctx)...)
-	errs = packer.MultiErrorAppend(errs, c.GuestAdditionsConfig.Prepare(&c.ctx)...)
+	errs = packer.MultiErrorAppend(errs, c.GuestAdditionsConfig.Prepare(c.CommConfig.Comm.Type)...)
 
 	if c.GuestAdditionsInterface == "" {
 		c.GuestAdditionsInterface = "ide"
diff --git a/builder/virtualbox/vm/config.hcl2spec.go b/builder/virtualbox/vm/config.hcl2spec.go
index 6f9be05b5..abfd53e78 100644
--- a/builder/virtualbox/vm/config.hcl2spec.go
+++ b/builder/virtualbox/vm/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -127,6 +128,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/virtualbox/vm/step_create_snapshot.go b/builder/virtualbox/vm/step_create_snapshot.go
index 8252c6f82..05a10177a 100644
--- a/builder/virtualbox/vm/step_create_snapshot.go
+++ b/builder/virtualbox/vm/step_create_snapshot.go
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateSnapshot struct {
diff --git a/builder/virtualbox/vm/step_import.go b/builder/virtualbox/vm/step_import.go
index 3e0a11fe4..6efdbe115 100644
--- a/builder/virtualbox/vm/step_import.go
+++ b/builder/virtualbox/vm/step_import.go
@@ -3,7 +3,7 @@ package vm
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step imports an OVF VM into VirtualBox.
diff --git a/builder/virtualbox/vm/step_set_snapshot.go b/builder/virtualbox/vm/step_set_snapshot.go
index 401bacf15..2158a5187 100644
--- a/builder/virtualbox/vm/step_set_snapshot.go
+++ b/builder/virtualbox/vm/step_set_snapshot.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	vboxcommon "github.com/hashicorp/packer/builder/virtualbox/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepSetSnapshot struct {
diff --git a/builder/vmware/common/artifact.go b/builder/vmware/common/artifact.go
index fedb70a84..39949716b 100644
--- a/builder/vmware/common/artifact.go
+++ b/builder/vmware/common/artifact.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const (
diff --git a/builder/vmware/common/disk_config.go b/builder/vmware/common/disk_config.go
index a6e844db7..96fc8fe09 100644
--- a/builder/vmware/common/disk_config.go
+++ b/builder/vmware/common/disk_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type DiskConfig struct {
diff --git a/builder/vmware/common/driver.go b/builder/vmware/common/driver.go
index 9ff431320..6f3a40393 100644
--- a/builder/vmware/common/driver.go
+++ b/builder/vmware/common/driver.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // A driver is able to talk to VMware, control virtual machines, etc.
diff --git a/builder/vmware/common/driver_config.go b/builder/vmware/common/driver_config.go
index 8e45ff293..82fc0a23d 100644
--- a/builder/vmware/common/driver_config.go
+++ b/builder/vmware/common/driver_config.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type DriverConfig struct {
diff --git a/builder/vmware/common/driver_config_test.go b/builder/vmware/common/driver_config_test.go
index ccb7d545e..6bba215a9 100644
--- a/builder/vmware/common/driver_config_test.go
+++ b/builder/vmware/common/driver_config_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestDriverConfigPrepare(t *testing.T) {
diff --git a/builder/vmware/common/driver_esx5.go b/builder/vmware/common/driver_esx5.go
index bdfa86e70..73ca6b7e3 100644
--- a/builder/vmware/common/driver_esx5.go
+++ b/builder/vmware/common/driver_esx5.go
@@ -28,11 +28,11 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 
 	"github.com/hashicorp/go-getter/v2"
-	"github.com/hashicorp/packer/communicator/ssh"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
-	helperssh "github.com/hashicorp/packer/helper/ssh"
+	helperssh "github.com/hashicorp/packer/helper/communicator/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/vmware/common/driver_esx5_test.go b/builder/vmware/common/driver_esx5_test.go
index ebe8a0f71..84dd2b745 100644
--- a/builder/vmware/common/driver_esx5_test.go
+++ b/builder/vmware/common/driver_esx5_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 func TestESX5Driver_implDriver(t *testing.T) {
diff --git a/builder/vmware/common/driver_fusion5.go b/builder/vmware/common/driver_fusion5.go
index 02fdf8cf9..57f2bbda5 100644
--- a/builder/vmware/common/driver_fusion5.go
+++ b/builder/vmware/common/driver_fusion5.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Fusion5Driver is a driver that can run VMware Fusion 5.
diff --git a/builder/vmware/common/driver_mock.go b/builder/vmware/common/driver_mock.go
index 9ece83841..66bac08af 100644
--- a/builder/vmware/common/driver_mock.go
+++ b/builder/vmware/common/driver_mock.go
@@ -4,7 +4,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type DriverMock struct {
diff --git a/builder/vmware/common/driver_player5.go b/builder/vmware/common/driver_player5.go
index a8616c089..4ce3b5c7a 100644
--- a/builder/vmware/common/driver_player5.go
+++ b/builder/vmware/common/driver_player5.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Player5Driver is a driver that can run VMware Player 5 on Linux.
diff --git a/builder/vmware/common/driver_workstation9.go b/builder/vmware/common/driver_workstation9.go
index c11733460..a64543b2e 100644
--- a/builder/vmware/common/driver_workstation9.go
+++ b/builder/vmware/common/driver_workstation9.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Workstation9Driver is a driver that can run VMware Workstation 9
diff --git a/builder/vmware/common/export_config.go b/builder/vmware/common/export_config.go
index 0d38e6176..505795041 100644
--- a/builder/vmware/common/export_config.go
+++ b/builder/vmware/common/export_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type ExportConfig struct {
diff --git a/builder/vmware/common/hw_config.go b/builder/vmware/common/hw_config.go
index 4a432d92e..ecc764921 100644
--- a/builder/vmware/common/hw_config.go
+++ b/builder/vmware/common/hw_config.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type HWConfig struct {
diff --git a/builder/vmware/common/hw_config_test.go b/builder/vmware/common/hw_config_test.go
index d523aecb3..46d1d6ff1 100644
--- a/builder/vmware/common/hw_config_test.go
+++ b/builder/vmware/common/hw_config_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestHWConfigPrepare(t *testing.T) {
diff --git a/builder/vmware/common/output_config.go b/builder/vmware/common/output_config.go
index 5cc859a64..e315b6012 100644
--- a/builder/vmware/common/output_config.go
+++ b/builder/vmware/common/output_config.go
@@ -5,8 +5,8 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type OutputConfig struct {
diff --git a/builder/vmware/common/output_config_test.go b/builder/vmware/common/output_config_test.go
index 6dd522d98..e2a95fd6c 100644
--- a/builder/vmware/common/output_config_test.go
+++ b/builder/vmware/common/output_config_test.go
@@ -3,8 +3,8 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestOutputConfigPrepare(t *testing.T) {
diff --git a/builder/vmware/common/run_config.go b/builder/vmware/common/run_config.go
index 06af92bca..67d2da30d 100644
--- a/builder/vmware/common/run_config.go
+++ b/builder/vmware/common/run_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // ~> **Note:** If [vnc_over_websocket](#vnc_over_websocket) is set to true, any other VNC configuration will be ignored.
diff --git a/builder/vmware/common/run_config_test.go b/builder/vmware/common/run_config_test.go
index 6b2cea1cc..62ec61610 100644
--- a/builder/vmware/common/run_config_test.go
+++ b/builder/vmware/common/run_config_test.go
@@ -7,8 +7,8 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestRunConfig_Prepare(t *testing.T) {
diff --git a/builder/vmware/common/ssh.go b/builder/vmware/common/ssh.go
index 31e1a7eab..5f093605f 100644
--- a/builder/vmware/common/ssh.go
+++ b/builder/vmware/common/ssh.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"net"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CommHost(config *SSHConfig) func(multistep.StateBag) (string, error) {
diff --git a/builder/vmware/common/ssh_config.go b/builder/vmware/common/ssh_config.go
index aa83c3692..b386c629b 100644
--- a/builder/vmware/common/ssh_config.go
+++ b/builder/vmware/common/ssh_config.go
@@ -4,7 +4,7 @@ package common
 
 import (
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type SSHConfig struct {
diff --git a/builder/vmware/common/ssh_config_test.go b/builder/vmware/common/ssh_config_test.go
index 5b190ba6d..e9b42c69a 100644
--- a/builder/vmware/common/ssh_config_test.go
+++ b/builder/vmware/common/ssh_config_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testSSHConfig() *SSHConfig {
diff --git a/builder/vmware/common/step_clean_files.go b/builder/vmware/common/step_clean_files.go
index a9644d225..93072441f 100644
--- a/builder/vmware/common/step_clean_files.go
+++ b/builder/vmware/common/step_clean_files.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // These are the extensions of files that are important for the function
diff --git a/builder/vmware/common/step_clean_vmx.go b/builder/vmware/common/step_clean_vmx.go
index e913fa165..f89865a06 100644
--- a/builder/vmware/common/step_clean_vmx.go
+++ b/builder/vmware/common/step_clean_vmx.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step cleans up the VMX by removing or changing this prior to
diff --git a/builder/vmware/common/step_clean_vmx_test.go b/builder/vmware/common/step_clean_vmx_test.go
index 3987fb2c4..3ef263729 100644
--- a/builder/vmware/common/step_clean_vmx_test.go
+++ b/builder/vmware/common/step_clean_vmx_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCleanVMX_impl(t *testing.T) {
diff --git a/builder/vmware/common/step_compact_disk.go b/builder/vmware/common/step_compact_disk.go
index 957f4a254..7605af6ca 100644
--- a/builder/vmware/common/step_compact_disk.go
+++ b/builder/vmware/common/step_compact_disk.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step compacts the virtual disk for the VM unless the "skip_compaction"
diff --git a/builder/vmware/common/step_compact_disk_test.go b/builder/vmware/common/step_compact_disk_test.go
index df0fc5fca..575cd869d 100644
--- a/builder/vmware/common/step_compact_disk_test.go
+++ b/builder/vmware/common/step_compact_disk_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCompactDisk_impl(t *testing.T) {
diff --git a/builder/vmware/common/step_configure_vmx.go b/builder/vmware/common/step_configure_vmx.go
index 833008291..68dc5709b 100644
--- a/builder/vmware/common/step_configure_vmx.go
+++ b/builder/vmware/common/step_configure_vmx.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step configures a VMX by setting some default settings as well
diff --git a/builder/vmware/common/step_configure_vmx_test.go b/builder/vmware/common/step_configure_vmx_test.go
index 09926acd7..136931161 100644
--- a/builder/vmware/common/step_configure_vmx_test.go
+++ b/builder/vmware/common/step_configure_vmx_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/vmware/common/step_configure_vnc.go b/builder/vmware/common/step_configure_vnc.go
index 72e5b56d6..4b8823f4f 100644
--- a/builder/vmware/common/step_configure_vnc.go
+++ b/builder/vmware/common/step_configure_vnc.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"math/rand"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step configures the VM to enable the VNC server.
diff --git a/builder/vmware/common/step_create_disks.go b/builder/vmware/common/step_create_disks.go
index 4bca0f453..6038f1234 100644
--- a/builder/vmware/common/step_create_disks.go
+++ b/builder/vmware/common/step_create_disks.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step creates the virtual disks for the VM.
diff --git a/builder/vmware/common/step_create_disks_test.go b/builder/vmware/common/step_create_disks_test.go
index 9fd0ad14d..9791fc026 100644
--- a/builder/vmware/common/step_create_disks_test.go
+++ b/builder/vmware/common/step_create_disks_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/vmware/common/step_export.go b/builder/vmware/common/step_export.go
index 52ff1a210..4ab7b4431 100644
--- a/builder/vmware/common/step_export.go
+++ b/builder/vmware/common/step_export.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step exports a VM built on ESXi using ovftool
diff --git a/builder/vmware/common/step_export_test.go b/builder/vmware/common/step_export_test.go
index 9c8b3f740..93c3fc276 100644
--- a/builder/vmware/common/step_export_test.go
+++ b/builder/vmware/common/step_export_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/vmware/common/step_http_ip_discover.go b/builder/vmware/common/step_http_ip_discover.go
index 38928fb36..8d80ebe24 100644
--- a/builder/vmware/common/step_http_ip_discover.go
+++ b/builder/vmware/common/step_http_ip_discover.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Step to discover the http ip
diff --git a/builder/vmware/common/step_http_ip_discover_test.go b/builder/vmware/common/step_http_ip_discover_test.go
index 5678bdd20..009f61972 100644
--- a/builder/vmware/common/step_http_ip_discover_test.go
+++ b/builder/vmware/common/step_http_ip_discover_test.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepHTTPIPDiscover_Run(t *testing.T) {
diff --git a/builder/vmware/common/step_output_dir.go b/builder/vmware/common/step_output_dir.go
index f063e1f08..5123754d5 100644
--- a/builder/vmware/common/step_output_dir.go
+++ b/builder/vmware/common/step_output_dir.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/builder/vmware/common/step_output_dir_test.go b/builder/vmware/common/step_output_dir_test.go
index 51a5d9348..79610b7f7 100644
--- a/builder/vmware/common/step_output_dir_test.go
+++ b/builder/vmware/common/step_output_dir_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testOutputDir(t *testing.T) string {
diff --git a/builder/vmware/common/step_prepare_tools.go b/builder/vmware/common/step_prepare_tools.go
index bd64f8885..3a1070070 100644
--- a/builder/vmware/common/step_prepare_tools.go
+++ b/builder/vmware/common/step_prepare_tools.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepPrepareTools struct {
diff --git a/builder/vmware/common/step_prepare_tools_test.go b/builder/vmware/common/step_prepare_tools_test.go
index e70f7d43b..0e4db027b 100644
--- a/builder/vmware/common/step_prepare_tools_test.go
+++ b/builder/vmware/common/step_prepare_tools_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepPrepareTools_impl(t *testing.T) {
diff --git a/builder/vmware/common/step_register.go b/builder/vmware/common/step_register.go
index 76de180f4..baf33268d 100644
--- a/builder/vmware/common/step_register.go
+++ b/builder/vmware/common/step_register.go
@@ -6,8 +6,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRegister struct {
diff --git a/builder/vmware/common/step_register_test.go b/builder/vmware/common/step_register_test.go
index a9bcc7b61..1d48f3486 100644
--- a/builder/vmware/common/step_register_test.go
+++ b/builder/vmware/common/step_register_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRegister_impl(t *testing.T) {
diff --git a/builder/vmware/common/step_remote_upload.go b/builder/vmware/common/step_remote_upload.go
index 8790c2659..c54ed9072 100644
--- a/builder/vmware/common/step_remote_upload.go
+++ b/builder/vmware/common/step_remote_upload.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // stepRemoteUpload uploads some thing from the state bag to a remote driver
diff --git a/builder/vmware/common/step_remote_upload_test.go b/builder/vmware/common/step_remote_upload_test.go
index aab618f57..518f4dd7e 100644
--- a/builder/vmware/common/step_remote_upload_test.go
+++ b/builder/vmware/common/step_remote_upload_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRemoteUpload_Cleanup(t *testing.T) {
diff --git a/builder/vmware/common/step_run.go b/builder/vmware/common/step_run.go
index e9ac27331..090a36262 100644
--- a/builder/vmware/common/step_run.go
+++ b/builder/vmware/common/step_run.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step runs the created virtual machine.
diff --git a/builder/vmware/common/step_run_test.go b/builder/vmware/common/step_run_test.go
index e89dcb1cf..176bdc8c5 100644
--- a/builder/vmware/common/step_run_test.go
+++ b/builder/vmware/common/step_run_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRun_impl(t *testing.T) {
diff --git a/builder/vmware/common/step_shutdown.go b/builder/vmware/common/step_shutdown.go
index 3c3855ab3..a75514a29 100644
--- a/builder/vmware/common/step_shutdown.go
+++ b/builder/vmware/common/step_shutdown.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,
diff --git a/builder/vmware/common/step_shutdown_test.go b/builder/vmware/common/step_shutdown_test.go
index 952a0914e..707de7012 100644
--- a/builder/vmware/common/step_shutdown_test.go
+++ b/builder/vmware/common/step_shutdown_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testLocalOutputDir(t *testing.T) *LocalOutputDir {
diff --git a/builder/vmware/common/step_suppress_messages.go b/builder/vmware/common/step_suppress_messages.go
index 30e49fe8a..0ab45c27c 100644
--- a/builder/vmware/common/step_suppress_messages.go
+++ b/builder/vmware/common/step_suppress_messages.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step suppresses any messages that VMware product might show.
diff --git a/builder/vmware/common/step_suppress_messages_test.go b/builder/vmware/common/step_suppress_messages_test.go
index 24044d470..ff5d1d767 100644
--- a/builder/vmware/common/step_suppress_messages_test.go
+++ b/builder/vmware/common/step_suppress_messages_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepSuppressMessages_impl(t *testing.T) {
diff --git a/builder/vmware/common/step_test.go b/builder/vmware/common/step_test.go
index d1daffab5..56ba540c3 100644
--- a/builder/vmware/common/step_test.go
+++ b/builder/vmware/common/step_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/vmware/common/step_upload_tools.go b/builder/vmware/common/step_upload_tools.go
index d76836b10..5282a7191 100644
--- a/builder/vmware/common/step_upload_tools.go
+++ b/builder/vmware/common/step_upload_tools.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type toolsUploadPathTemplate struct {
diff --git a/builder/vmware/common/step_upload_vmx.go b/builder/vmware/common/step_upload_vmx.go
index 861ab900e..764c3c439 100644
--- a/builder/vmware/common/step_upload_vmx.go
+++ b/builder/vmware/common/step_upload_vmx.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // This step upload the VMX to the remote host
diff --git a/builder/vmware/common/step_vnc_boot_command.go b/builder/vmware/common/step_vnc_boot_command.go
index 0471fbc07..5841ba4c2 100644
--- a/builder/vmware/common/step_vnc_boot_command.go
+++ b/builder/vmware/common/step_vnc_boot_command.go
@@ -6,10 +6,10 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/go-vnc"
 )
 
diff --git a/builder/vmware/common/step_vnc_connect.go b/builder/vmware/common/step_vnc_connect.go
index 7499c8279..85c3ab365 100644
--- a/builder/vmware/common/step_vnc_connect.go
+++ b/builder/vmware/common/step_vnc_connect.go
@@ -8,8 +8,8 @@ import (
 	"net"
 	"net/url"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/mitchellh/go-vnc"
 	"golang.org/x/net/websocket"
 )
diff --git a/builder/vmware/common/tools_config.go b/builder/vmware/common/tools_config.go
index dd37831bf..53cad2e00 100644
--- a/builder/vmware/common/tools_config.go
+++ b/builder/vmware/common/tools_config.go
@@ -5,7 +5,7 @@ package common
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type ToolsConfig struct {
diff --git a/builder/vmware/common/tools_config_test.go b/builder/vmware/common/tools_config_test.go
index 8294661ca..272671c14 100644
--- a/builder/vmware/common/tools_config_test.go
+++ b/builder/vmware/common/tools_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestToolsConfigPrepare_Empty(t *testing.T) {
diff --git a/builder/vmware/common/vmx_config.go b/builder/vmware/common/vmx_config.go
index b7ee6a0e7..6c5b330d0 100644
--- a/builder/vmware/common/vmx_config.go
+++ b/builder/vmware/common/vmx_config.go
@@ -3,7 +3,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type VMXConfig struct {
diff --git a/builder/vmware/common/vmx_config_test.go b/builder/vmware/common/vmx_config_test.go
index cf6bdc6fd..a192d6d6a 100644
--- a/builder/vmware/common/vmx_config_test.go
+++ b/builder/vmware/common/vmx_config_test.go
@@ -3,7 +3,7 @@ package common
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestVMXConfigPrepare(t *testing.T) {
diff --git a/builder/vmware/iso/builder.go b/builder/vmware/iso/builder.go
index db4afcd6b..e12edd4ee 100644
--- a/builder/vmware/iso/builder.go
+++ b/builder/vmware/iso/builder.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type Builder struct {
@@ -57,7 +57,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			RemoteType:        b.config.RemoteType,
 			ToolsUploadFlavor: b.config.ToolsUploadFlavor,
 		},
-		&common.StepDownload{
+		&commonsteps.StepDownload{
 			Checksum:    b.config.ISOChecksum,
 			Description: "ISO",
 			Extension:   b.config.TargetExtension,
@@ -71,12 +71,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			RemoteType:   b.config.RemoteType,
 			VMName:       b.config.VMName,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -117,7 +117,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 		&vmwcommon.StepSuppressMessages{},
 		&vmwcommon.StepHTTPIPDiscover{},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -161,8 +161,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ToolsUploadPath:   b.config.ToolsUploadPath,
 			Ctx:               b.config.ctx,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.SSHConfig.Comm,
 		},
 		&vmwcommon.StepShutdown{
@@ -196,7 +196,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run!
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/builder/vmware/iso/builder_test.go b/builder/vmware/iso/builder_test.go
index 868eb601a..57cc59ec2 100644
--- a/builder/vmware/iso/builder_test.go
+++ b/builder/vmware/iso/builder_test.go
@@ -106,7 +106,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/vmware/iso/config.go b/builder/vmware/iso/config.go
index becb555c3..fc6903576 100644
--- a/builder/vmware/iso/config.go
+++ b/builder/vmware/iso/config.go
@@ -10,20 +10,21 @@ import (
 	"strings"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
 	common.PackerConfig            `mapstructure:",squash"`
-	common.HTTPConfig              `mapstructure:",squash"`
-	common.ISOConfig               `mapstructure:",squash"`
-	common.FloppyConfig            `mapstructure:",squash"`
-	common.CDConfig                `mapstructure:",squash"`
+	commonsteps.HTTPConfig         `mapstructure:",squash"`
+	commonsteps.ISOConfig          `mapstructure:",squash"`
+	commonsteps.FloppyConfig       `mapstructure:",squash"`
+	commonsteps.CDConfig           `mapstructure:",squash"`
 	bootcommand.VNCConfig          `mapstructure:",squash"`
 	vmwcommon.DriverConfig         `mapstructure:",squash"`
 	vmwcommon.HWConfig             `mapstructure:",squash"`
diff --git a/builder/vmware/iso/config.hcl2spec.go b/builder/vmware/iso/config.hcl2spec.go
index 76f05a1ec..78ff3681e 100644
--- a/builder/vmware/iso/config.hcl2spec.go
+++ b/builder/vmware/iso/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -158,6 +159,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/vmware/iso/step_create_vmx.go b/builder/vmware/iso/step_create_vmx.go
index d764d5aeb..e2dd96af9 100644
--- a/builder/vmware/iso/step_create_vmx.go
+++ b/builder/vmware/iso/step_create_vmx.go
@@ -10,10 +10,10 @@ import (
 	"strings"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 type vmxTemplateData struct {
diff --git a/builder/vmware/iso/step_create_vmx_test.go b/builder/vmware/iso/step_create_vmx_test.go
index 480afccc3..9982998f8 100644
--- a/builder/vmware/iso/step_create_vmx_test.go
+++ b/builder/vmware/iso/step_create_vmx_test.go
@@ -16,8 +16,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 	"github.com/hashicorp/packer/provisioner/shell"
-	"github.com/hashicorp/packer/template"
 )
 
 var vmxTestBuilderConfig = map[string]string{
diff --git a/builder/vmware/version/version.go b/builder/vmware/version/version.go
new file mode 100644
index 000000000..f4307b0c5
--- /dev/null
+++ b/builder/vmware/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VMwarePluginVersion *version.PluginVersion
+
+func init() {
+	VMwarePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/vmware/vmx/builder.go b/builder/vmware/vmx/builder.go
index 9b283b9d0..fe6594e86 100644
--- a/builder/vmware/vmx/builder.go
+++ b/builder/vmware/vmx/builder.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // Builder implements packer.Builder and builds the actual VMware
@@ -68,12 +68,12 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			RemoteType:   b.config.RemoteType,
 			VMName:       b.config.VMName,
 		},
-		&common.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyConfig.FloppyFiles,
 			Directories: b.config.FloppyConfig.FloppyDirectories,
 			Label:       b.config.FloppyConfig.FloppyLabel,
 		},
-		&common.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -107,7 +107,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		},
 		&vmwcommon.StepSuppressMessages{},
 		&vmwcommon.StepHTTPIPDiscover{},
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -154,8 +154,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			ToolsUploadPath:   b.config.ToolsUploadPath,
 			Ctx:               b.config.ctx,
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.SSHConfig.Comm,
 		},
 		&vmwcommon.StepShutdown{
@@ -189,7 +189,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps.
-	b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	// Report any errors.
diff --git a/builder/vmware/vmx/builder_test.go b/builder/vmware/vmx/builder_test.go
index 66926b289..aaef376ac 100644
--- a/builder/vmware/vmx/builder_test.go
+++ b/builder/vmware/vmx/builder_test.go
@@ -36,7 +36,7 @@ func TestBuilderPrepare_FloppyFiles(t *testing.T) {
 		t.Fatalf("bad: %#v", b.config.FloppyFiles)
 	}
 
-	floppies_path := "../../../common/test-fixtures/floppies"
+	floppies_path := "../../../packer-plugin-sdk/test-fixtures/floppies"
 	config["floppy_files"] = []string{fmt.Sprintf("%s/bar.bat", floppies_path), fmt.Sprintf("%s/foo.ps1", floppies_path)}
 	b = Builder{}
 	_, warns, err = b.Prepare(config)
diff --git a/builder/vmware/vmx/config.go b/builder/vmware/vmx/config.go
index e7c34616e..0be17d7fb 100644
--- a/builder/vmware/vmx/config.go
+++ b/builder/vmware/vmx/config.go
@@ -8,21 +8,22 @@ import (
 	"os"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Config is the configuration structure for the builder.
 type Config struct {
 	common.PackerConfig            `mapstructure:",squash"`
-	common.HTTPConfig              `mapstructure:",squash"`
-	common.FloppyConfig            `mapstructure:",squash"`
+	commonsteps.HTTPConfig         `mapstructure:",squash"`
+	commonsteps.FloppyConfig       `mapstructure:",squash"`
 	bootcommand.VNCConfig          `mapstructure:",squash"`
-	common.CDConfig                `mapstructure:",squash"`
+	commonsteps.CDConfig           `mapstructure:",squash"`
 	vmwcommon.DriverConfig         `mapstructure:",squash"`
 	vmwcommon.OutputConfig         `mapstructure:",squash"`
 	vmwcommon.RunConfig            `mapstructure:",squash"`
diff --git a/builder/vmware/vmx/config.hcl2spec.go b/builder/vmware/vmx/config.hcl2spec.go
index 1bdbf4d72..72a393b2c 100644
--- a/builder/vmware/vmx/config.hcl2spec.go
+++ b/builder/vmware/vmx/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -139,6 +140,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/builder/vmware/vmx/step_clone_vmx.go b/builder/vmware/vmx/step_clone_vmx.go
index b7e65e7d5..76bcdc73c 100644
--- a/builder/vmware/vmx/step_clone_vmx.go
+++ b/builder/vmware/vmx/step_clone_vmx.go
@@ -9,9 +9,9 @@ import (
 	"regexp"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // StepCloneVMX takes a VMX file and clones the VM into the output directory.
diff --git a/builder/vmware/vmx/step_clone_vmx_test.go b/builder/vmware/vmx/step_clone_vmx_test.go
index da2828061..a3033c35b 100644
--- a/builder/vmware/vmx/step_clone_vmx_test.go
+++ b/builder/vmware/vmx/step_clone_vmx_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/builder/vmware/vmx/step_test.go b/builder/vmware/vmx/step_test.go
index 81439b3c4..a30b06418 100644
--- a/builder/vmware/vmx/step_test.go
+++ b/builder/vmware/vmx/step_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/builder/vsphere/clone/builder.go b/builder/vsphere/clone/builder.go
index 92d574187..cec0ee29d 100644
--- a/builder/vsphere/clone/builder.go
+++ b/builder/vsphere/clone/builder.go
@@ -7,10 +7,10 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type Builder struct {
@@ -41,7 +41,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&common.StepConnect{
 			Config: &b.config.ConnectConfig,
 		},
-		&packerCommon.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -74,7 +74,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 
 	if b.config.Comm.Type != "none" {
 		steps = append(steps,
-			&packerCommon.StepCreateFloppy{
+			&commonsteps.StepCreateFloppy{
 				Files:       b.config.FloppyFiles,
 				Directories: b.config.FloppyDirectories,
 				Label:       b.config.FloppyLabel,
@@ -89,7 +89,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				HTTPIP:  b.config.BootConfig.HTTPIP,
 				Network: b.config.WaitIpConfig.GetIPNet(),
 			},
-			&packerCommon.StepHTTPServer{
+			&commonsteps.StepHTTPServer{
 				HTTPDir:     b.config.HTTPDir,
 				HTTPPortMin: b.config.HTTPPortMin,
 				HTTPPortMax: b.config.HTTPPortMax,
@@ -117,7 +117,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				Host:      common.CommHost(b.config.Comm.Host()),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&packerCommon.StepProvision{},
+			&commonsteps.StepProvision{},
 			&common.StepShutdown{
 				Config: &b.config.ShutdownConfig,
 			},
@@ -157,7 +157,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		})
 	}
 
-	b.runner = packerCommon.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/vsphere/clone/config.go b/builder/vsphere/clone/config.go
index f7b2fd588..ced3d6d44 100644
--- a/builder/vsphere/clone/config.go
+++ b/builder/vsphere/clone/config.go
@@ -5,17 +5,18 @@ package clone
 
 import (
 	"github.com/hashicorp/packer/builder/vsphere/common"
-	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
 	packerCommon.PackerConfig `mapstructure:",squash"`
-	packerCommon.HTTPConfig   `mapstructure:",squash"`
-	packerCommon.CDConfig     `mapstructure:",squash"`
+	commonsteps.HTTPConfig    `mapstructure:",squash"`
+	commonsteps.CDConfig      `mapstructure:",squash"`
 
 	common.ConnectConfig      `mapstructure:",squash"`
 	CloneConfig               `mapstructure:",squash"`
diff --git a/builder/vsphere/clone/config.hcl2spec.go b/builder/vsphere/clone/config.hcl2spec.go
index 78588cd40..ca49332d2 100644
--- a/builder/vsphere/clone/config.hcl2spec.go
+++ b/builder/vsphere/clone/config.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                 *string                                     `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType               *string                                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion               *string                                     `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                     *bool                                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                     *bool                                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                   *string                                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -36,6 +37,8 @@ type FlatConfig struct {
 	MacAddress                      *string                                     `mapstructure:"mac_address" cty:"mac_address" hcl:"mac_address"`
 	Notes                           *string                                     `mapstructure:"notes" cty:"notes" hcl:"notes"`
 	VAppConfig                      *FlatvAppConfig                             `mapstructure:"vapp" cty:"vapp" hcl:"vapp"`
+	DiskControllerType              []string                                    `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"`
+	Storage                         []common.FlatDiskConfig                     `mapstructure:"storage" cty:"storage" hcl:"storage"`
 	VMName                          *string                                     `mapstructure:"vm_name" cty:"vm_name" hcl:"vm_name"`
 	Folder                          *string                                     `mapstructure:"folder" cty:"folder" hcl:"folder"`
 	Cluster                         *string                                     `mapstructure:"cluster" cty:"cluster" hcl:"cluster"`
@@ -148,6 +151,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -172,6 +176,8 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"mac_address":                    &hcldec.AttrSpec{Name: "mac_address", Type: cty.String, Required: false},
 		"notes":                          &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false},
 		"vapp":                           &hcldec.BlockSpec{TypeName: "vapp", Nested: hcldec.ObjectSpec((*FlatvAppConfig)(nil).HCL2Spec())},
+		"disk_controller_type":           &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false},
+		"storage":                        &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())},
 		"vm_name":                        &hcldec.AttrSpec{Name: "vm_name", Type: cty.String, Required: false},
 		"folder":                         &hcldec.AttrSpec{Name: "folder", Type: cty.String, Required: false},
 		"cluster":                        &hcldec.AttrSpec{Name: "cluster", Type: cty.String, Required: false},
diff --git a/builder/vsphere/clone/step_clone.go b/builder/vsphere/clone/step_clone.go
index 17da84ad1..850d2b3d5 100644
--- a/builder/vsphere/clone/step_clone.go
+++ b/builder/vsphere/clone/step_clone.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type vAppConfig struct {
@@ -44,11 +44,13 @@ type CloneConfig struct {
 	// Set the vApp Options to a virtual machine.
 	// See the [vApp Options Configuration](/docs/builders/vmware/vsphere-clone#vapp-options-configuration)
 	// to know the available options and how to use it.
-	VAppConfig vAppConfig `mapstructure:"vapp"`
+	VAppConfig    vAppConfig           `mapstructure:"vapp"`
+	StorageConfig common.StorageConfig `mapstructure:",squash"`
 }
 
 func (c *CloneConfig) Prepare() []error {
 	var errs []error
+	errs = append(errs, c.StorageConfig.Prepare()...)
 
 	if c.Template == "" {
 		errs = append(errs, fmt.Errorf("'template' is required"))
@@ -85,10 +87,20 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist
 	ui.Say("Cloning VM...")
 	template, err := d.FindVM(s.Config.Template)
 	if err != nil {
-		state.Put("error", err)
+		state.Put("error", fmt.Errorf("Error finding vm to clone: %s", err))
 		return multistep.ActionHalt
 	}
 
+	var disks []driver.Disk
+	for _, disk := range s.Config.StorageConfig.Storage {
+		disks = append(disks, driver.Disk{
+			DiskSize:            disk.DiskSize,
+			DiskEagerlyScrub:    disk.DiskEagerlyScrub,
+			DiskThinProvisioned: disk.DiskThinProvisioned,
+			ControllerIndex:     disk.DiskControllerIndex,
+		})
+	}
+
 	vm, err := template.Clone(ctx, &driver.CloneConfig{
 		Name:           s.Location.VMName,
 		Folder:         s.Location.Folder,
@@ -101,6 +113,10 @@ func (s *StepCloneVM) Run(ctx context.Context, state multistep.StateBag) multist
 		MacAddress:     s.Config.MacAddress,
 		Annotation:     s.Config.Notes,
 		VAppProperties: s.Config.VAppConfig.Properties,
+		StorageConfig: driver.StorageConfig{
+			DiskControllerType: s.Config.StorageConfig.DiskControllerType,
+			Storage:            disks,
+		},
 	})
 	if err != nil {
 		state.Put("error", err)
diff --git a/builder/vsphere/clone/step_clone.hcl2spec.go b/builder/vsphere/clone/step_clone.hcl2spec.go
index ad55ebfa8..a0422e28e 100644
--- a/builder/vsphere/clone/step_clone.hcl2spec.go
+++ b/builder/vsphere/clone/step_clone.hcl2spec.go
@@ -3,19 +3,22 @@ package clone
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatCloneConfig is an auto-generated flat version of CloneConfig.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatCloneConfig struct {
-	Template    *string         `mapstructure:"template" cty:"template" hcl:"template"`
-	DiskSize    *int64          `mapstructure:"disk_size" cty:"disk_size" hcl:"disk_size"`
-	LinkedClone *bool           `mapstructure:"linked_clone" cty:"linked_clone" hcl:"linked_clone"`
-	Network     *string         `mapstructure:"network" cty:"network" hcl:"network"`
-	MacAddress  *string         `mapstructure:"mac_address" cty:"mac_address" hcl:"mac_address"`
-	Notes       *string         `mapstructure:"notes" cty:"notes" hcl:"notes"`
-	VAppConfig  *FlatvAppConfig `mapstructure:"vapp" cty:"vapp" hcl:"vapp"`
+	Template           *string                 `mapstructure:"template" cty:"template" hcl:"template"`
+	DiskSize           *int64                  `mapstructure:"disk_size" cty:"disk_size" hcl:"disk_size"`
+	LinkedClone        *bool                   `mapstructure:"linked_clone" cty:"linked_clone" hcl:"linked_clone"`
+	Network            *string                 `mapstructure:"network" cty:"network" hcl:"network"`
+	MacAddress         *string                 `mapstructure:"mac_address" cty:"mac_address" hcl:"mac_address"`
+	Notes              *string                 `mapstructure:"notes" cty:"notes" hcl:"notes"`
+	VAppConfig         *FlatvAppConfig         `mapstructure:"vapp" cty:"vapp" hcl:"vapp"`
+	DiskControllerType []string                `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"`
+	Storage            []common.FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"`
 }
 
 // FlatMapstructure returns a new FlatCloneConfig.
@@ -30,13 +33,15 @@ func (*CloneConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.S
 // The decoded values from this spec will then be applied to a FlatCloneConfig.
 func (*FlatCloneConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"template":     &hcldec.AttrSpec{Name: "template", Type: cty.String, Required: false},
-		"disk_size":    &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false},
-		"linked_clone": &hcldec.AttrSpec{Name: "linked_clone", Type: cty.Bool, Required: false},
-		"network":      &hcldec.AttrSpec{Name: "network", Type: cty.String, Required: false},
-		"mac_address":  &hcldec.AttrSpec{Name: "mac_address", Type: cty.String, Required: false},
-		"notes":        &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false},
-		"vapp":         &hcldec.BlockSpec{TypeName: "vapp", Nested: hcldec.ObjectSpec((*FlatvAppConfig)(nil).HCL2Spec())},
+		"template":             &hcldec.AttrSpec{Name: "template", Type: cty.String, Required: false},
+		"disk_size":            &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false},
+		"linked_clone":         &hcldec.AttrSpec{Name: "linked_clone", Type: cty.Bool, Required: false},
+		"network":              &hcldec.AttrSpec{Name: "network", Type: cty.String, Required: false},
+		"mac_address":          &hcldec.AttrSpec{Name: "mac_address", Type: cty.String, Required: false},
+		"notes":                &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false},
+		"vapp":                 &hcldec.BlockSpec{TypeName: "vapp", Nested: hcldec.ObjectSpec((*FlatvAppConfig)(nil).HCL2Spec())},
+		"disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false},
+		"storage":              &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())},
 	}
 	return s
 }
diff --git a/builder/vsphere/clone/step_customize.go b/builder/vsphere/clone/step_customize.go
index 109be74ae..c5ebecf96 100644
--- a/builder/vsphere/clone/step_customize.go
+++ b/builder/vsphere/clone/step_customize.go
@@ -9,9 +9,9 @@ import (
 	"net"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/vmware/govmomi/vim25/types"
 )
 
diff --git a/builder/vsphere/common/cleanup_vm.go b/builder/vsphere/common/cleanup_vm.go
index 51c76c571..c5055c5fc 100644
--- a/builder/vsphere/common/cleanup_vm.go
+++ b/builder/vsphere/common/cleanup_vm.go
@@ -2,8 +2,8 @@ package common
 
 import (
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CleanupVM(state multistep.StateBag) {
diff --git a/builder/vsphere/common/cleanup_vm_test.go b/builder/vsphere/common/cleanup_vm_test.go
index cdec04ab9..ad6bb3b02 100644
--- a/builder/vsphere/common/cleanup_vm_test.go
+++ b/builder/vsphere/common/cleanup_vm_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func cleanupTestState(mockVM driver.VirtualMachine) multistep.StateBag {
diff --git a/builder/vsphere/common/common_test.go b/builder/vsphere/common/common_test.go
index 6242ca4b6..e96110ef7 100644
--- a/builder/vsphere/common/common_test.go
+++ b/builder/vsphere/common/common_test.go
@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func basicStateBag(errorBuffer *strings.Builder) *multistep.BasicStateBag {
diff --git a/builder/vsphere/common/config_ssh.go b/builder/vsphere/common/config_ssh.go
index d4104a4e8..db6c5ea4c 100644
--- a/builder/vsphere/common/config_ssh.go
+++ b/builder/vsphere/common/config_ssh.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func CommHost(host string) func(multistep.StateBag) (string, error) {
diff --git a/builder/vsphere/common/output_config.go b/builder/vsphere/common/output_config.go
index 8692a507a..6f605d25a 100644
--- a/builder/vsphere/common/output_config.go
+++ b/builder/vsphere/common/output_config.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type OutputConfig struct {
diff --git a/builder/vsphere/common/step_add_cdrom.go b/builder/vsphere/common/step_add_cdrom.go
index d6a6f62b8..f272736dc 100644
--- a/builder/vsphere/common/step_add_cdrom.go
+++ b/builder/vsphere/common/step_add_cdrom.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type CDRomConfig struct {
diff --git a/builder/vsphere/common/step_add_cdrom_test.go b/builder/vsphere/common/step_add_cdrom_test.go
index e1116660c..c5752fec7 100644
--- a/builder/vsphere/common/step_add_cdrom_test.go
+++ b/builder/vsphere/common/step_add_cdrom_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestCDRomConfig_Prepare(t *testing.T) {
diff --git a/builder/vsphere/common/step_add_floppy.go b/builder/vsphere/common/step_add_floppy.go
index 213f08429..c82b08850 100644
--- a/builder/vsphere/common/step_add_floppy.go
+++ b/builder/vsphere/common/step_add_floppy.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type FloppyConfig struct {
diff --git a/builder/vsphere/common/step_add_floppy_test.go b/builder/vsphere/common/step_add_floppy_test.go
index 52963526a..63f742fae 100644
--- a/builder/vsphere/common/step_add_floppy_test.go
+++ b/builder/vsphere/common/step_add_floppy_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepAddFloppy_Run(t *testing.T) {
diff --git a/builder/vsphere/common/step_boot_command.go b/builder/vsphere/common/step_boot_command.go
index 5f831f070..8d6658ad9 100644
--- a/builder/vsphere/common/step_boot_command.go
+++ b/builder/vsphere/common/step_boot_command.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"golang.org/x/mobile/event/key"
 )
 
diff --git a/builder/vsphere/common/step_config_params.go b/builder/vsphere/common/step_config_params.go
index 54e92082b..c317f25f5 100644
--- a/builder/vsphere/common/step_config_params.go
+++ b/builder/vsphere/common/step_config_params.go
@@ -10,8 +10,8 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type ConfigParamsConfig struct {
diff --git a/builder/vsphere/common/step_connect.go b/builder/vsphere/common/step_connect.go
index b651eda06..e67762976 100644
--- a/builder/vsphere/common/step_connect.go
+++ b/builder/vsphere/common/step_connect.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type ConnectConfig struct {
diff --git a/builder/vsphere/common/step_download.go b/builder/vsphere/common/step_download.go
index 25b980356..5b1adbda6 100644
--- a/builder/vsphere/common/step_download.go
+++ b/builder/vsphere/common/step_download.go
@@ -6,8 +6,8 @@ import (
 	"net/url"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Defining this interface ensures that we use the common step download, or the
diff --git a/builder/vsphere/common/step_download_test.go b/builder/vsphere/common/step_download_test.go
index 631006655..fd7a8a0ca 100644
--- a/builder/vsphere/common/step_download_test.go
+++ b/builder/vsphere/common/step_download_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 /// create mock step
diff --git a/builder/vsphere/common/step_export.go b/builder/vsphere/common/step_export.go
index a50a329b4..d3c857304 100644
--- a/builder/vsphere/common/step_export.go
+++ b/builder/vsphere/common/step_export.go
@@ -17,10 +17,10 @@ import (
 	"strings"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/pkg/errors"
 	"github.com/vmware/govmomi/nfc"
 	"github.com/vmware/govmomi/vim25/soap"
diff --git a/builder/vsphere/common/step_hardware.go b/builder/vsphere/common/step_hardware.go
index 43f0f60d3..654a4145d 100644
--- a/builder/vsphere/common/step_hardware.go
+++ b/builder/vsphere/common/step_hardware.go
@@ -8,8 +8,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type HardwareConfig struct {
diff --git a/builder/vsphere/common/step_hardware_test.go b/builder/vsphere/common/step_hardware_test.go
index 08eb22c50..e3b965bfe 100644
--- a/builder/vsphere/common/step_hardware_test.go
+++ b/builder/vsphere/common/step_hardware_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestHardwareConfig_Prepare(t *testing.T) {
diff --git a/builder/vsphere/common/step_http_ip_discover.go b/builder/vsphere/common/step_http_ip_discover.go
index 0168ddf1b..c0d6e8cd0 100644
--- a/builder/vsphere/common/step_http_ip_discover.go
+++ b/builder/vsphere/common/step_http_ip_discover.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Step to discover the http ip
diff --git a/builder/vsphere/common/step_http_ip_discover_test.go b/builder/vsphere/common/step_http_ip_discover_test.go
index a4225774f..1f03353eb 100644
--- a/builder/vsphere/common/step_http_ip_discover_test.go
+++ b/builder/vsphere/common/step_http_ip_discover_test.go
@@ -5,7 +5,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepHTTPIPDiscover_Run(t *testing.T) {
diff --git a/builder/vsphere/common/step_import_to_content_library.go b/builder/vsphere/common/step_import_to_content_library.go
index 2e5be7a39..9eacdd5ec 100644
--- a/builder/vsphere/common/step_import_to_content_library.go
+++ b/builder/vsphere/common/step_import_to_content_library.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/vmware/govmomi/vapi/vcenter"
 )
 
diff --git a/builder/vsphere/common/step_remote_upload.go b/builder/vsphere/common/step_remote_upload.go
index 413d0c051..631ab0924 100644
--- a/builder/vsphere/common/step_remote_upload.go
+++ b/builder/vsphere/common/step_remote_upload.go
@@ -7,8 +7,8 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRemoteUpload struct {
diff --git a/builder/vsphere/common/step_remote_upload_test.go b/builder/vsphere/common/step_remote_upload_test.go
index 44188dbfe..c1f5ef7c9 100644
--- a/builder/vsphere/common/step_remote_upload_test.go
+++ b/builder/vsphere/common/step_remote_upload_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRemoteUpload_Run(t *testing.T) {
diff --git a/builder/vsphere/common/step_remove_cdrom.go b/builder/vsphere/common/step_remove_cdrom.go
index 00bd6dc94..c3920ec29 100644
--- a/builder/vsphere/common/step_remove_cdrom.go
+++ b/builder/vsphere/common/step_remove_cdrom.go
@@ -7,8 +7,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type RemoveCDRomConfig struct {
diff --git a/builder/vsphere/common/step_remove_cdrom_test.go b/builder/vsphere/common/step_remove_cdrom_test.go
index 1017e48b0..2442ab796 100644
--- a/builder/vsphere/common/step_remove_cdrom_test.go
+++ b/builder/vsphere/common/step_remove_cdrom_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRemoveCDRom_Run(t *testing.T) {
diff --git a/builder/vsphere/common/step_remove_floppy.go b/builder/vsphere/common/step_remove_floppy.go
index 7141e04b9..4662c18b4 100644
--- a/builder/vsphere/common/step_remove_floppy.go
+++ b/builder/vsphere/common/step_remove_floppy.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepRemoveFloppy struct {
diff --git a/builder/vsphere/common/step_remove_floppy_test.go b/builder/vsphere/common/step_remove_floppy_test.go
index 1b76bb0fa..86a3e33b5 100644
--- a/builder/vsphere/common/step_remove_floppy_test.go
+++ b/builder/vsphere/common/step_remove_floppy_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepRemoveFloppy_Run(t *testing.T) {
diff --git a/builder/vsphere/common/step_run.go b/builder/vsphere/common/step_run.go
index 9fcdadb1e..9262cb31e 100644
--- a/builder/vsphere/common/step_run.go
+++ b/builder/vsphere/common/step_run.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type RunConfig struct {
diff --git a/builder/vsphere/common/step_shutdown.go b/builder/vsphere/common/step_shutdown.go
index 8c71cc2d3..089aba26f 100644
--- a/builder/vsphere/common/step_shutdown.go
+++ b/builder/vsphere/common/step_shutdown.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type ShutdownConfig struct {
diff --git a/builder/vsphere/common/step_snapshot.go b/builder/vsphere/common/step_snapshot.go
index 09a698698..ed595621d 100644
--- a/builder/vsphere/common/step_snapshot.go
+++ b/builder/vsphere/common/step_snapshot.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCreateSnapshot struct {
diff --git a/builder/vsphere/common/step_ssh_key_pair.go b/builder/vsphere/common/step_ssh_key_pair.go
index 4fe202893..80fecaabc 100644
--- a/builder/vsphere/common/step_ssh_key_pair.go
+++ b/builder/vsphere/common/step_ssh_key_pair.go
@@ -7,11 +7,11 @@ import (
 	"os"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/helper/ssh"
+	"github.com/hashicorp/packer/helper/communicator/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 // StepSshKeyPair executes the business logic for setting the SSH key pair in
diff --git a/builder/vsphere/common/step_template.go b/builder/vsphere/common/step_template.go
index 96dc57408..91c14ff58 100644
--- a/builder/vsphere/common/step_template.go
+++ b/builder/vsphere/common/step_template.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepConvertToTemplate struct {
diff --git a/builder/vsphere/common/step_wait_for_ip.go b/builder/vsphere/common/step_wait_for_ip.go
index d3ddb4ee8..9a37534c4 100644
--- a/builder/vsphere/common/step_wait_for_ip.go
+++ b/builder/vsphere/common/step_wait_for_ip.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type WaitIpConfig struct {
diff --git a/builder/vsphere/common/storage_config.go b/builder/vsphere/common/storage_config.go
new file mode 100644
index 000000000..6650616d5
--- /dev/null
+++ b/builder/vsphere/common/storage_config.go
@@ -0,0 +1,118 @@
+//go:generate struct-markdown
+//go:generate mapstructure-to-hcl2 -type StorageConfig,DiskConfig
+
+package common
+
+import (
+	"fmt"
+)
+
+// Defines the disk storage for a VM.
+//
+// Example that will create a 15GB and a 20GB disk on the VM. The second disk will be thin provisioned:
+//
+// In JSON:
+// ```json
+//   "storage": [
+//     {
+//       "disk_size": 15000
+//     },
+//     {
+//       "disk_size": 20000,
+//       "disk_thin_provisioned": true
+//     }
+//   ],
+// ```
+// In HCL2:
+// ```hcl
+//   storage {
+//       disk_size = 15000
+//   }
+//   storage {
+//       disk_size = 20000
+//       disk_thin_provisioned = true
+//   }
+// ```
+//
+// Example that creates 2 pvscsi controllers and adds 2 disks to each one:
+//
+// In JSON:
+// ```json
+//   "disk_controller_type": ["pvscsi", "pvscsi"],
+//   "storage": [
+//     {
+//       "disk_size": 15000,
+//       "disk_controller_index": 0
+//     },
+//     {
+//       "disk_size": 15000,
+//       "disk_controller_index": 0
+//     },
+//     {
+//       "disk_size": 15000,
+//       "disk_controller_index": 1
+//     },
+//     {
+//       "disk_size": 15000,
+//       "disk_controller_index": 1
+//     }
+//   ],
+// ```
+//
+// In HCL2:
+// ```hcl
+//   disk_controller_type = ["pvscsi", "pvscsi"]
+//   storage {
+//      disk_size = 15000,
+//      disk_controller_index = 0
+//   }
+//   storage {
+//      disk_size = 15000
+//      disk_controller_index = 0
+//   }
+//   storage {
+//      disk_size = 15000
+//      disk_controller_index = 1
+//   }
+//   storage {
+//      disk_size = 15000
+//      disk_controller_index = 1
+//   }
+// ```
+type DiskConfig struct {
+	// The size of the disk in MB.
+	DiskSize int64 `mapstructure:"disk_size" required:"true"`
+	// Enable VMDK thin provisioning for VM. Defaults to `false`.
+	DiskThinProvisioned bool `mapstructure:"disk_thin_provisioned"`
+	// Enable VMDK eager scrubbing for VM. Defaults to `false`.
+	DiskEagerlyScrub bool `mapstructure:"disk_eagerly_scrub"`
+	// The assigned disk controller. Defaults to the first one (0)
+	DiskControllerIndex int `mapstructure:"disk_controller_index"`
+}
+
+type StorageConfig struct {
+	// Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers.
+	// Defaults to `lsilogic`. See
+	// [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362)
+	// for additional details.
+	DiskControllerType []string `mapstructure:"disk_controller_type"`
+	// Configures a collection of one or more disks to be provisioned along with the VM. See the [Storage Configuration](#storage-configuration).
+	Storage []DiskConfig `mapstructure:"storage"`
+}
+
+func (c *StorageConfig) Prepare() []error {
+	var errs []error
+
+	if len(c.Storage) > 0 {
+		for i, storage := range c.Storage {
+			if storage.DiskSize == 0 {
+				errs = append(errs, fmt.Errorf("storage[%d].'disk_size' is required", i))
+			}
+			if storage.DiskControllerIndex >= len(c.DiskControllerType) {
+				errs = append(errs, fmt.Errorf("storage[%d].'disk_controller_index' references an unknown disk controller", i))
+			}
+		}
+	}
+
+	return errs
+}
diff --git a/builder/vsphere/common/storage_config.hcl2spec.go b/builder/vsphere/common/storage_config.hcl2spec.go
new file mode 100644
index 000000000..37d8722a2
--- /dev/null
+++ b/builder/vsphere/common/storage_config.hcl2spec.go
@@ -0,0 +1,61 @@
+// Code generated by "mapstructure-to-hcl2 -type StorageConfig,DiskConfig"; DO NOT EDIT.
+package common
+
+import (
+	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/zclconf/go-cty/cty"
+)
+
+// FlatDiskConfig is an auto-generated flat version of DiskConfig.
+// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
+type FlatDiskConfig struct {
+	DiskSize            *int64 `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"`
+	DiskThinProvisioned *bool  `mapstructure:"disk_thin_provisioned" cty:"disk_thin_provisioned" hcl:"disk_thin_provisioned"`
+	DiskEagerlyScrub    *bool  `mapstructure:"disk_eagerly_scrub" cty:"disk_eagerly_scrub" hcl:"disk_eagerly_scrub"`
+	DiskControllerIndex *int   `mapstructure:"disk_controller_index" cty:"disk_controller_index" hcl:"disk_controller_index"`
+}
+
+// FlatMapstructure returns a new FlatDiskConfig.
+// FlatDiskConfig is an auto-generated flat version of DiskConfig.
+// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
+func (*DiskConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
+	return new(FlatDiskConfig)
+}
+
+// HCL2Spec returns the hcl spec of a DiskConfig.
+// This spec is used by HCL to read the fields of DiskConfig.
+// The decoded values from this spec will then be applied to a FlatDiskConfig.
+func (*FlatDiskConfig) HCL2Spec() map[string]hcldec.Spec {
+	s := map[string]hcldec.Spec{
+		"disk_size":             &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false},
+		"disk_thin_provisioned": &hcldec.AttrSpec{Name: "disk_thin_provisioned", Type: cty.Bool, Required: false},
+		"disk_eagerly_scrub":    &hcldec.AttrSpec{Name: "disk_eagerly_scrub", Type: cty.Bool, Required: false},
+		"disk_controller_index": &hcldec.AttrSpec{Name: "disk_controller_index", Type: cty.Number, Required: false},
+	}
+	return s
+}
+
+// FlatStorageConfig is an auto-generated flat version of StorageConfig.
+// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
+type FlatStorageConfig struct {
+	DiskControllerType []string         `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"`
+	Storage            []FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"`
+}
+
+// FlatMapstructure returns a new FlatStorageConfig.
+// FlatStorageConfig is an auto-generated flat version of StorageConfig.
+// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
+func (*StorageConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
+	return new(FlatStorageConfig)
+}
+
+// HCL2Spec returns the hcl spec of a StorageConfig.
+// This spec is used by HCL to read the fields of StorageConfig.
+// The decoded values from this spec will then be applied to a FlatStorageConfig.
+func (*FlatStorageConfig) HCL2Spec() map[string]hcldec.Spec {
+	s := map[string]hcldec.Spec{
+		"disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false},
+		"storage":              &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*FlatDiskConfig)(nil).HCL2Spec())},
+	}
+	return s
+}
diff --git a/builder/vsphere/driver/datastore.go b/builder/vsphere/driver/datastore.go
index adc13447f..ae371b79f 100644
--- a/builder/vsphere/driver/datastore.go
+++ b/builder/vsphere/driver/datastore.go
@@ -42,12 +42,12 @@ func (d *VCenterDriver) FindDatastore(name string, host string) (Datastore, erro
 	if name == "" {
 		h, err := d.FindHost(host)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error finding host for to get datastore: %s", err)
 		}
 
 		i, err := h.Info("datastore")
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error getting datastore info from host: %s", err)
 		}
 
 		if len(i.Datastore) > 1 {
@@ -57,14 +57,14 @@ func (d *VCenterDriver) FindDatastore(name string, host string) (Datastore, erro
 		ds := d.NewDatastore(&i.Datastore[0])
 		inf, err := ds.Info("name")
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error getting datastore name: %s", err)
 		}
 		name = inf.Name
 	}
 
 	ds, err := d.finder.Datastore(d.ctx, name)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Error finding datastore with name %s: %s", name, err)
 	}
 
 	return &DatastoreDriver{
diff --git a/builder/vsphere/driver/disk.go b/builder/vsphere/driver/disk.go
new file mode 100644
index 000000000..07553e212
--- /dev/null
+++ b/builder/vsphere/driver/disk.go
@@ -0,0 +1,84 @@
+package driver
+
+import (
+	"errors"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type Disk struct {
+	DiskSize            int64
+	DiskEagerlyScrub    bool
+	DiskThinProvisioned bool
+	ControllerIndex     int
+}
+
+type StorageConfig struct {
+	DiskControllerType []string // example: "scsi", "pvscsi", "nvme", "lsilogic"
+	Storage            []Disk
+}
+
+func (c *StorageConfig) AddStorageDevices(existingDevices object.VirtualDeviceList) ([]types.BaseVirtualDeviceConfigSpec, error) {
+	newDevices := object.VirtualDeviceList{}
+
+	// Create new controller based on existing devices list and add it to the new devices list
+	// to confirm creation
+	var controllers []types.BaseVirtualController
+	for _, controllerType := range c.DiskControllerType {
+		var device types.BaseVirtualDevice
+		var err error
+		if controllerType == "nvme" {
+			device, err = existingDevices.CreateNVMEController()
+		} else {
+			device, err = existingDevices.CreateSCSIController(controllerType)
+		}
+		if err != nil {
+			return nil, err
+		}
+		existingDevices = append(existingDevices, device)
+		newDevices = append(newDevices, device)
+		controller, err := existingDevices.FindDiskController(existingDevices.Name(device))
+		if err != nil {
+			return nil, err
+		}
+		controllers = append(controllers, controller)
+	}
+
+	for _, dc := range c.Storage {
+		disk := &types.VirtualDisk{
+			VirtualDevice: types.VirtualDevice{
+				Key: existingDevices.NewKey(),
+				Backing: &types.VirtualDiskFlatVer2BackingInfo{
+					DiskMode:        string(types.VirtualDiskModePersistent),
+					ThinProvisioned: types.NewBool(dc.DiskThinProvisioned),
+					EagerlyScrub:    types.NewBool(dc.DiskEagerlyScrub),
+				},
+			},
+			CapacityInKB: dc.DiskSize * 1024,
+		}
+
+		existingDevices.AssignController(disk, controllers[dc.ControllerIndex])
+		newDevices = append(newDevices, disk)
+	}
+
+	return newDevices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
+}
+
+func findDisk(devices object.VirtualDeviceList) (*types.VirtualDisk, error) {
+	var disks []*types.VirtualDisk
+	for _, device := range devices {
+		switch d := device.(type) {
+		case *types.VirtualDisk:
+			disks = append(disks, d)
+		}
+	}
+
+	switch len(disks) {
+	case 0:
+		return nil, errors.New("VM has no disks")
+	case 1:
+		return disks[0], nil
+	}
+	return nil, errors.New("VM has multiple disks")
+}
diff --git a/builder/vsphere/driver/vm.go b/builder/vsphere/driver/vm.go
index f0bbf6f6d..acc80ec4e 100644
--- a/builder/vsphere/driver/vm.go
+++ b/builder/vsphere/driver/vm.go
@@ -79,6 +79,7 @@ type CloneConfig struct {
 	MacAddress     string
 	Annotation     string
 	VAppProperties map[string]string
+	StorageConfig  StorageConfig
 }
 
 type HardwareConfig struct {
@@ -106,8 +107,6 @@ type NIC struct {
 }
 
 type CreateConfig struct {
-	DiskControllerType []string // example: "scsi", "pvscsi", "nvme", "lsilogic"
-
 	Annotation    string
 	Name          string
 	Folder        string
@@ -119,14 +118,7 @@ type CreateConfig struct {
 	NICs          []NIC
 	USBController []string
 	Version       uint // example: 10
-	Storage       []Disk
-}
-
-type Disk struct {
-	DiskSize            int64
-	DiskEagerlyScrub    bool
-	DiskThinProvisioned bool
-	ControllerIndex     int
+	StorageConfig StorageConfig
 }
 
 func (d *VCenterDriver) NewVM(ref *types.ManagedObjectReference) VirtualMachine {
@@ -207,11 +199,12 @@ func (d *VCenterDriver) CreateVM(config *CreateConfig) (VirtualMachine, error) {
 	}
 
 	devices := object.VirtualDeviceList{}
-
-	devices, err = addDisk(d, devices, config)
+	storageConfigSpec, err := config.StorageConfig.AddStorageDevices(devices)
 	if err != nil {
 		return nil, err
 	}
+	createSpec.DeviceChange = append(createSpec.DeviceChange, storageConfigSpec...)
+
 	devices, err = addNetwork(d, devices, config)
 	if err != nil {
 		return nil, err
@@ -235,10 +228,11 @@ func (d *VCenterDriver) CreateVM(config *CreateConfig) (VirtualMachine, error) {
 		devices = append(devices, usb)
 	}
 
-	createSpec.DeviceChange, err = devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
+	devicesConfigSpec, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
 	if err != nil {
 		return nil, err
 	}
+	createSpec.DeviceChange = append(createSpec.DeviceChange, devicesConfigSpec...)
 
 	createSpec.Files = &types.VirtualMachineFileInfo{
 		VmPathName: fmt.Sprintf("[%s]", datastore.Name()),
@@ -297,21 +291,21 @@ func (vm *VirtualMachineDriver) FloppyDevices() (object.VirtualDeviceList, error
 func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig) (VirtualMachine, error) {
 	folder, err := vm.driver.FindFolder(config.Folder)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Error finding filder: %s", err)
 	}
 
 	var relocateSpec types.VirtualMachineRelocateSpec
 
 	pool, err := vm.driver.FindResourcePool(config.Cluster, config.Host, config.ResourcePool)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Error finding resource pool: %s", err)
 	}
 	poolRef := pool.pool.Reference()
 	relocateSpec.Pool = &poolRef
 
 	datastore, err := vm.driver.FindDatastore(config.Datastore, config.Host)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Error finding datastore: %s", err)
 	}
 	datastoreRef := datastore.Reference()
 	relocateSpec.Datastore = &datastoreRef
@@ -325,7 +319,7 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)
 
 		tpl, err := vm.Info("snapshot")
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error getting snapshot info for vm: %s", err)
 		}
 		if tpl.Snapshot == nil {
 			err = errors.New("`linked_clone=true`, but template has no snapshots")
@@ -341,24 +335,42 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)
 		configSpec.Annotation = config.Annotation
 	}
 
+	devices, err := vm.vm.Device(vm.driver.ctx)
+	if err != nil {
+		return nil, err
+	}
+	virtualDisks := devices.SelectByType((*types.VirtualDisk)(nil))
+	virtualControllers := devices.SelectByType((*types.VirtualController)(nil))
+
+	// Use existing devices to avoid overlapping configuration
+	existingDevices := object.VirtualDeviceList{}
+	existingDevices = append(existingDevices, virtualDisks...)
+	existingDevices = append(existingDevices, virtualControllers...)
+
+	storageConfigSpec, err := config.StorageConfig.AddStorageDevices(existingDevices)
+	if err != nil {
+		return nil, err
+	}
+	configSpec.DeviceChange = append(configSpec.DeviceChange, storageConfigSpec...)
+
 	if config.Network != "" {
 		net, err := vm.driver.FindNetwork(config.Network)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error finding network: %s", err)
 		}
 		backing, err := net.network.EthernetCardBackingInfo(ctx)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error finding ethernet card backing info: %s", err)
 		}
 
 		devices, err := vm.vm.Device(ctx)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error finding vm devices: %s", err)
 		}
 
 		adapter, err := findNetworkAdapter(devices)
 		if err != nil {
-			return nil, err
+			return nil, fmt.Errorf("Error finding network adapter: %s", err)
 		}
 
 		current := adapter.GetVirtualEthernetCard()
@@ -375,13 +387,13 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)
 
 	vAppConfig, err := vm.updateVAppConfig(ctx, config.VAppProperties)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Error updating VAppConfig: %s", err)
 	}
 	configSpec.VAppConfig = vAppConfig
 
 	task, err := vm.vm.Clone(vm.driver.ctx, folder.folder, config.Name, cloneSpec)
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Error calling vm.vm.Clone task: %s", err)
 	}
 
 	info, err := task.WaitForResult(ctx, nil)
@@ -391,7 +403,7 @@ func (vm *VirtualMachineDriver) Clone(ctx context.Context, config *CloneConfig)
 			return nil, err
 		}
 
-		return nil, err
+		return nil, fmt.Errorf("Error waiting for vm Clone to complete: %s", err)
 	}
 
 	vmRef, ok := info.Result.(types.ManagedObjectReference)
@@ -616,24 +628,6 @@ func (vm *VirtualMachineDriver) ResizeDisk(diskSize int64) error {
 	return err
 }
 
-func findDisk(devices object.VirtualDeviceList) (*types.VirtualDisk, error) {
-	var disks []*types.VirtualDisk
-	for _, device := range devices {
-		switch d := device.(type) {
-		case *types.VirtualDisk:
-			disks = append(disks, d)
-		}
-	}
-
-	switch len(disks) {
-	case 0:
-		return nil, errors.New("VM has no disks")
-	case 1:
-		return disks[0], nil
-	}
-	return nil, errors.New("VM has multiple disks")
-}
-
 func (vm *VirtualMachineDriver) PowerOn() error {
 	task, err := vm.vm.PowerOn(vm.driver.ctx)
 	if err != nil {
@@ -849,55 +843,6 @@ func (vm *VirtualMachineDriver) GetDir() (string, error) {
 	return "", fmt.Errorf("cannot find '%s'", vmxName)
 }
 
-func addDisk(_ *VCenterDriver, devices object.VirtualDeviceList, config *CreateConfig) (object.VirtualDeviceList, error) {
-	if len(config.Storage) == 0 {
-		return nil, errors.New("no storage devices have been defined")
-	}
-
-	if len(config.DiskControllerType) == 0 {
-		return nil, errors.New("no controllers have been defined")
-	}
-
-	var controllers []types.BaseVirtualController
-	for _, controllerType := range config.DiskControllerType {
-		var device types.BaseVirtualDevice
-		var err error
-		if controllerType == "nvme" {
-			device, err = devices.CreateNVMEController()
-		} else {
-			device, err = devices.CreateSCSIController(controllerType)
-		}
-		if err != nil {
-			return nil, err
-		}
-		devices = append(devices, device)
-		controller, err := devices.FindDiskController(devices.Name(device))
-		if err != nil {
-			return nil, err
-		}
-		controllers = append(controllers, controller)
-	}
-
-	for _, dc := range config.Storage {
-		disk := &types.VirtualDisk{
-			VirtualDevice: types.VirtualDevice{
-				Key: devices.NewKey(),
-				Backing: &types.VirtualDiskFlatVer2BackingInfo{
-					DiskMode:        string(types.VirtualDiskModePersistent),
-					ThinProvisioned: types.NewBool(dc.DiskThinProvisioned),
-					EagerlyScrub:    types.NewBool(dc.DiskEagerlyScrub),
-				},
-			},
-			CapacityInKB: dc.DiskSize * 1024,
-		}
-
-		devices.AssignController(disk, controllers[dc.ControllerIndex])
-		devices = append(devices, disk)
-	}
-
-	return devices, nil
-}
-
 func addNetwork(d *VCenterDriver, devices object.VirtualDeviceList, config *CreateConfig) (object.VirtualDeviceList, error) {
 	if len(config.NICs) == 0 {
 		return nil, errors.New("no network adapters have been defined")
diff --git a/builder/vsphere/iso/builder.go b/builder/vsphere/iso/builder.go
index 45fe1ca0b..837f4d7a6 100644
--- a/builder/vsphere/iso/builder.go
+++ b/builder/vsphere/iso/builder.go
@@ -6,10 +6,10 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 type Builder struct {
@@ -41,7 +41,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Config: &b.config.ConnectConfig,
 		},
 		&common.StepDownload{
-			DownloadStep: &packerCommon.StepDownload{
+			DownloadStep: &commonsteps.StepDownload{
 				Checksum:    b.config.ISOChecksum,
 				Description: "ISO",
 				Extension:   b.config.TargetExtension,
@@ -54,7 +54,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Datastore: b.config.Datastore,
 			Host:      b.config.Host,
 		},
-		&packerCommon.StepCreateCD{
+		&commonsteps.StepCreateCD{
 			Files: b.config.CDConfig.CDFiles,
 			Label: b.config.CDConfig.CDLabel,
 		},
@@ -77,7 +77,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		&common.StepConfigParams{
 			Config: &b.config.ConfigParamsConfig,
 		},
-		&packerCommon.StepCreateFloppy{
+		&commonsteps.StepCreateFloppy{
 			Files:       b.config.FloppyFiles,
 			Directories: b.config.FloppyDirectories,
 			Label:       b.config.FloppyLabel,
@@ -92,7 +92,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			HTTPIP:  b.config.BootConfig.HTTPIP,
 			Network: b.config.WaitIpConfig.GetIPNet(),
 		},
-		&packerCommon.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -119,7 +119,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 				Host:      common.CommHost(b.config.Comm.Host()),
 				SSHConfig: b.config.Comm.SSHConfigFunc(),
 			},
-			&packerCommon.StepProvision{},
+			&commonsteps.StepProvision{},
 		)
 	}
 
@@ -159,7 +159,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 		})
 	}
 
-	b.runner = packerCommon.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+	b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	b.runner.Run(ctx, state)
 
 	if rawErr, ok := state.GetOk("error"); ok {
diff --git a/builder/vsphere/iso/common_test.go b/builder/vsphere/iso/common_test.go
index 583660a92..531e9dd73 100644
--- a/builder/vsphere/iso/common_test.go
+++ b/builder/vsphere/iso/common_test.go
@@ -3,8 +3,8 @@ package iso
 import (
 	"bytes"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func basicStateBag() *multistep.BasicStateBag {
diff --git a/builder/vsphere/iso/config.go b/builder/vsphere/iso/config.go
index 791f80cc9..44d2acee1 100644
--- a/builder/vsphere/iso/config.go
+++ b/builder/vsphere/iso/config.go
@@ -5,17 +5,18 @@ package iso
 
 import (
 	"github.com/hashicorp/packer/builder/vsphere/common"
-	packerCommon "github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	packerCommon "github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
 	packerCommon.PackerConfig `mapstructure:",squash"`
-	packerCommon.HTTPConfig   `mapstructure:",squash"`
-	packerCommon.CDConfig     `mapstructure:",squash"`
+	commonsteps.HTTPConfig    `mapstructure:",squash"`
+	commonsteps.CDConfig      `mapstructure:",squash"`
 
 	common.ConnectConfig      `mapstructure:",squash"`
 	CreateConfig              `mapstructure:",squash"`
@@ -23,7 +24,7 @@ type Config struct {
 	common.HardwareConfig     `mapstructure:",squash"`
 	common.ConfigParamsConfig `mapstructure:",squash"`
 
-	packerCommon.ISOConfig `mapstructure:",squash"`
+	commonsteps.ISOConfig `mapstructure:",squash"`
 
 	common.CDRomConfig       `mapstructure:",squash"`
 	common.RemoveCDRomConfig `mapstructure:",squash"`
diff --git a/builder/vsphere/iso/config.hcl2spec.go b/builder/vsphere/iso/config.hcl2spec.go
index 4ed6fae66..f8f31ec3b 100644
--- a/builder/vsphere/iso/config.hcl2spec.go
+++ b/builder/vsphere/iso/config.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                 *string                                     `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType               *string                                     `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion               *string                                     `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                     *bool                                       `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                     *bool                                       `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                   *string                                     `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -32,7 +33,7 @@ type FlatConfig struct {
 	Version                         *uint                                       `mapstructure:"vm_version" cty:"vm_version" hcl:"vm_version"`
 	GuestOSType                     *string                                     `mapstructure:"guest_os_type" cty:"guest_os_type" hcl:"guest_os_type"`
 	DiskControllerType              []string                                    `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"`
-	Storage                         []FlatDiskConfig                            `mapstructure:"storage" cty:"storage" hcl:"storage"`
+	Storage                         []common.FlatDiskConfig                     `mapstructure:"storage" cty:"storage" hcl:"storage"`
 	NICs                            []FlatNIC                                   `mapstructure:"network_adapters" cty:"network_adapters" hcl:"network_adapters"`
 	USBController                   []string                                    `mapstructure:"usb_controller" cty:"usb_controller" hcl:"usb_controller"`
 	Notes                           *string                                     `mapstructure:"notes" cty:"notes" hcl:"notes"`
@@ -152,6 +153,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -172,7 +174,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"vm_version":                     &hcldec.AttrSpec{Name: "vm_version", Type: cty.Number, Required: false},
 		"guest_os_type":                  &hcldec.AttrSpec{Name: "guest_os_type", Type: cty.String, Required: false},
 		"disk_controller_type":           &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false},
-		"storage":                        &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*FlatDiskConfig)(nil).HCL2Spec())},
+		"storage":                        &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())},
 		"network_adapters":               &hcldec.BlockListSpec{TypeName: "network_adapters", Nested: hcldec.ObjectSpec((*FlatNIC)(nil).HCL2Spec())},
 		"usb_controller":                 &hcldec.AttrSpec{Name: "usb_controller", Type: cty.List(cty.String), Required: false},
 		"notes":                          &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false},
diff --git a/builder/vsphere/iso/step_create.go b/builder/vsphere/iso/step_create.go
index fa47f284f..7b13f151a 100644
--- a/builder/vsphere/iso/step_create.go
+++ b/builder/vsphere/iso/step_create.go
@@ -1,5 +1,5 @@
 //go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type NIC,CreateConfig,DiskConfig
+//go:generate mapstructure-to-hcl2 -type NIC,CreateConfig
 
 package iso
 
@@ -10,8 +10,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Defines a Network Adapter
@@ -56,89 +56,6 @@ type NIC struct {
 	Passthrough *bool `mapstructure:"passthrough"`
 }
 
-// Defines the disk storage for a VM.
-//
-// Example that will create a 15GB and a 20GB disk on the VM. The second disk will be thin provisioned:
-//
-// In JSON:
-// ```json
-//   "storage": [
-//     {
-//       "disk_size": 15000
-//     },
-//     {
-//       "disk_size": 20000,
-//       "disk_thin_provisioned": true
-//     }
-//   ],
-// ```
-// In HCL2:
-// ```hcl
-//   storage {
-//       disk_size = 15000
-//   }
-//   storage {
-//       disk_size = 20000
-//       disk_thin_provisioned = true
-//   }
-// ```
-//
-// Example that creates 2 pvscsi controllers and adds 2 disks to each one:
-//
-// In JSON:
-// ```json
-//   "disk_controller_type": ["pvscsi", "pvscsi"],
-//   "storage": [
-//     {
-//       "disk_size": 15000,
-//       "disk_controller_index": 0
-//     },
-//     {
-//       "disk_size": 15000,
-//       "disk_controller_index": 0
-//     },
-//     {
-//       "disk_size": 15000,
-//       "disk_controller_index": 1
-//     },
-//     {
-//       "disk_size": 15000,
-//       "disk_controller_index": 1
-//     }
-//   ],
-// ```
-//
-// In HCL2:
-// ```hcl
-//   disk_controller_type = ["pvscsi", "pvscsi"]
-//   storage {
-//      disk_size = 15000,
-//      disk_controller_index = 0
-//   }
-//   storage {
-//      disk_size = 15000
-//      disk_controller_index = 0
-//   }
-//   storage {
-//      disk_size = 15000
-//      disk_controller_index = 1
-//   }
-//   storage {
-//      disk_size = 15000
-//      disk_controller_index = 1
-//   }
-// ```
-type DiskConfig struct {
-	// The size of the disk in MB.
-	DiskSize int64 `mapstructure:"disk_size" required:"true"`
-	// Enable VMDK thin provisioning for VM. Defaults to `false`.
-	DiskThinProvisioned bool `mapstructure:"disk_thin_provisioned"`
-	// Enable VMDK eager scrubbing for VM. Defaults to `false`.
-	DiskEagerlyScrub bool `mapstructure:"disk_eagerly_scrub"`
-	// The assigned disk controller. Defaults to the first one (0)
-	DiskControllerIndex int `mapstructure:"disk_controller_index"`
-}
-
 type CreateConfig struct {
 	// Set VM hardware version. Defaults to the most current VM hardware
 	// version supported by vCenter. See
@@ -148,14 +65,8 @@ type CreateConfig struct {
 	// Set VM OS type. Defaults to `otherGuest`. See [
 	// here](https://code.vmware.com/apis/358/vsphere/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html)
 	// for a full list of possible values.
-	GuestOSType string `mapstructure:"guest_os_type"`
-	// Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers.
-	// Defaults to `lsilogic`. See
-	// [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362)
-	// for additional details.
-	DiskControllerType []string `mapstructure:"disk_controller_type"`
-	// A collection of one or more disks to be provisioned along with the VM.
-	Storage []DiskConfig `mapstructure:"storage"`
+	GuestOSType   string               `mapstructure:"guest_os_type"`
+	StorageConfig common.StorageConfig `mapstructure:",squash"`
 	// Network adapters
 	NICs []NIC `mapstructure:"network_adapters"`
 	// Create USB controllers for the virtual machine. "usb" for a usb 2.0 controller. "xhci" for a usb 3.0 controller. There can only be at most one of each.
@@ -167,21 +78,15 @@ type CreateConfig struct {
 func (c *CreateConfig) Prepare() []error {
 	var errs []error
 
-	// there should be at least one
-	if len(c.DiskControllerType) == 0 {
-		c.DiskControllerType = append(c.DiskControllerType, "")
+	if len(c.StorageConfig.DiskControllerType) == 0 {
+		c.StorageConfig.DiskControllerType = append(c.StorageConfig.DiskControllerType, "")
 	}
 
-	if len(c.Storage) > 0 {
-		for i, storage := range c.Storage {
-			if storage.DiskSize == 0 {
-				errs = append(errs, fmt.Errorf("storage[%d].'disk_size' is required", i))
-			}
-			if storage.DiskControllerIndex >= len(c.DiskControllerType) {
-				errs = append(errs, fmt.Errorf("storage[%d].'disk_controller_index' references an unknown disk controller", i))
-			}
-		}
+	// there should be at least one
+	if len(c.StorageConfig.Storage) == 0 {
+		errs = append(errs, fmt.Errorf("no storage devices have been defined"))
 	}
+	errs = append(errs, c.StorageConfig.Prepare()...)
 
 	if c.GuestOSType == "" {
 		c.GuestOSType = "otherGuest"
@@ -243,7 +148,7 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste
 
 	// add disk as the first drive for backwards compatibility if the type is defined
 	var disks []driver.Disk
-	for _, disk := range s.Config.Storage {
+	for _, disk := range s.Config.StorageConfig.Storage {
 		disks = append(disks, driver.Disk{
 			DiskSize:            disk.DiskSize,
 			DiskEagerlyScrub:    disk.DiskEagerlyScrub,
@@ -253,19 +158,21 @@ func (s *StepCreateVM) Run(_ context.Context, state multistep.StateBag) multiste
 	}
 
 	vm, err := d.CreateVM(&driver.CreateConfig{
-		DiskControllerType: s.Config.DiskControllerType,
-		Storage:            disks,
-		Annotation:         s.Config.Notes,
-		Name:               s.Location.VMName,
-		Folder:             s.Location.Folder,
-		Cluster:            s.Location.Cluster,
-		Host:               s.Location.Host,
-		ResourcePool:       s.Location.ResourcePool,
-		Datastore:          s.Location.Datastore,
-		GuestOS:            s.Config.GuestOSType,
-		NICs:               networkCards,
-		USBController:      s.Config.USBController,
-		Version:            s.Config.Version,
+		StorageConfig: driver.StorageConfig{
+			DiskControllerType: s.Config.StorageConfig.DiskControllerType,
+			Storage:            disks,
+		},
+		Annotation:    s.Config.Notes,
+		Name:          s.Location.VMName,
+		Folder:        s.Location.Folder,
+		Cluster:       s.Location.Cluster,
+		Host:          s.Location.Host,
+		ResourcePool:  s.Location.ResourcePool,
+		Datastore:     s.Location.Datastore,
+		GuestOS:       s.Config.GuestOSType,
+		NICs:          networkCards,
+		USBController: s.Config.USBController,
+		Version:       s.Config.Version,
 	})
 	if err != nil {
 		state.Put("error", fmt.Errorf("error creating vm: %v", err))
diff --git a/builder/vsphere/iso/step_create.hcl2spec.go b/builder/vsphere/iso/step_create.hcl2spec.go
index dadf605d5..06360e6ac 100644
--- a/builder/vsphere/iso/step_create.hcl2spec.go
+++ b/builder/vsphere/iso/step_create.hcl2spec.go
@@ -1,21 +1,22 @@
-// Code generated by "mapstructure-to-hcl2 -type NIC,CreateConfig,DiskConfig"; DO NOT EDIT.
+// Code generated by "mapstructure-to-hcl2 -type NIC,CreateConfig"; DO NOT EDIT.
 package iso
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
+	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/zclconf/go-cty/cty"
 )
 
 // FlatCreateConfig is an auto-generated flat version of CreateConfig.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatCreateConfig struct {
-	Version            *uint            `mapstructure:"vm_version" cty:"vm_version" hcl:"vm_version"`
-	GuestOSType        *string          `mapstructure:"guest_os_type" cty:"guest_os_type" hcl:"guest_os_type"`
-	DiskControllerType []string         `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"`
-	Storage            []FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"`
-	NICs               []FlatNIC        `mapstructure:"network_adapters" cty:"network_adapters" hcl:"network_adapters"`
-	USBController      []string         `mapstructure:"usb_controller" cty:"usb_controller" hcl:"usb_controller"`
-	Notes              *string          `mapstructure:"notes" cty:"notes" hcl:"notes"`
+	Version            *uint                   `mapstructure:"vm_version" cty:"vm_version" hcl:"vm_version"`
+	GuestOSType        *string                 `mapstructure:"guest_os_type" cty:"guest_os_type" hcl:"guest_os_type"`
+	DiskControllerType []string                `mapstructure:"disk_controller_type" cty:"disk_controller_type" hcl:"disk_controller_type"`
+	Storage            []common.FlatDiskConfig `mapstructure:"storage" cty:"storage" hcl:"storage"`
+	NICs               []FlatNIC               `mapstructure:"network_adapters" cty:"network_adapters" hcl:"network_adapters"`
+	USBController      []string                `mapstructure:"usb_controller" cty:"usb_controller" hcl:"usb_controller"`
+	Notes              *string                 `mapstructure:"notes" cty:"notes" hcl:"notes"`
 }
 
 // FlatMapstructure returns a new FlatCreateConfig.
@@ -33,7 +34,7 @@ func (*FlatCreateConfig) HCL2Spec() map[string]hcldec.Spec {
 		"vm_version":           &hcldec.AttrSpec{Name: "vm_version", Type: cty.Number, Required: false},
 		"guest_os_type":        &hcldec.AttrSpec{Name: "guest_os_type", Type: cty.String, Required: false},
 		"disk_controller_type": &hcldec.AttrSpec{Name: "disk_controller_type", Type: cty.List(cty.String), Required: false},
-		"storage":              &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*FlatDiskConfig)(nil).HCL2Spec())},
+		"storage":              &hcldec.BlockListSpec{TypeName: "storage", Nested: hcldec.ObjectSpec((*common.FlatDiskConfig)(nil).HCL2Spec())},
 		"network_adapters":     &hcldec.BlockListSpec{TypeName: "network_adapters", Nested: hcldec.ObjectSpec((*FlatNIC)(nil).HCL2Spec())},
 		"usb_controller":       &hcldec.AttrSpec{Name: "usb_controller", Type: cty.List(cty.String), Required: false},
 		"notes":                &hcldec.AttrSpec{Name: "notes", Type: cty.String, Required: false},
@@ -41,35 +42,6 @@ func (*FlatCreateConfig) HCL2Spec() map[string]hcldec.Spec {
 	return s
 }
 
-// FlatDiskConfig is an auto-generated flat version of DiskConfig.
-// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
-type FlatDiskConfig struct {
-	DiskSize            *int64 `mapstructure:"disk_size" required:"true" cty:"disk_size" hcl:"disk_size"`
-	DiskThinProvisioned *bool  `mapstructure:"disk_thin_provisioned" cty:"disk_thin_provisioned" hcl:"disk_thin_provisioned"`
-	DiskEagerlyScrub    *bool  `mapstructure:"disk_eagerly_scrub" cty:"disk_eagerly_scrub" hcl:"disk_eagerly_scrub"`
-	DiskControllerIndex *int   `mapstructure:"disk_controller_index" cty:"disk_controller_index" hcl:"disk_controller_index"`
-}
-
-// FlatMapstructure returns a new FlatDiskConfig.
-// FlatDiskConfig is an auto-generated flat version of DiskConfig.
-// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
-func (*DiskConfig) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec } {
-	return new(FlatDiskConfig)
-}
-
-// HCL2Spec returns the hcl spec of a DiskConfig.
-// This spec is used by HCL to read the fields of DiskConfig.
-// The decoded values from this spec will then be applied to a FlatDiskConfig.
-func (*FlatDiskConfig) HCL2Spec() map[string]hcldec.Spec {
-	s := map[string]hcldec.Spec{
-		"disk_size":             &hcldec.AttrSpec{Name: "disk_size", Type: cty.Number, Required: false},
-		"disk_thin_provisioned": &hcldec.AttrSpec{Name: "disk_thin_provisioned", Type: cty.Bool, Required: false},
-		"disk_eagerly_scrub":    &hcldec.AttrSpec{Name: "disk_eagerly_scrub", Type: cty.Bool, Required: false},
-		"disk_controller_index": &hcldec.AttrSpec{Name: "disk_controller_index", Type: cty.Number, Required: false},
-	}
-	return s
-}
-
 // FlatNIC is an auto-generated flat version of NIC.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatNIC struct {
diff --git a/builder/vsphere/iso/step_create_test.go b/builder/vsphere/iso/step_create_test.go
index dbe530778..cd0b4fa57 100644
--- a/builder/vsphere/iso/step_create_test.go
+++ b/builder/vsphere/iso/step_create_test.go
@@ -11,20 +11,29 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"github.com/hashicorp/packer/builder/vsphere/common"
 	"github.com/hashicorp/packer/builder/vsphere/driver"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestCreateConfig_Prepare(t *testing.T) {
 	// Empty config - check defaults
-	config := &CreateConfig{}
+	config := &CreateConfig{
+		// Storage is required
+		StorageConfig: common.StorageConfig{
+			Storage: []common.DiskConfig{
+				{
+					DiskSize: 32768,
+				},
+			},
+		},
+	}
 	if errs := config.Prepare(); len(errs) != 0 {
-		t.Fatalf("Config preprare should not fail")
+		t.Fatalf("Config preprare should not fail: %s", errs[0])
 	}
 	if config.GuestOSType != "otherGuest" {
 		t.Fatalf("GuestOSType should default to 'otherGuest'")
 	}
-	if len(config.DiskControllerType) != 1 {
+	if len(config.StorageConfig.DiskControllerType) != 1 {
 		t.Fatalf("DiskControllerType should have at least one element as default")
 	}
 
@@ -38,10 +47,12 @@ func TestCreateConfig_Prepare(t *testing.T) {
 		{
 			name: "Storage validate disk_size",
 			config: &CreateConfig{
-				Storage: []DiskConfig{
-					{
-						DiskSize:            0,
-						DiskThinProvisioned: true,
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize:            0,
+							DiskThinProvisioned: true,
+						},
 					},
 				},
 			},
@@ -51,10 +62,12 @@ func TestCreateConfig_Prepare(t *testing.T) {
 		{
 			name: "Storage validate disk_controller_index",
 			config: &CreateConfig{
-				Storage: []DiskConfig{
-					{
-						DiskSize:            32768,
-						DiskControllerIndex: 3,
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize:            32768,
+							DiskControllerIndex: 3,
+						},
 					},
 				},
 			},
@@ -65,6 +78,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate 'usb' and 'xhci' can be set together",
 			config: &CreateConfig{
 				USBController: []string{"usb", "xhci"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail: false,
 		},
@@ -72,6 +92,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate '1' and '0' can be set together",
 			config: &CreateConfig{
 				USBController: []string{"1", "0"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail: false,
 		},
@@ -79,6 +106,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate 'true' and 'false' can be set together",
 			config: &CreateConfig{
 				USBController: []string{"true", "false"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail: false,
 		},
@@ -86,6 +120,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate 'true' and 'usb' cannot be set together",
 			config: &CreateConfig{
 				USBController: []string{"true", "usb"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail:           true,
 			expectedErrMsg: "there can only be one usb controller and one xhci controller",
@@ -94,6 +135,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate '1' and 'usb' cannot be set together",
 			config: &CreateConfig{
 				USBController: []string{"1", "usb"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail:           true,
 			expectedErrMsg: "there can only be one usb controller and one xhci controller",
@@ -102,6 +150,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate 'xhci' cannot be set more that once",
 			config: &CreateConfig{
 				USBController: []string{"xhci", "xhci"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail:           true,
 			expectedErrMsg: "there can only be one usb controller and one xhci controller",
@@ -110,6 +165,13 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			name: "USBController validate unknown value cannot be set",
 			config: &CreateConfig{
 				USBController: []string{"unknown"},
+				StorageConfig: common.StorageConfig{
+					Storage: []common.DiskConfig{
+						{
+							DiskSize: 32768,
+						},
+					},
+				},
 			},
 			fail:           true,
 			expectedErrMsg: "usb_controller[0] references an unknown usb controller",
@@ -127,7 +189,7 @@ func TestCreateConfig_Prepare(t *testing.T) {
 			}
 		} else {
 			if len(errs) != 0 {
-				t.Fatalf("Config preprare should not fail")
+				t.Fatalf("Config preprare should not fail: %s", errs[0])
 			}
 		}
 	}
@@ -294,13 +356,15 @@ func basicLocationConfig() *common.LocationConfig {
 
 func createConfig() *CreateConfig {
 	return &CreateConfig{
-		Version:            1,
-		GuestOSType:        "ubuntu64Guest",
-		DiskControllerType: []string{"pvscsi"},
-		Storage: []DiskConfig{
-			{
-				DiskSize:            32768,
-				DiskThinProvisioned: true,
+		Version:     1,
+		GuestOSType: "ubuntu64Guest",
+		StorageConfig: common.StorageConfig{
+			DiskControllerType: []string{"pvscsi"},
+			Storage: []common.DiskConfig{
+				{
+					DiskSize:            32768,
+					DiskThinProvisioned: true,
+				},
 			},
 		},
 		NICs: []NIC{
@@ -324,7 +388,7 @@ func driverCreateConfig(config *CreateConfig, location *common.LocationConfig) *
 	}
 
 	var disks []driver.Disk
-	for _, disk := range config.Storage {
+	for _, disk := range config.StorageConfig.Storage {
 		disks = append(disks, driver.Disk{
 			DiskSize:            disk.DiskSize,
 			DiskEagerlyScrub:    disk.DiskEagerlyScrub,
@@ -334,18 +398,20 @@ func driverCreateConfig(config *CreateConfig, location *common.LocationConfig) *
 	}
 
 	return &driver.CreateConfig{
-		DiskControllerType: config.DiskControllerType,
-		Storage:            disks,
-		Annotation:         config.Notes,
-		Name:               location.VMName,
-		Folder:             location.Folder,
-		Cluster:            location.Cluster,
-		Host:               location.Host,
-		ResourcePool:       location.ResourcePool,
-		Datastore:          location.Datastore,
-		GuestOS:            config.GuestOSType,
-		NICs:               networkCards,
-		USBController:      config.USBController,
-		Version:            config.Version,
+		StorageConfig: driver.StorageConfig{
+			DiskControllerType: config.StorageConfig.DiskControllerType,
+			Storage:            disks,
+		},
+		Annotation:    config.Notes,
+		Name:          location.VMName,
+		Folder:        location.Folder,
+		Cluster:       location.Cluster,
+		Host:          location.Host,
+		ResourcePool:  location.ResourcePool,
+		Datastore:     location.Datastore,
+		GuestOS:       config.GuestOSType,
+		NICs:          networkCards,
+		USBController: config.USBController,
+		Version:       config.Version,
 	}
 }
diff --git a/builder/vsphere/version/version.go b/builder/vsphere/version/version.go
new file mode 100644
index 000000000..68d46181f
--- /dev/null
+++ b/builder/vsphere/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VSpherePluginVersion *version.PluginVersion
+
+func init() {
+	VSpherePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/builder/yandex/access_config.go b/builder/yandex/access_config.go
index 89a150e05..9554d0b83 100644
--- a/builder/yandex/access_config.go
+++ b/builder/yandex/access_config.go
@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/yandex-cloud/go-sdk/iamkey"
 )
 
diff --git a/builder/yandex/builder.go b/builder/yandex/builder.go
index 481f7f57f..bbde04e84 100644
--- a/builder/yandex/builder.go
+++ b/builder/yandex/builder.go
@@ -6,11 +6,11 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	"github.com/yandex-cloud/go-sdk/pkg/requestid"
@@ -64,7 +64,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	state.Put("sdk", driver.SDK())
 	state.Put("hook", hook)
 	state.Put("ui", ui)
-	generatedData := &builder.GeneratedData{State: state}
+	generatedData := &packerbuilderdata.GeneratedData{State: state}
 
 	// Build the steps
 	steps := []multistep.Step{
@@ -83,8 +83,8 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 			Host:      commHost,
 			SSHConfig: b.config.Communicator.SSHConfigFunc(),
 		},
-		&common.StepProvision{},
-		&common.StepCleanupTempKeys{
+		&commonsteps.StepProvision{},
+		&commonsteps.StepCleanupTempKeys{
 			Comm: &b.config.Communicator,
 		},
 		&StepTeardownInstance{},
@@ -94,7 +94,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	}
 
 	// Run the steps
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	b.runner.Run(ctx, state)
 
 	// Report any errors
diff --git a/builder/yandex/config.go b/builder/yandex/config.go
index 12b7245b3..37e75b60c 100644
--- a/builder/yandex/config.go
+++ b/builder/yandex/config.go
@@ -10,12 +10,12 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 const defaultGpuPlatformID = "gpu-standard-v1"
@@ -44,6 +44,8 @@ type Config struct {
 	DiskSizeGb int `mapstructure:"disk_size_gb" required:"false"`
 	// Specify disk type for the launched instance. Defaults to `network-hdd`.
 	DiskType string `mapstructure:"disk_type" required:"false"`
+	// Key/value pair labels to apply to the disk.
+	DiskLabels map[string]string `mapstructure:"disk_labels" required:"false"`
 	// The description of the resulting image.
 	ImageDescription string `mapstructure:"image_description" required:"false"`
 	//  The family name of the resulting image.
diff --git a/builder/yandex/config.hcl2spec.go b/builder/yandex/config.hcl2spec.go
index 8660f3b6e..4c1086481 100644
--- a/builder/yandex/config.hcl2spec.go
+++ b/builder/yandex/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -74,6 +75,7 @@ type FlatConfig struct {
 	DiskName                  *string           `mapstructure:"disk_name" required:"false" cty:"disk_name" hcl:"disk_name"`
 	DiskSizeGb                *int              `mapstructure:"disk_size_gb" required:"false" cty:"disk_size_gb" hcl:"disk_size_gb"`
 	DiskType                  *string           `mapstructure:"disk_type" required:"false" cty:"disk_type" hcl:"disk_type"`
+	DiskLabels                map[string]string `mapstructure:"disk_labels" required:"false" cty:"disk_labels" hcl:"disk_labels"`
 	ImageDescription          *string           `mapstructure:"image_description" required:"false" cty:"image_description" hcl:"image_description"`
 	ImageFamily               *string           `mapstructure:"image_family" required:"false" cty:"image_family" hcl:"image_family"`
 	ImageLabels               map[string]string `mapstructure:"image_labels" required:"false" cty:"image_labels" hcl:"image_labels"`
@@ -117,6 +119,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -180,6 +183,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"disk_name":                    &hcldec.AttrSpec{Name: "disk_name", Type: cty.String, Required: false},
 		"disk_size_gb":                 &hcldec.AttrSpec{Name: "disk_size_gb", Type: cty.Number, Required: false},
 		"disk_type":                    &hcldec.AttrSpec{Name: "disk_type", Type: cty.String, Required: false},
+		"disk_labels":                  &hcldec.AttrSpec{Name: "disk_labels", Type: cty.Map(cty.String), Required: false},
 		"image_description":            &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false},
 		"image_family":                 &hcldec.AttrSpec{Name: "image_family", Type: cty.String, Required: false},
 		"image_labels":                 &hcldec.AttrSpec{Name: "image_labels", Type: cty.Map(cty.String), Required: false},
diff --git a/builder/yandex/driver_yc.go b/builder/yandex/driver_yc.go
index 437233dd4..08e13d2aa 100644
--- a/builder/yandex/driver_yc.go
+++ b/builder/yandex/driver_yc.go
@@ -8,12 +8,13 @@ import (
 	"time"
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
-	"github.com/hashicorp/packer/helper/useragent"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/useragent"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 
+	"github.com/hashicorp/packer/builder/yandex/version"
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/endpoint"
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/vpc/v1"
@@ -83,7 +84,7 @@ func NewDriverYC(ui packer.Ui, ac *AccessConfig) (Driver, error) {
 	// Now we will have new request id for every retry attempt.
 	interceptorChain := grpc_middleware.ChainUnaryClient(retryInterceptor, requestIDInterceptor)
 
-	userAgentMD := metadata.Pairs("user-agent", useragent.String())
+	userAgentMD := metadata.Pairs("user-agent", useragent.String(version.YandexPluginVersion.FormattedVersion()))
 
 	sdk, err := ycsdk.Build(context.Background(), sdkConfig,
 		grpc.WithDefaultCallOptions(grpc.Header(&userAgentMD)),
diff --git a/builder/yandex/ssh.go b/builder/yandex/ssh.go
index c32f16b53..ffebeab41 100644
--- a/builder/yandex/ssh.go
+++ b/builder/yandex/ssh.go
@@ -1,7 +1,7 @@
 package yandex
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func commHost(state multistep.StateBag) (string, error) {
diff --git a/builder/yandex/step_create_image.go b/builder/yandex/step_create_image.go
index 40a0bf933..429888a92 100644
--- a/builder/yandex/step_create_image.go
+++ b/builder/yandex/step_create_image.go
@@ -6,16 +6,16 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	ycsdk "github.com/yandex-cloud/go-sdk"
 )
 
 type stepCreateImage struct {
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func (s *stepCreateImage) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
diff --git a/builder/yandex/step_create_instance.go b/builder/yandex/step_create_instance.go
index e89ba5269..757b24c2a 100644
--- a/builder/yandex/step_create_instance.go
+++ b/builder/yandex/step_create_instance.go
@@ -7,10 +7,10 @@ import (
 	"io/ioutil"
 
 	"github.com/c2h5oh/datasize"
-	"github.com/hashicorp/packer/builder"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/vpc/v1"
@@ -23,7 +23,7 @@ type StepCreateInstance struct {
 	Debug         bool
 	SerialLogFile string
 
-	GeneratedData *builder.GeneratedData
+	GeneratedData *packerbuilderdata.GeneratedData
 }
 
 func createNetwork(ctx context.Context, c *Config, d Driver) (*vpc.Network, error) {
@@ -56,6 +56,41 @@ func createNetwork(ctx context.Context, c *Config, d Driver) (*vpc.Network, erro
 	return network, nil
 }
 
+func createDisk(ctx context.Context, c *Config, d Driver, sourceImage *Image) (*compute.Disk, error) {
+	req := &compute.CreateDiskRequest{
+		Name:     c.DiskName,
+		FolderId: c.FolderID,
+		TypeId:   c.DiskType,
+		Labels:   c.DiskLabels,
+		ZoneId:   c.Zone,
+		Size:     int64((datasize.ByteSize(c.DiskSizeGb) * datasize.GB).Bytes()),
+		Source: &compute.CreateDiskRequest_ImageId{
+			ImageId: sourceImage.ID,
+		},
+	}
+	sdk := d.SDK()
+
+	op, err := sdk.WrapOperation(sdk.Compute().Disk().Create(ctx, req))
+	if err != nil {
+		return nil, err
+	}
+	err = op.Wait(ctx)
+	if err != nil {
+		return nil, err
+	}
+	resp, err := op.Response()
+	if err != nil {
+		return nil, err
+	}
+
+	image, ok := resp.(*compute.Disk)
+	if !ok {
+		return nil, errors.New("disk create operation response doesn't contain Disk")
+	}
+	return image, nil
+
+}
+
 func createSubnet(ctx context.Context, c *Config, d Driver, networkID string) (*vpc.Subnet, error) {
 	req := &vpc.CreateSubnetRequest{
 		FolderId:     c.FolderID,
@@ -154,6 +189,14 @@ func (s *StepCreateInstance) Run(ctx context.Context, state multistep.StateBag)
 		instanceSubnetID = config.SubnetID
 	}
 
+	// Create a disk manually to have a delete ID
+	ui.Say("Creating disk...")
+	disk, err := createDisk(ctx, config, driver, sourceImage)
+	if err != nil {
+		return stepHaltWithError(state, fmt.Errorf("Error creating disk: %s", err))
+	}
+	state.Put("disk_id", disk.Id)
+
 	// Create an instance based on the configuration
 	ui.Say("Creating instance...")
 
@@ -189,15 +232,8 @@ runcmd:
 		Metadata: instanceMetadata,
 		BootDiskSpec: &compute.AttachedDiskSpec{
 			AutoDelete: false,
-			Disk: &compute.AttachedDiskSpec_DiskSpec_{
-				DiskSpec: &compute.AttachedDiskSpec_DiskSpec{
-					Name:   config.DiskName,
-					TypeId: config.DiskType,
-					Size:   int64((datasize.ByteSize(config.DiskSizeGb) * datasize.GB).Bytes()),
-					Source: &compute.AttachedDiskSpec_DiskSpec_ImageId{
-						ImageId: sourceImage.ID,
-					},
-				},
+			Disk: &compute.AttachedDiskSpec_DiskId{
+				DiskId: disk.Id,
 			},
 		},
 		NetworkInterfaceSpecs: []*compute.NetworkInterfaceSpec{
@@ -255,14 +291,13 @@ runcmd:
 		return stepHaltWithError(state, fmt.Errorf("response doesn't contain Instance"))
 	}
 
-	state.Put("disk_id", instance.BootDisk.DiskId)
 	// instance_id is the generic term used so that users can have access to the
 	// instance id inside of the provisioners, used in step_provision.
 	state.Put("instance_id", instance.Id)
 
 	if s.Debug {
 		ui.Message(fmt.Sprintf("Instance ID %s started. Current instance status %s", instance.Id, instance.Status))
-		ui.Message(fmt.Sprintf("Disk ID %s. ", instance.BootDisk.DiskId))
+		ui.Message(fmt.Sprintf("Disk ID %s. ", disk.Id))
 	}
 
 	// provision generated_data from declared in Builder.Prepare func
diff --git a/builder/yandex/step_create_instance_test.go b/builder/yandex/step_create_instance_test.go
index af8ee67af..b0f9cf6d7 100644
--- a/builder/yandex/step_create_instance_test.go
+++ b/builder/yandex/step_create_instance_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/builder/yandex/step_create_ssh_key.go b/builder/yandex/step_create_ssh_key.go
index 1a66af9f9..19178848a 100644
--- a/builder/yandex/step_create_ssh_key.go
+++ b/builder/yandex/step_create_ssh_key.go
@@ -10,8 +10,8 @@ import (
 	"io/ioutil"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/builder/yandex/step_instance_info.go b/builder/yandex/step_instance_info.go
index fa85c052d..3e7f0e3d5 100644
--- a/builder/yandex/step_instance_info.go
+++ b/builder/yandex/step_instance_info.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	ycsdk "github.com/yandex-cloud/go-sdk"
diff --git a/builder/yandex/step_teardown_instance.go b/builder/yandex/step_teardown_instance.go
index 291fa004e..0d34afe21 100644
--- a/builder/yandex/step_teardown_instance.go
+++ b/builder/yandex/step_teardown_instance.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/compute/v1"
 	ycsdk "github.com/yandex-cloud/go-sdk"
diff --git a/builder/yandex/step_wait_cloudinit_script.go b/builder/yandex/step_wait_cloudinit_script.go
index 322f98f98..593def95c 100644
--- a/builder/yandex/step_wait_cloudinit_script.go
+++ b/builder/yandex/step_wait_cloudinit_script.go
@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 const CloudInitScriptStatusKey = "cloud-init-status"
diff --git a/builder/yandex/util.go b/builder/yandex/util.go
index 9c10aa842..f11905f5a 100644
--- a/builder/yandex/util.go
+++ b/builder/yandex/util.go
@@ -2,8 +2,8 @@ package yandex
 
 import (
 	"github.com/c2h5oh/datasize"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func stepHaltWithError(state multistep.StateBag, err error) multistep.StepAction {
diff --git a/builder/yandex/version/version.go b/builder/yandex/version/version.go
new file mode 100644
index 000000000..4421e7aa3
--- /dev/null
+++ b/builder/yandex/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var YandexPluginVersion *version.PluginVersion
+
+func init() {
+	YandexPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/cmd/generate-fixer-deprecations/main.go b/cmd/generate-fixer-deprecations/main.go
index ed271f83b..034ca12e9 100644
--- a/cmd/generate-fixer-deprecations/main.go
+++ b/cmd/generate-fixer-deprecations/main.go
@@ -63,8 +63,8 @@ func main() {
 		}
 	}
 
-	deprecated_path := filepath.Join(packerDir, "helper", "config",
-		"deprecated_options.go")
+	deprecated_path := filepath.Join(packerDir, "packer-plugin-sdk", "template",
+		"config", "deprecated_options.go")
 
 	buf := bytes.Buffer{}
 
diff --git a/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go b/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go
index 07934d3e5..8d5e3c0f1 100644
--- a/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go
+++ b/cmd/mapstructure-to-hcl2/mapstructure-to-hcl2.go
@@ -490,7 +490,7 @@ func getMapstructureSquashedStruct(topPkg *types.Package, utStruct *types.Struct
 			switch f.String() {
 			case "time.Duration":
 				field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.String]), field.Embedded())
-			case "github.com/hashicorp/packer/helper/config.Trilean": // TODO(azr): unhack this situation
+			case "github.com/hashicorp/packer/packer-plugin-sdk/template/config.Trilean": // TODO(azr): unhack this situation
 				field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.Bool]), field.Embedded())
 			case "github.com/hashicorp/packer/provisioner/powershell.ExecutionPolicy": // TODO(azr): unhack this situation
 				field = types.NewField(field.Pos(), field.Pkg(), field.Name(), types.NewPointer(types.Typ[types.String]), field.Embedded())
diff --git a/cmd/struct-markdown/main.go b/cmd/struct-markdown/main.go
index 77410baa4..a1731ae00 100644
--- a/cmd/struct-markdown/main.go
+++ b/cmd/struct-markdown/main.go
@@ -126,9 +126,9 @@ func main() {
 				fieldType = `duration string | ex: "1h5m2s"`
 			case "config.Trilean":
 				fieldType = `boolean`
-			case "hcl2template.NameValues":
+			case "config.NameValues":
 				fieldType = `[]{name string, value string}`
-			case "hcl2template.KeyValues":
+			case "config.KeyValues":
 				fieldType = `[]{key string, value string}`
 			}
 
diff --git a/command/build.go b/command/build.go
index 38901701e..da0036ed1 100644
--- a/command/build.go
+++ b/command/build.go
@@ -15,7 +15,8 @@ import (
 	"github.com/hashicorp/hcl/v2/hclparse"
 	"github.com/hashicorp/packer/hcl2template"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
+	"github.com/hashicorp/packer/version"
 	"golang.org/x/sync/semaphore"
 
 	"github.com/hako/durafmt"
@@ -62,10 +63,12 @@ func (c *BuildCommand) ParseArgs(args []string) (*BuildArgs, int) {
 
 func (m *Meta) GetConfigFromHCL(cla *MetaArgs) (*hcl2template.PackerConfig, int) {
 	parser := &hcl2template.Parser{
-		Parser:                hclparse.NewParser(),
-		BuilderSchemas:        m.CoreConfig.Components.BuilderStore,
-		ProvisionersSchemas:   m.CoreConfig.Components.ProvisionerStore,
-		PostProcessorsSchemas: m.CoreConfig.Components.PostProcessorStore,
+		CorePackerVersion:       version.SemVer,
+		CorePackerVersionString: version.FormattedVersion(),
+		Parser:                  hclparse.NewParser(),
+		BuilderSchemas:          m.CoreConfig.Components.BuilderStore,
+		ProvisionersSchemas:     m.CoreConfig.Components.ProvisionerStore,
+		PostProcessorsSchemas:   m.CoreConfig.Components.PostProcessorStore,
 	}
 	cfg, diags := parser.Parse(cla.Path, cla.VarFiles, cla.Vars)
 	return cfg, writeDiags(m.Ui, parser.Files(), diags)
diff --git a/command/build_test.go b/command/build_test.go
index 9e08e6dd8..60660ff09 100644
--- a/command/build_test.go
+++ b/command/build_test.go
@@ -324,6 +324,52 @@ func TestBuild(t *testing.T) {
 				},
 			},
 		},
+
+		{
+			name: "hcl - valid validation rule for default value",
+			args: []string{
+				filepath.Join(testFixture("hcl", "validation", "map")),
+			},
+			expectedCode: 0,
+		},
+
+		{
+			name: "hcl - valid setting from varfile",
+			args: []string{
+				"-var-file", filepath.Join(testFixture("hcl", "validation", "map", "valid_value.pkrvars.hcl")),
+				filepath.Join(testFixture("hcl", "validation", "map")),
+			},
+			expectedCode: 0,
+		},
+
+		{
+			name: "hcl - invalid setting from varfile",
+			args: []string{
+				"-var-file", filepath.Join(testFixture("hcl", "validation", "map", "invalid_value.pkrvars.hcl")),
+				filepath.Join(testFixture("hcl", "validation", "map")),
+			},
+			expectedCode: 1,
+		},
+
+		{
+			name: "hcl - valid cmd ( invalid varfile bypased )",
+			args: []string{
+				"-var-file", filepath.Join(testFixture("hcl", "validation", "map", "invalid_value.pkrvars.hcl")),
+				"-var", `image_metadata={key = "new_value", something = { foo = "bar" }}`,
+				filepath.Join(testFixture("hcl", "validation", "map")),
+			},
+			expectedCode: 0,
+		},
+
+		{
+			name: "hcl - invalid cmd ( valid varfile bypased )",
+			args: []string{
+				"-var-file", filepath.Join(testFixture("hcl", "validation", "map", "valid_value.pkrvars.hcl")),
+				"-var", `image_metadata={key = "?", something = { foo = "wrong" }}`,
+				filepath.Join(testFixture("hcl", "validation", "map")),
+			},
+			expectedCode: 1,
+		},
 	}
 
 	for _, tt := range tc {
diff --git a/command/cli.go b/command/cli.go
index fbf95dca1..56d598d7f 100644
--- a/command/cli.go
+++ b/command/cli.go
@@ -4,9 +4,9 @@ import (
 	"flag"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/enumflag"
-	kvflag "github.com/hashicorp/packer/helper/flag-kv"
-	sliceflag "github.com/hashicorp/packer/helper/flag-slice"
+	"github.com/hashicorp/packer/command/enumflag"
+	kvflag "github.com/hashicorp/packer/command/flag-kv"
+	sliceflag "github.com/hashicorp/packer/command/flag-slice"
 )
 
 //go:generate enumer -type configType -trimprefix ConfigType -transform snake
@@ -137,8 +137,22 @@ func (va *HCL2UpgradeArgs) AddFlagSets(flags *flag.FlagSet) {
 	va.MetaArgs.AddFlagSets(flags)
 }
 
-// HCL2UpgradeArgs represents a parsed cli line for a `packer build`
+// HCL2UpgradeArgs represents a parsed cli line for a `packer hcl2_upgrade`
 type HCL2UpgradeArgs struct {
 	MetaArgs
 	OutputFile string
 }
+
+func (va *FormatArgs) AddFlagSets(flags *flag.FlagSet) {
+	flags.BoolVar(&va.Check, "check", false, "check if the input is formatted")
+	flags.BoolVar(&va.Diff, "diff", false, "display the diff of formatting changes")
+	flags.BoolVar(&va.Write, "write", true, "overwrite source files instead of writing to stdout")
+
+	va.MetaArgs.AddFlagSets(flags)
+}
+
+// FormatArgs represents a parsed cli line for `packer fmt`
+type FormatArgs struct {
+	MetaArgs
+	Check, Diff, Write bool
+}
diff --git a/helper/enumflag/flag.go b/command/enumflag/flag.go
similarity index 100%
rename from helper/enumflag/flag.go
rename to command/enumflag/flag.go
diff --git a/command/fix.go b/command/fix.go
index 7e382eed9..6672d9035 100644
--- a/command/fix.go
+++ b/command/fix.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/packer/fix"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 
 	"github.com/posener/complete"
 )
diff --git a/helper/flag-kv/flag.go b/command/flag-kv/flag.go
similarity index 100%
rename from helper/flag-kv/flag.go
rename to command/flag-kv/flag.go
diff --git a/helper/flag-kv/flag_json.go b/command/flag-kv/flag_json.go
similarity index 100%
rename from helper/flag-kv/flag_json.go
rename to command/flag-kv/flag_json.go
diff --git a/helper/flag-kv/flag_json_test.go b/command/flag-kv/flag_json_test.go
similarity index 100%
rename from helper/flag-kv/flag_json_test.go
rename to command/flag-kv/flag_json_test.go
diff --git a/helper/flag-kv/flag_strings.go b/command/flag-kv/flag_strings.go
similarity index 100%
rename from helper/flag-kv/flag_strings.go
rename to command/flag-kv/flag_strings.go
diff --git a/helper/flag-kv/flag_strings_test.go b/command/flag-kv/flag_strings_test.go
similarity index 100%
rename from helper/flag-kv/flag_strings_test.go
rename to command/flag-kv/flag_strings_test.go
diff --git a/helper/flag-kv/flag_test.go b/command/flag-kv/flag_test.go
similarity index 100%
rename from helper/flag-kv/flag_test.go
rename to command/flag-kv/flag_test.go
diff --git a/helper/flag-kv/test-fixtures/basic.json b/command/flag-kv/test-fixtures/basic.json
similarity index 100%
rename from helper/flag-kv/test-fixtures/basic.json
rename to command/flag-kv/test-fixtures/basic.json
diff --git a/helper/flag-slice/flag.go b/command/flag-slice/flag.go
similarity index 100%
rename from helper/flag-slice/flag.go
rename to command/flag-slice/flag.go
diff --git a/helper/flag-slice/flag_test.go b/command/flag-slice/flag_test.go
similarity index 100%
rename from helper/flag-slice/flag_test.go
rename to command/flag-slice/flag_test.go
diff --git a/command/fmt.go b/command/fmt.go
new file mode 100644
index 000000000..d2533f6d8
--- /dev/null
+++ b/command/fmt.go
@@ -0,0 +1,109 @@
+package command
+
+import (
+	"context"
+	"os"
+	"strings"
+
+	hclutils "github.com/hashicorp/packer/hcl2template"
+	"github.com/posener/complete"
+)
+
+type FormatCommand struct {
+	Meta
+}
+
+func (c *FormatCommand) Run(args []string) int {
+	ctx := context.Background()
+	cfg, ret := c.ParseArgs(args)
+	if ret != 0 {
+		return ret
+	}
+
+	return c.RunContext(ctx, cfg)
+}
+
+func (c *FormatCommand) ParseArgs(args []string) (*FormatArgs, int) {
+	var cfg FormatArgs
+	flags := c.Meta.FlagSet("format", FlagSetNone)
+	flags.Usage = func() { c.Ui.Say(c.Help()) }
+	cfg.AddFlagSets(flags)
+	if err := flags.Parse(args); err != nil {
+		return &cfg, 1
+	}
+
+	args = flags.Args()
+	if len(args) != 1 {
+		flags.Usage()
+		return &cfg, 1
+	}
+
+	cfg.Path = args[0]
+	return &cfg, 0
+}
+
+func (c *FormatCommand) RunContext(ctx context.Context, cla *FormatArgs) int {
+	if cla.Check {
+		cla.Write = false
+	}
+
+	formatter := hclutils.HCL2Formatter{
+		ShowDiff: cla.Diff,
+		Write:    cla.Write,
+		Output:   os.Stdout,
+	}
+
+	bytesModified, diags := formatter.Format(cla.Path)
+	ret := writeDiags(c.Ui, nil, diags)
+	if ret != 0 {
+		return ret
+	}
+
+	if cla.Check && bytesModified > 0 {
+		// exit code taken from `terraform fmt` command
+		return 3
+	}
+
+	return 0
+}
+
+func (*FormatCommand) Help() string {
+	helpText := `
+Usage: packer fmt [options] [TEMPLATE]
+
+  Rewrites all Packer configuration files to a canonical format. Both
+  configuration files (.pkr.hcl) and variable files (.pkrvars) are updated.
+  JSON files (.json) are not modified.
+
+  If TEMPATE is "." the current directory will be used. The given content must
+  be in Packer's HCL2 configuration language; JSON is not supported.
+
+Options:
+  -check        Check if the input is formatted. Exit status will be 0 if all
+                 input is properly formatted and non-zero otherwise.
+
+  -diff         Display diffs of formatting change
+
+  -write=false  Don't write to source files
+                (always disabled if using -check)
+
+`
+
+	return strings.TrimSpace(helpText)
+}
+
+func (*FormatCommand) Synopsis() string {
+	return "Rewrites HCL2 config files to canonical format"
+}
+
+func (*FormatCommand) AutocompleteArgs() complete.Predictor {
+	return complete.PredictNothing
+}
+
+func (*FormatCommand) AutocompleteFlags() complete.Flags {
+	return complete.Flags{
+		"-check": complete.PredictNothing,
+		"-diff":  complete.PredictNothing,
+		"-write": complete.PredictNothing,
+	}
+}
diff --git a/command/hcl2_upgrade.go b/command/hcl2_upgrade.go
index 9da3dc645..f3a0f01f2 100644
--- a/command/hcl2_upgrade.go
+++ b/command/hcl2_upgrade.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hclwrite"
 	hcl2shim "github.com/hashicorp/packer/hcl2template/shim"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 	"github.com/posener/complete"
 	"github.com/zclconf/go-cty/cty"
 )
@@ -64,10 +64,19 @@ const (
 # once they also need to be in the same folder. 'packer inspect folder/'
 # will describe to you what is in that folder.
 
+# Avoid mixing go templating calls ( for example ` + "```{{ upper(`string`) }}```" + ` ) 
+# and HCL2 calls (for example '${ var.string_value_example }' ). They won't be
+# executed together and the outcome will be unknown.
+`
+	inputVarHeader = `
 # All generated input variables will be of 'string' type as this is how Packer JSON
 # views them; you can change their type later on. Read the variables type
 # constraints documentation
 # https://www.packer.io/docs/from-1.5/variables#type-constraints for more info.
+`
+
+	packerBlockHeader = `
+# See https://www.packer.io/docs/from-1.5/blocks/packer for more info
 `
 
 	sourcesHeader = `
@@ -112,10 +121,22 @@ func (c *HCL2UpgradeCommand) RunContext(buildCtx context.Context, cla *HCL2Upgra
 
 	core := hdl.(*CoreWrapper).Core
 	if err := core.Initialize(); err != nil {
-		c.Ui.Error(fmt.Sprintf("Initialization error, continuing: %v", err))
+		c.Ui.Error(fmt.Sprintf("Ignoring following initialization error: %v", err))
 	}
 	tpl := core.Template
 
+	// Packer section
+	if tpl.MinVersion != "" {
+		out.Write([]byte(packerBlockHeader))
+		fileContent := hclwrite.NewEmptyFile()
+		body := fileContent.Body()
+		packerBody := body.AppendNewBlock("packer", nil).Body()
+		packerBody.SetAttributeValue("required_version", cty.StringVal(fmt.Sprintf(">= %s", tpl.MinVersion)))
+		out.Write(fileContent.Bytes())
+	}
+
+	out.Write([]byte(inputVarHeader))
+
 	// Output variables section
 
 	variables := []*template.Variable{}
@@ -266,12 +287,29 @@ func (c *HCL2UpgradeCommand) RunContext(buildCtx context.Context, cla *HCL2Upgra
 	return 0
 }
 
+type UnhandleableArgumentError struct {
+	Call           string
+	Correspondance string
+	Docs           string
+}
+
+func (uc UnhandleableArgumentError) Error() string {
+	return fmt.Sprintf(`unhandled %q call:
+# there is no way to automatically upgrade the %[1]q call.
+# Please manually upgrade to %s
+# Visit %s for more infos.`, uc.Call, uc.Correspondance, uc.Docs)
+}
+
 // transposeTemplatingCalls executes parts of blocks as go template files and replaces
 // their result with their hcl2 variant. If something goes wrong the template
 // containing the go template string is returned.
 func transposeTemplatingCalls(s []byte) []byte {
 	fallbackReturn := func(err error) []byte {
-		return append([]byte(fmt.Sprintf("\n#could not parse template for following block: %q\n", err)), s...)
+		if strings.Contains(err.Error(), "unhandled") {
+			return append([]byte(fmt.Sprintf("\n# %s\n", err)), s...)
+		}
+
+		return append([]byte(fmt.Sprintf("\n# could not parse template for following block: %q\n", err)), s...)
 	}
 	funcMap := texttemplate.FuncMap{
 		"timestamp": func() string {
@@ -284,14 +322,76 @@ func transposeTemplatingCalls(s []byte) []byte {
 			return fmt.Sprintf("${var.%s}", in)
 		},
 		"env": func(in string) string {
-			return fmt.Sprintf("${var.%s}", in)
+			return fmt.Sprintf("${env(%q)}", in)
 		},
 		"build": func(a string) string {
 			return fmt.Sprintf("${build.%s}", a)
 		},
+		"template_dir": func() string {
+			return fmt.Sprintf("${path.root}")
+		},
+		"pwd": func() string {
+			return fmt.Sprintf("${path.cwd}")
+		},
+		"packer_version": func() string {
+			return fmt.Sprintf("${packer.version}")
+		},
+		"uuid": func() string {
+			return fmt.Sprintf("${uuidv4()}")
+		},
+		"lower": func(_ string) (string, error) {
+			return "", UnhandleableArgumentError{
+				"lower",
+				"`lower(var.example)`",
+				"https://www.packer.io/docs/from-1.5/functions/string/lower",
+			}
+		},
+		"upper": func(_ string) (string, error) {
+			return "", UnhandleableArgumentError{
+				"upper",
+				"`upper(var.example)`",
+				"https://www.packer.io/docs/from-1.5/functions/string/upper",
+			}
+		},
+		"split": func(_, _ string, _ int) (string, error) {
+			return "", UnhandleableArgumentError{
+				"split",
+				"`split(separator, string)`",
+				"https://www.packer.io/docs/from-1.5/functions/string/split",
+			}
+		},
+		"replace": func(_, _, _ string, _ int) (string, error) {
+			return "", UnhandleableArgumentError{
+				"replace",
+				"`replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`",
+				"https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace",
+			}
+		},
+		"replace_all": func(_, _, _ string) (string, error) {
+			return "", UnhandleableArgumentError{
+				"replace_all",
+				"`replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`",
+				"https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace",
+			}
+		},
+		"clean_resource_name": func(_ string) (string, error) {
+			return "", UnhandleableArgumentError{
+				"clean_resource_name",
+				"use custom validation rules, `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`",
+				"https://packer.io/docs/from-1.5/variables#custom-validation-rules" +
+					" , https://www.packer.io/docs/from-1.5/functions/string/replace" +
+					" or https://www.packer.io/docs/from-1.5/functions/string/regex_replace",
+			}
+		},
+		"build_name": func() string {
+			return fmt.Sprintf("${build.name}")
+		},
+		"build_type": func() string {
+			return fmt.Sprintf("${build.type}")
+		},
 	}
 
-	tpl, err := texttemplate.New("generated").
+	tpl, err := texttemplate.New("hcl2_upgrade").
 		Funcs(funcMap).
 		Parse(string(s))
 
diff --git a/command/inspect_test.go b/command/inspect_test.go
index 5fda6c0d1..4bb594d07 100644
--- a/command/inspect_test.go
+++ b/command/inspect_test.go
@@ -78,7 +78,9 @@ local.fruit: "banana"
 
 > input-variables:
 
+var.default_from_env: ""
 var.fruit: "peach"
+var.other_default_from_env: ""
 var.unknown_list_of_string: "[\n  \"first_peach\",\n  \"second_peach\",\n]"
 var.unknown_string: "also_peach"
 var.unknown_unknown: "[\"peach_too\"]"
@@ -89,11 +91,13 @@ var.unknown_unknown: "[\"peach_too\"]"
 > builds:
 
 `},
-		{[]string{"inspect", "-var=fruit=peach", filepath.Join(testFixture("hcl"), "inspect")}, nil, `Packer Inspect: HCL2 mode
+		{[]string{"inspect", "-var=fruit=peach", "-var=other_default_from_env=apple", filepath.Join(testFixture("hcl"), "inspect")}, []string{"DEFAULT_FROM_ENV=cherry"}, `Packer Inspect: HCL2 mode
 
 > input-variables:
 
+var.default_from_env: "cherry"
 var.fruit: "peach"
+var.other_default_from_env: "apple"
 var.unknown_list_of_string: "<unknown>"
 var.unknown_string: "<unknown>"
 var.unknown_unknown: "<unknown>"
diff --git a/command/meta.go b/command/meta.go
index 50c767892..a57f7244b 100644
--- a/command/meta.go
+++ b/command/meta.go
@@ -6,10 +6,10 @@ import (
 	"io"
 	"os"
 
-	kvflag "github.com/hashicorp/packer/helper/flag-kv"
+	kvflag "github.com/hashicorp/packer/command/flag-kv"
 	"github.com/hashicorp/packer/helper/wrappedstreams"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // FlagSetFlags is an enum to define what flags are present in the
diff --git a/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl b/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl
index fb904c368..51bc427f7 100644
--- a/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl
+++ b/command/test-fixtures/hcl/inspect/fruit_string.pkr.hcl
@@ -15,3 +15,11 @@ variable "unknown_list_of_string" {
 
 variable "unknown_unknown" {
 }
+
+variable "default_from_env" {
+  default = env("DEFAULT_FROM_ENV")
+}
+
+variable "other_default_from_env" {
+  default = env("OTHER_DEFAULT_FROM_ENV")
+}
diff --git a/command/test-fixtures/hcl/validation/map/definition.pkr.hcl b/command/test-fixtures/hcl/validation/map/definition.pkr.hcl
new file mode 100644
index 000000000..1e60d70bd
--- /dev/null
+++ b/command/test-fixtures/hcl/validation/map/definition.pkr.hcl
@@ -0,0 +1,19 @@
+
+variable "image_metadata" {
+  default = {
+    key: "value",
+    something: { 
+      foo: "bar",
+    }
+  }
+  validation {
+    condition     = length(var.image_metadata.key) > 4
+    error_message = "The image_metadata.key field must be more than 4 runes."
+  }
+  validation {
+    condition     = substr(var.image_metadata.something.foo, 0, 3) == "bar"
+    error_message = "The image_metadata.something.foo field must start with \"bar\"."
+  }
+}
+
+build {}
diff --git a/command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl b/command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl
new file mode 100644
index 000000000..9734f36f6
--- /dev/null
+++ b/command/test-fixtures/hcl/validation/map/invalid_value.pkrvars.hcl
@@ -0,0 +1,7 @@
+
+image_metadata = {
+  key: "value",
+  something: { 
+    foo: "woo",
+  }
+}
diff --git a/command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl b/command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl
new file mode 100644
index 000000000..250fcfc8f
--- /dev/null
+++ b/command/test-fixtures/hcl/validation/map/valid_value.pkrvars.hcl
@@ -0,0 +1,7 @@
+
+image_metadata = {
+  key: "value",
+  something: { 
+    foo: "barwoo",
+  }
+}
diff --git a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl
index ffb88fd7c..31091a90a 100644
--- a/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl
+++ b/command/test-fixtures/hcl2_upgrade_basic/expected.pkr.hcl
@@ -7,6 +7,15 @@
 # once they also need to be in the same folder. 'packer inspect folder/'
 # will describe to you what is in that folder.
 
+# Avoid mixing go templating calls ( for example ```{{ upper(`string`) }}``` ) 
+# and HCL2 calls (for example '${ var.string_value_example }' ). They won't be
+# executed together and the outcome will be unknown.
+
+# See https://www.packer.io/docs/from-1.5/blocks/packer for more info
+packer {
+  required_version = ">= 1.6.0"
+}
+
 # All generated input variables will be of 'string' type as this is how Packer JSON
 # views them; you can change their type later on. Read the variables type
 # constraints documentation
@@ -21,12 +30,23 @@ variable "aws_region" {
   type = string
 }
 
+variable "aws_secondary_region" {
+  type    = string
+  default = "${env("AWS_DEFAULT_REGION")}"
+}
+
 variable "aws_secret_key" {
   type      = string
   default   = ""
   sensitive = true
 }
 
+variable "secret_account" {
+  type      = string
+  default   = "🤷"
+  sensitive = true
+}
+
 # "timestamp" template function replacement
 locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") }
 
@@ -77,14 +97,61 @@ build {
   sources = ["source.amazon-ebs.autogenerated_1"]
 
   provisioner "shell" {
-    inline      = ["echo ${var.secret_account}", "echo ${build.ID}", "echo ${build.SSHPrivateKey}", "sleep 100000"]
+    except      = ["amazon-ebs"]
+    inline      = ["echo ${var.secret_account}", "echo ${build.ID}", "echo ${build.SSHPublicKey} | head -c 14", "echo ${path.root} is not ${path.cwd}", "echo ${packer.version}", "echo ${uuidv4()}"]
     max_retries = "5"
-    only        = ["amazon-ebs"]
-    timeout     = "5s"
+  }
+
+  # template: hcl2_upgrade:2:38: executing "hcl2_upgrade" at <clean_resource_name>: error calling clean_resource_name: unhandled "clean_resource_name" call:
+  # there is no way to automatically upgrade the "clean_resource_name" call.
+  # Please manually upgrade to use custom validation rules, `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`
+  # Visit https://packer.io/docs/from-1.5/variables#custom-validation-rules , https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace for more infos.
+  provisioner "shell" {
+    inline = ["echo mybuild-{{isotime | clean_resource_name}}"]
+  }
+
+  # template: hcl2_upgrade:2:35: executing "hcl2_upgrade" at <lower>: error calling lower: unhandled "lower" call:
+  # there is no way to automatically upgrade the "lower" call.
+  # Please manually upgrade to `lower(var.example)`
+  # Visit https://www.packer.io/docs/from-1.5/functions/string/lower for more infos.
+  provisioner "shell" {
+    inline = ["echo {{ `SOMETHING` | lower }}"]
+  }
+
+  # template: hcl2_upgrade:2:35: executing "hcl2_upgrade" at <upper>: error calling upper: unhandled "upper" call:
+  # there is no way to automatically upgrade the "upper" call.
+  # Please manually upgrade to `upper(var.example)`
+  # Visit https://www.packer.io/docs/from-1.5/functions/string/upper for more infos.
+  provisioner "shell" {
+    inline = ["echo {{ `something` | upper }}"]
+  }
+
+  # template: hcl2_upgrade:2:21: executing "hcl2_upgrade" at <split `some-string` `-` 0>: error calling split: unhandled "split" call:
+  # there is no way to automatically upgrade the "split" call.
+  # Please manually upgrade to `split(separator, string)`
+  # Visit https://www.packer.io/docs/from-1.5/functions/string/split for more infos.
+  provisioner "shell" {
+    inline = ["echo {{ split `some-string` `-` 0 }}"]
+  }
+
+  # template: hcl2_upgrade:2:21: executing "hcl2_upgrade" at <replace_all `-` `/` build_name>: error calling replace_all: unhandled "replace_all" call:
+  # there is no way to automatically upgrade the "replace_all" call.
+  # Please manually upgrade to `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`
+  # Visit https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace for more infos.
+  provisioner "shell" {
+    inline = ["echo {{ replace_all `-` `/` build_name }}"]
+  }
+
+  # template: hcl2_upgrade:2:21: executing "hcl2_upgrade" at <replace `some-string` `-` `/` 1>: error calling replace: unhandled "replace" call:
+  # there is no way to automatically upgrade the "replace" call.
+  # Please manually upgrade to `replace(string, substring, replacement)` or `regex_replace(string, substring, replacement)`
+  # Visit https://www.packer.io/docs/from-1.5/functions/string/replace or https://www.packer.io/docs/from-1.5/functions/string/regex_replace for more infos.
+  provisioner "shell" {
+    inline = ["echo {{ replace `some-string` `-` `/` 1 }}"]
   }
   provisioner "shell-local" {
-    except  = ["amazon-ebs"]
     inline  = ["sleep 100000"]
+    only    = ["amazon-ebs"]
     timeout = "5s"
   }
   post-processor "amazon-import" {
diff --git a/command/test-fixtures/hcl2_upgrade_basic/input.json b/command/test-fixtures/hcl2_upgrade_basic/input.json
index cd4fbb6ae..a7fca659b 100644
--- a/command/test-fixtures/hcl2_upgrade_basic/input.json
+++ b/command/test-fixtures/hcl2_upgrade_basic/input.json
@@ -1,12 +1,16 @@
 {
+    "min_packer_version": "1.6.0",
     "variables": {
+        "secret_account": "🤷",
         "aws_region": null,
+        "aws_secondary_region": "{{ env `AWS_DEFAULT_REGION` }}",
         "aws_secret_key": "",
         "aws_access_key": ""
     },
     "sensitive-variables": [
         "aws_secret_key",
         "aws_access_key",
+        "secret_account",
         "potato"
     ],
     "builders": [
@@ -62,21 +66,58 @@
     "provisioners": [
         {
             "type": "shell",
-            "only": [
+            "except": [
                 "amazon-ebs"
             ],
             "max_retries": 5,
-            "timeout": "5s",
             "inline": [
                 "echo {{ user  `secret_account` }}",
                 "echo {{ build `ID` }}",
-                "echo {{ build `SSHPrivateKey` }}",
-                "sleep 100000"
+                "echo {{ build `SSHPublicKey` }} | head -c 14",
+                "echo {{ template_dir }} is not {{ pwd }}",
+                "echo {{ packer_version }}",
+                "echo {{ uuid }}"
+            ]
+        },
+        {
+            "type": "shell",
+            "inline": [
+                "echo mybuild-{{isotime | clean_resource_name}}"
+            ]
+        },
+        {
+            "type": "shell",
+            "inline": [
+                "echo {{ `SOMETHING` | lower }}"
+            ]
+        },
+        {
+            "type": "shell",
+            "inline": [
+                "echo {{ `something` | upper }}"
+            ]
+        },
+        {
+            "type": "shell",
+            "inline": [
+                "echo {{ split `some-string` `-` 0 }}"
+            ]
+        },
+        {
+            "type": "shell",
+            "inline": [
+                "echo {{ replace_all `-` `/` build_name }}"
+            ]
+        },
+        {
+            "type": "shell",
+            "inline": [
+                "echo {{ replace `some-string` `-` `/` 1 }}"
             ]
         },
         {
             "type": "shell-local",
-            "except": [
+            "only": [
                 "amazon-ebs"
             ],
             "timeout": "5s",
diff --git a/commands.go b/commands.go
index 32bdd17b5..e98242496 100644
--- a/commands.go
+++ b/commands.go
@@ -18,9 +18,7 @@ const OutputPrefix = "o:"
 func init() {
 	Commands = map[string]cli.CommandFactory{
 		"build": func() (cli.Command, error) {
-			return &command.BuildCommand{
-				Meta: *CommandMeta,
-			}, nil
+			return &command.BuildCommand{Meta: *CommandMeta}, nil
 		},
 		"console": func() (cli.Command, error) {
 			return &command.ConsoleCommand{
@@ -34,12 +32,30 @@ func init() {
 			}, nil
 		},
 
+		"fmt": func() (cli.Command, error) {
+			return &command.FormatCommand{
+				Meta: *CommandMeta,
+			}, nil
+		},
+
+		"hcl2_upgrade": func() (cli.Command, error) {
+			return &command.HCL2UpgradeCommand{
+				Meta: *CommandMeta,
+			}, nil
+		},
+
 		"inspect": func() (cli.Command, error) {
 			return &command.InspectCommand{
 				Meta: *CommandMeta,
 			}, nil
 		},
 
+		"plugin": func() (cli.Command, error) {
+			return &command.PluginCommand{
+				Meta: *CommandMeta,
+			}, nil
+		},
+
 		"validate": func() (cli.Command, error) {
 			return &command.ValidateCommand{
 				Meta: *CommandMeta,
@@ -52,17 +68,5 @@ func init() {
 				CheckFunc: commandVersionCheck,
 			}, nil
 		},
-
-		"plugin": func() (cli.Command, error) {
-			return &command.PluginCommand{
-				Meta: *CommandMeta,
-			}, nil
-		},
-
-		"hcl2_upgrade": func() (cli.Command, error) {
-			return &command.HCL2UpgradeCommand{
-				Meta: *CommandMeta,
-			}, nil
-		},
 	}
 }
diff --git a/common/command.go b/common/command.go
deleted file mode 100644
index eaceb75a2..000000000
--- a/common/command.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package common
-
-import (
-	"os/exec"
-)
-
-// CommandWrapper is a type that given a command, will possibly modify that
-// command in-flight. This might return an error.
-type CommandWrapper func(string) (string, error)
-
-// ShellCommand takes a command string and returns an *exec.Cmd to execute
-// it within the context of a shell (/bin/sh).
-func ShellCommand(command string) *exec.Cmd {
-	return exec.Command("/bin/sh", "-c", command)
-}
diff --git a/common/config.go b/common/config.go
deleted file mode 100644
index 8094e05e5..000000000
--- a/common/config.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package common
-
-import (
-	"time"
-)
-
-// PackerKeyEnv is used to specify the key interval (delay) between keystrokes
-// sent to the VM, typically in boot commands. This is to prevent host CPU
-// utilization from causing key presses to be skipped or repeated incorrectly.
-const PackerKeyEnv = "PACKER_KEY_INTERVAL"
-
-// PackerKeyDefault 100ms is appropriate for shared build infrastructure while a
-// shorter delay (e.g. 10ms) can be used on a workstation. See PackerKeyEnv.
-const PackerKeyDefault = 100 * time.Millisecond
diff --git a/common/terminal.go b/common/terminal.go
deleted file mode 100644
index 4e862880a..000000000
--- a/common/terminal.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package common
-
-// call into one of the platform-specific implementations to get the current terminal dimensions
-func GetTerminalDimensions() (width, height int, err error) {
-	return platformGetTerminalDimensions()
-}
diff --git a/common/terminal_posix.go b/common/terminal_posix.go
deleted file mode 100644
index 2a98a4fbd..000000000
--- a/common/terminal_posix.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// +build !windows
-
-package common
-
-// Imports for determining terminal information across platforms
-import (
-	"os"
-
-	"golang.org/x/sys/unix"
-)
-
-// posix api
-func platformGetTerminalDimensions() (width, height int, err error) {
-
-	// grab the handle to stdin
-	// XXX: in some cases, packer closes stdin, so the following can't be guaranteed
-	/*
-		tty := os.Stdin
-	*/
-
-	// open up a handle to the current tty
-	tty, err := os.Open("/dev/tty")
-	if err != nil {
-		return 0, 0, err
-	}
-	defer tty.Close()
-
-	// convert the handle into a file descriptor
-	fd := int(tty.Fd())
-
-	// use it to make an Ioctl
-	ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	// return the width and height
-	return int(ws.Col), int(ws.Row), nil
-}
diff --git a/common/terminal_test.go b/common/terminal_test.go
deleted file mode 100644
index f1c66b092..000000000
--- a/common/terminal_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package common
-
-import "testing"
-
-func TestGetTerminalDimensions(t *testing.T) {
-	if _, _, err := GetTerminalDimensions(); err != nil {
-		t.Fatalf("Unable to get terminal dimensions: %s", err)
-	}
-}
diff --git a/common/terminal_windows.go b/common/terminal_windows.go
deleted file mode 100644
index 556873eb0..000000000
--- a/common/terminal_windows.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// +build windows
-
-package common
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// windows constants and structures pulled from msdn
-const (
-	_STD_INPUT_HANDLE  = -10
-	_STD_OUTPUT_HANDLE = -11
-	_STD_ERROR_HANDLE  = -12
-)
-
-type (
-	_SHORT int16
-	_WORD  uint16
-
-	_SMALL_RECT struct {
-		Left, Top, Right, Bottom _SHORT
-	}
-	_COORD struct {
-		X, Y _SHORT
-	}
-	_CONSOLE_SCREEN_BUFFER_INFO struct {
-		dwSize, dwCursorPosition _COORD
-		wAttributes              _WORD
-		srWindow                 _SMALL_RECT
-		dwMaximumWindowSize      _COORD
-	}
-)
-
-// Low-level functions that call into Windows API for getting console info
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-var kernel32_GetStdHandleProc = kernel32.NewProc("GetStdHandle")
-var kernel32_GetConsoleScreenBufferInfoProc = kernel32.NewProc("GetConsoleScreenBufferInfo")
-
-func kernel32_GetStdHandle(nStdHandle int32) (syscall.Handle, error) {
-	res, _, err := kernel32_GetStdHandleProc.Call(uintptr(nStdHandle))
-	if res == uintptr(syscall.InvalidHandle) {
-		return syscall.InvalidHandle, error(err)
-	}
-	return syscall.Handle(res), nil
-}
-
-func kernel32_GetConsoleScreenBufferInfo(hConsoleOutput syscall.Handle, info *_CONSOLE_SCREEN_BUFFER_INFO) error {
-	ok, _, err := kernel32_GetConsoleScreenBufferInfoProc.Call(uintptr(hConsoleOutput), uintptr(unsafe.Pointer(info)))
-	if int(ok) == 0 {
-		return error(err)
-	}
-	return nil
-}
-
-// windows api to get the console screen buffer info
-func getConsoleScreenBufferInfo(csbi *_CONSOLE_SCREEN_BUFFER_INFO) (err error) {
-	var (
-		bi _CONSOLE_SCREEN_BUFFER_INFO
-		fd syscall.Handle
-	)
-
-	// Re-open CONOUT$ as in some instances, stdout may be closed and guaranteed an stdout
-	if fd, err = syscall.Open("CONOUT$", syscall.O_RDWR, 0); err != nil {
-		return err
-	}
-	defer syscall.Close(fd)
-
-	// grab the dimensions for the console
-	if err = kernel32_GetConsoleScreenBufferInfo(fd, &bi); err != nil {
-		return err
-	}
-
-	*csbi = bi
-	return nil
-}
-
-func platformGetTerminalDimensions() (width, height int, err error) {
-	var csbi _CONSOLE_SCREEN_BUFFER_INFO
-
-	if err = getConsoleScreenBufferInfo(&csbi); err != nil {
-		return 0, 0, err
-	}
-
-	return int(csbi.dwSize.X), int(csbi.dwSize.Y), nil
-}
diff --git a/common/test-fixtures/fileurl/cake b/common/test-fixtures/fileurl/cake
deleted file mode 100644
index e800d1ffb..000000000
--- a/common/test-fixtures/fileurl/cake
+++ /dev/null
@@ -1 +0,0 @@
-delicious chocolate cake
diff --git a/go.mod b/go.mod
index c53e9c9d8..352ad70ee 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/Azure/go-autorest/autorest v0.10.0
 	github.com/Azure/go-autorest/autorest/adal v0.8.2
 	github.com/Azure/go-autorest/autorest/azure/auth v0.4.2
+	github.com/Azure/go-autorest/autorest/azure/cli v0.3.1
 	github.com/Azure/go-autorest/autorest/date v0.2.0
 	github.com/Azure/go-autorest/autorest/to v0.3.0
 	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
@@ -93,6 +94,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/go-testing-interface v1.0.3 // indirect
 	github.com/mitchellh/go-vnc v0.0.0-20150629162542-723ed9867aed
+	github.com/mitchellh/gox v1.0.1 // indirect
 	github.com/mitchellh/iochan v1.0.0
 	github.com/mitchellh/mapstructure v1.2.3
 	github.com/mitchellh/panicwrap v1.0.0
@@ -132,11 +134,11 @@ require (
 	github.com/zclconf/go-cty-yaml v1.0.1
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 	golang.org/x/mobile v0.0.0-20191130191448-5c0e7e404af8
-	golang.org/x/net v0.0.0-20200904194848-62affa334b73
+	golang.org/x/net v0.0.0-20201021035429-f5854403a974
 	golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
-	golang.org/x/sys v0.0.0-20200918174421-af09f7315aff
-	golang.org/x/tools v0.0.0-20200918232735-d647fc253266
+	golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
+	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
+	golang.org/x/tools v0.0.0-20201111133315-69daaf961d65
 	google.golang.org/api v0.32.0
 	google.golang.org/genproto v0.0.0-20200918140846-d0d605568037 // indirect
 	google.golang.org/grpc v1.32.0
diff --git a/go.sum b/go.sum
index 8a908afec..bbf61b351 100644
--- a/go.sum
+++ b/go.sum
@@ -376,6 +376,7 @@ github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-version v1.0.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.1.0 h1:bPIoEKD27tNdebFGGxxYwcL4nepeY4j1QP23PFRGzg0=
 github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
@@ -510,6 +511,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX
 github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4=
 github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/gox v1.0.1 h1:x0jD3dcHk9a9xPSDN6YEL4xL6Qz0dvNYm8yZqui5chI=
+github.com/mitchellh/gox v1.0.1/go.mod h1:ED6BioOGXMswlXa2zxfh/xdd5QhwYliBFn9V18Ap4z4=
 github.com/mitchellh/iochan v1.0.0 h1:C+X3KsSTLFVBr/tK1eYN/vs4rJcvsiLU338UhYPJWeY=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
@@ -753,6 +756,8 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202 h1:VvcQYSHwXgi7W+TpUR6A9g6Up
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974 h1:IX6qOQeG5uLjB/hjjwjedwfjND0hgjPMMyO1RoIXQNI=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -771,6 +776,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03i
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -815,6 +822,8 @@ golang.org/x/sys v0.0.0-20200828194041-157a740278f4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff h1:1CPUrky56AcgSpxz/KfgzQWzfG09u5YOL8MvPYBlrL8=
 golang.org/x/sys v0.0.0-20200918174421-af09f7315aff/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -875,6 +884,8 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u
 golang.org/x/tools v0.0.0-20200915173823-2db8f0ff891c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20200918232735-d647fc253266 h1:k7tVuG0g1JwmD3Jh8oAl1vQ1C3jb4Hi/dUl1wWDBJpQ=
 golang.org/x/tools v0.0.0-20200918232735-d647fc253266/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
+golang.org/x/tools v0.0.0-20201111133315-69daaf961d65 h1:cuDLV0fZoIC/Oj72hGUKPhXR2AvbvJoQKPmSeE5nH4Q=
+golang.org/x/tools v0.0.0-20201111133315-69daaf961d65/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/hcl2template/addrs/doc.go b/hcl2template/addrs/doc.go
new file mode 100644
index 000000000..13c300030
--- /dev/null
+++ b/hcl2template/addrs/doc.go
@@ -0,0 +1,11 @@
+// Package addrs contains types that represent "addresses", which are
+// references to specific objects within a Packer configuration.
+//
+// All addresses have string representations based on HCL traversal syntax
+// which should be used in the user-interface, and also in-memory
+// representations that can be used internally.
+//
+// All types within this package should be treated as immutable, even if this
+// is not enforced by the Go compiler. It is always an implementation error
+// to modify an address object in-place after it is initially constructed.
+package addrs
diff --git a/hcl2template/addrs/input_variable.go b/hcl2template/addrs/input_variable.go
new file mode 100644
index 000000000..ad4370bb8
--- /dev/null
+++ b/hcl2template/addrs/input_variable.go
@@ -0,0 +1,11 @@
+package addrs
+
+// InputVariable is the address of an input variable.
+type InputVariable struct {
+	referenceable
+	Name string
+}
+
+func (v InputVariable) String() string {
+	return "var." + v.Name
+}
diff --git a/hcl2template/addrs/parse_ref.go b/hcl2template/addrs/parse_ref.go
new file mode 100644
index 000000000..ee3f238ef
--- /dev/null
+++ b/hcl2template/addrs/parse_ref.go
@@ -0,0 +1,93 @@
+package addrs
+
+import (
+	"fmt"
+
+	"github.com/hashicorp/hcl/v2"
+)
+
+// Reference describes a reference to an address with source location
+// information.
+type Reference struct {
+	Subject     Referenceable
+	SourceRange hcl.Range
+	Remaining   hcl.Traversal
+}
+
+// ParseRef attempts to extract a referencable address from the prefix of the
+// given traversal, which must be an absolute traversal or this function
+// will panic.
+//
+// If no error diagnostics are returned, the returned reference includes the
+// address that was extracted, the source range it was extracted from, and any
+// remaining relative traversal that was not consumed as part of the
+// reference.
+//
+// If error diagnostics are returned then the Reference value is invalid and
+// must not be used.
+func ParseRef(traversal hcl.Traversal) (*Reference, hcl.Diagnostics) {
+	ref, diags := parseRef(traversal)
+
+	// Normalize a little to make life easier for callers.
+	if ref != nil {
+		if len(ref.Remaining) == 0 {
+			ref.Remaining = nil
+		}
+	}
+
+	return ref, diags
+}
+
+func parseRef(traversal hcl.Traversal) (*Reference, hcl.Diagnostics) {
+	var diags hcl.Diagnostics
+
+	root := traversal.RootName()
+	rootRange := traversal[0].SourceRange()
+
+	switch root {
+
+	case "var":
+		name, rng, remain, diags := parseSingleAttrRef(traversal)
+		return &Reference{
+			Subject:     InputVariable{Name: name},
+			SourceRange: rng,
+			Remaining:   remain,
+		}, diags
+
+	default:
+		diags = append(diags, &hcl.Diagnostic{
+			Severity: hcl.DiagError,
+			Summary:  "Unhandled reference type",
+			Detail:   `Currently parseRef can only parse "var" references.`,
+			Subject:  &rootRange,
+		})
+	}
+	return nil, diags
+}
+
+func parseSingleAttrRef(traversal hcl.Traversal) (string, hcl.Range, hcl.Traversal, hcl.Diagnostics) {
+	var diags hcl.Diagnostics
+
+	root := traversal.RootName()
+	rootRange := traversal[0].SourceRange()
+
+	if len(traversal) < 2 {
+		diags = append(diags, &hcl.Diagnostic{
+			Severity: hcl.DiagError,
+			Summary:  "Invalid reference",
+			Detail:   fmt.Sprintf("The %q object cannot be accessed directly. Instead, access one of its attributes.", root),
+			Subject:  &rootRange,
+		})
+		return "", hcl.Range{}, nil, diags
+	}
+	if attrTrav, ok := traversal[1].(hcl.TraverseAttr); ok {
+		return attrTrav.Name, hcl.RangeBetween(rootRange, attrTrav.SrcRange), traversal[2:], diags
+	}
+	diags = diags.Append(&hcl.Diagnostic{
+		Severity: hcl.DiagError,
+		Summary:  "Invalid reference",
+		Detail:   fmt.Sprintf("The %q object does not support this operation.", root),
+		Subject:  traversal[1].SourceRange().Ptr(),
+	})
+	return "", hcl.Range{}, nil, diags
+}
diff --git a/hcl2template/addrs/referenceable.go b/hcl2template/addrs/referenceable.go
new file mode 100644
index 000000000..8caec1241
--- /dev/null
+++ b/hcl2template/addrs/referenceable.go
@@ -0,0 +1,22 @@
+package addrs
+
+// Referenceable is an interface implemented by all address types that can
+// appear as references in configuration language expressions.
+type Referenceable interface {
+	// referenceableSigil is private to ensure that all Referenceables are
+	// implentented in this current package. For now this does nothing.
+	referenceableSigil()
+
+	// String produces a string representation of the address that could be
+	// parsed as a HCL traversal and passed to ParseRef to produce an identical
+	// result.
+	String() string
+}
+
+// referenceable is an empty struct that implements Referenceable, add it to
+// your Referenceable struct so that it can be recognized as such.
+type referenceable struct {
+}
+
+func (r referenceable) referenceableSigil() {
+}
diff --git a/hcl2template/common_test.go b/hcl2template/common_test.go
index 48eec28fa..ac65ac3e7 100644
--- a/hcl2template/common_test.go
+++ b/hcl2template/common_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/hashicorp/hcl/v2/hclparse"
 	"github.com/hashicorp/packer/builder/null"
 	. "github.com/hashicorp/packer/hcl2template/internal"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -69,53 +69,17 @@ func testParse(t *testing.T, tests []parseTest) {
 			if tt.parseWantDiagHasErrors != gotDiags.HasErrors() {
 				t.Fatalf("Parser.parse() unexpected diagnostics HasErrors. %s", gotDiags)
 			}
-			if diff := cmp.Diff(tt.parseWantCfg, gotCfg,
-				cmpopts.IgnoreUnexported(
-					PackerConfig{},
-					cty.Value{},
-					cty.Type{},
-					Variable{},
-					SourceBlock{},
-					ProvisionerBlock{},
-					PostProcessorBlock{},
-				),
-				cmpopts.IgnoreFields(PackerConfig{},
-					"Cwd", // Cwd will change for every computer
-				),
-				cmpopts.IgnoreTypes(HCL2Ref{}),
-				cmpopts.IgnoreTypes([]*LocalBlock{}),
-				cmpopts.IgnoreTypes([]hcl.Range{}),
-				cmpopts.IgnoreTypes(hcl.Range{}),
-				cmpopts.IgnoreInterfaces(struct{ hcl.Expression }{}),
-				cmpopts.IgnoreInterfaces(struct{ hcl.Body }{}),
-			); diff != "" {
+			if diff := cmp.Diff(tt.parseWantCfg, gotCfg, cmpOpts...); diff != "" {
 				t.Fatalf("Parser.parse() wrong packer config. %s", diff)
 			}
 
 			if gotCfg != nil && !tt.parseWantDiagHasErrors {
-				gotInputVar := gotCfg.InputVariables
-				for name, value := range tt.parseWantCfg.InputVariables {
-					if variable, ok := gotInputVar[name]; ok {
-						if diff := cmp.Diff(variable.DefaultValue.GoString(), value.DefaultValue.GoString()); diff != "" {
-							t.Fatalf("Parser.parse(): unexpected default value for %s: %s", name, diff)
-						}
-						if diff := cmp.Diff(variable.VarfileValue.GoString(), value.VarfileValue.GoString()); diff != "" {
-							t.Fatalf("Parser.parse(): varfile value differs for %s: %s", name, diff)
-						}
-					} else {
-						t.Fatalf("Parser.parse() missing input variable. %s", name)
-					}
+				if diff := cmp.Diff(tt.parseWantCfg.InputVariables, gotCfg.InputVariables, cmpOpts...); diff != "" {
+					t.Fatalf("Parser.parse() unexpected input vars. %s", diff)
 				}
 
-				gotLocalVar := gotCfg.LocalVariables
-				for name, value := range tt.parseWantCfg.LocalVariables {
-					if variable, ok := gotLocalVar[name]; ok {
-						if variable.DefaultValue.GoString() != value.DefaultValue.GoString() {
-							t.Fatalf("Parser.parse() local variable %s expected '%s' but was '%s'", name, value.DefaultValue.GoString(), variable.DefaultValue.GoString())
-						}
-					} else {
-						t.Fatalf("Parser.parse() missing local variable. %s", name)
-					}
+				if diff := cmp.Diff(tt.parseWantCfg.LocalVariables, gotCfg.LocalVariables, cmpOpts...); diff != "" {
+					t.Fatalf("Parser.parse() unexpected local vars. %s", diff)
 				}
 			}
 
@@ -127,18 +91,7 @@ func testParse(t *testing.T, tests []parseTest) {
 			if tt.getBuildsWantDiags == (gotDiags == nil) {
 				t.Fatalf("Parser.getBuilds() unexpected diagnostics. %s", gotDiags)
 			}
-			if diff := cmp.Diff(tt.getBuildsWantBuilds, gotBuilds,
-				cmpopts.IgnoreUnexported(
-					cty.Value{},
-					cty.Type{},
-					packer.CoreBuild{},
-					packer.CoreBuildProvisioner{},
-					packer.CoreBuildPostProcessor{},
-					null.Builder{},
-					HCL2Provisioner{},
-					HCL2PostProcessor{},
-				),
-			); diff != "" {
+			if diff := cmp.Diff(tt.getBuildsWantBuilds, gotBuilds, cmpOpts...); diff != "" {
 				t.Fatalf("Parser.getBuilds() wrong packer builds. %s", diff)
 			}
 		})
@@ -250,3 +203,48 @@ var (
 		},
 	}
 )
+
+var ctyValueComparer = cmp.Comparer(func(x, y cty.Value) bool {
+	return x.RawEquals(y)
+})
+
+var ctyTypeComparer = cmp.Comparer(func(x, y cty.Type) bool {
+	if x == cty.NilType && y == cty.NilType {
+		return true
+	}
+	if x == cty.NilType || y == cty.NilType {
+		return false
+	}
+	return x.Equals(y)
+})
+
+var cmpOpts = []cmp.Option{
+	ctyValueComparer,
+	ctyTypeComparer,
+	cmpopts.IgnoreUnexported(
+		PackerConfig{},
+		Variable{},
+		SourceBlock{},
+		ProvisionerBlock{},
+		PostProcessorBlock{},
+		packer.CoreBuild{},
+		HCL2Provisioner{},
+		HCL2PostProcessor{},
+		packer.CoreBuildPostProcessor{},
+		packer.CoreBuildProvisioner{},
+		packer.CoreBuildPostProcessor{},
+		null.Builder{},
+	),
+	cmpopts.IgnoreFields(PackerConfig{},
+		"Cwd", // Cwd will change for every os type
+	),
+	cmpopts.IgnoreFields(VariableAssignment{},
+		"Expr", // its an interface
+	),
+	cmpopts.IgnoreTypes(HCL2Ref{}),
+	cmpopts.IgnoreTypes([]*LocalBlock{}),
+	cmpopts.IgnoreTypes([]hcl.Range{}),
+	cmpopts.IgnoreTypes(hcl.Range{}),
+	cmpopts.IgnoreInterfaces(struct{ hcl.Expression }{}),
+	cmpopts.IgnoreInterfaces(struct{ hcl.Body }{}),
+}
diff --git a/hcl2template/formatter.go b/hcl2template/formatter.go
new file mode 100644
index 000000000..e6b1c6634
--- /dev/null
+++ b/hcl2template/formatter.go
@@ -0,0 +1,151 @@
+package hcl2template
+
+import (
+	"bytes"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"os/exec"
+
+	"github.com/hashicorp/hcl/v2"
+	"github.com/hashicorp/hcl/v2/hclparse"
+	"github.com/hashicorp/hcl/v2/hclwrite"
+)
+
+type HCL2Formatter struct {
+	ShowDiff, Write bool
+	Output          io.Writer
+	parser          *hclparse.Parser
+}
+
+// NewHCL2Formatter creates a new formatter, ready to format configuration files.
+func NewHCL2Formatter() *HCL2Formatter {
+	return &HCL2Formatter{
+		parser: hclparse.NewParser(),
+	}
+}
+
+// Format all HCL2 files in path and return the total bytes formatted.
+// If any error is encountered, zero bytes will be returned.
+//
+// Path can be a directory or a file.
+func (f *HCL2Formatter) Format(path string) (int, hcl.Diagnostics) {
+	hclFiles, _, diags := GetHCL2Files(path, hcl2FileExt, hcl2JsonFileExt)
+	if diags.HasErrors() {
+		return 0, diags
+	}
+
+	hclVarFiles, _, diags := GetHCL2Files(path, hcl2VarFileExt, hcl2VarJsonFileExt)
+	if diags.HasErrors() {
+		return 0, diags
+	}
+
+	allHclFiles := append(hclFiles, hclVarFiles...)
+
+	if len(allHclFiles) == 0 {
+		diags = append(diags, &hcl.Diagnostic{
+			Severity: hcl.DiagError,
+			Summary:  fmt.Sprintf("Cannot tell whether %s contains HCL2 configuration data", path),
+		})
+
+		return 0, diags
+	}
+
+	if f.parser == nil {
+		f.parser = hclparse.NewParser()
+	}
+
+	var bytesModified int
+	for _, fn := range allHclFiles {
+		data, err := f.processFile(fn)
+		if err != nil {
+			diags = append(diags, &hcl.Diagnostic{
+				Severity: hcl.DiagError,
+				Summary:  fmt.Sprintf("encountered an error while formatting %s", fn),
+				Detail:   err.Error(),
+			})
+		}
+		bytesModified += len(data)
+	}
+
+	return bytesModified, diags
+}
+
+// processFile formats the source contents of filename and return the formatted data.
+// overwriting the contents of the original when the f.Write is true; a diff of the changes
+// will be outputted if f.ShowDiff is true.
+func (f *HCL2Formatter) processFile(filename string) ([]byte, error) {
+	if f.Output == nil {
+		f.Output = os.Stdout
+	}
+
+	in, err := os.Open(filename)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open %s: %s", filename, err)
+	}
+
+	inSrc, err := ioutil.ReadAll(in)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read %s: %s", filename, err)
+	}
+
+	_, diags := f.parser.ParseHCL(inSrc, filename)
+	if diags.HasErrors() {
+		return nil, fmt.Errorf("failed to parse HCL %s", filename)
+	}
+
+	outSrc := hclwrite.Format(inSrc)
+
+	if bytes.Equal(inSrc, outSrc) {
+		return nil, nil
+	}
+
+	s := []byte(fmt.Sprintf("%s\n", filename))
+	_, _ = f.Output.Write(s)
+
+	if f.Write {
+		if err := ioutil.WriteFile(filename, outSrc, 0644); err != nil {
+			return nil, err
+		}
+	}
+
+	if f.ShowDiff {
+		diff, err := bytesDiff(inSrc, outSrc, filename)
+		if err != nil {
+			return outSrc, fmt.Errorf("failed to generate diff for %s: %s", filename, err)
+		}
+		_, _ = f.Output.Write(diff)
+	}
+
+	return outSrc, nil
+}
+
+// bytesDiff returns the unified diff of b1 and b2
+// Shamelessly copied from Terraform's fmt command.
+func bytesDiff(b1, b2 []byte, path string) (data []byte, err error) {
+	f1, err := ioutil.TempFile("", "")
+	if err != nil {
+		return
+	}
+	defer os.Remove(f1.Name())
+	defer f1.Close()
+
+	f2, err := ioutil.TempFile("", "")
+	if err != nil {
+		return
+	}
+	defer os.Remove(f2.Name())
+	defer f2.Close()
+
+	_, _ = f1.Write(b1)
+	_, _ = f2.Write(b2)
+
+	data, err = exec.Command("diff", "--label=old/"+path, "--label=new/"+path, "-u", f1.Name(), f2.Name()).CombinedOutput()
+	if len(data) > 0 {
+		// diff exits with a non-zero status when the files don't match.
+		// Ignore that failure as long as we get output.
+		err = nil
+	}
+	return
+}
diff --git a/hcl2template/formatter_test.go b/hcl2template/formatter_test.go
new file mode 100644
index 000000000..d015884c9
--- /dev/null
+++ b/hcl2template/formatter_test.go
@@ -0,0 +1,110 @@
+package hcl2template
+
+import (
+	"bytes"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+)
+
+func TestHCL2Formatter_Format(t *testing.T) {
+	tt := []struct {
+		Name           string
+		Path           string
+		FormatExpected bool
+	}{
+		{Name: "Unformatted file", Path: "testdata/format/unformatted.pkr.hcl", FormatExpected: true},
+		{Name: "Formatted file", Path: "testdata/format/formatted.pkr.hcl"},
+		{Name: "Directory", Path: "testdata/format", FormatExpected: true},
+	}
+
+	for _, tc := range tt {
+		tc := tc
+		var buf bytes.Buffer
+		f := NewHCL2Formatter()
+		f.Output = &buf
+		_, diags := f.Format(tc.Path)
+		if diags.HasErrors() {
+			t.Fatalf("the call to Format failed unexpectedly %s", diags.Error())
+		}
+
+		if buf.String() != "" && tc.FormatExpected == false {
+			t.Errorf("Format(%q) should contain the name of the formatted file(s), but got %q", tc.Path, buf.String())
+		}
+
+	}
+}
+
+func TestHCL2Formatter_Format_Write(t *testing.T) {
+
+	var buf bytes.Buffer
+	f := NewHCL2Formatter()
+	f.Output = &buf
+	f.Write = true
+
+	unformattedData, err := ioutil.ReadFile("testdata/format/unformatted.pkr.hcl")
+	if err != nil {
+		t.Fatalf("failed to open the unformatted fixture %s", err)
+	}
+
+	tf, err := ioutil.TempFile("", "*.pkr.hcl")
+	if err != nil {
+		t.Fatalf("failed to create tempfile for test %s", err)
+	}
+	defer os.Remove(tf.Name())
+
+	_, _ = tf.Write(unformattedData)
+	tf.Close()
+
+	_, diags := f.Format(tf.Name())
+	if diags.HasErrors() {
+		t.Fatalf("the call to Format failed unexpectedly %s", diags.Error())
+	}
+
+	//lets re-read the tempfile which should now be formatted
+	data, err := ioutil.ReadFile(tf.Name())
+	if err != nil {
+		t.Fatalf("failed to open the newly formatted fixture %s", err)
+	}
+
+	formattedData, err := ioutil.ReadFile("testdata/format/formatted.pkr.hcl")
+	if err != nil {
+		t.Fatalf("failed to open the formatted fixture %s", err)
+	}
+
+	if diff := cmp.Diff(string(data), string(formattedData)); diff != "" {
+		t.Errorf("Unexpected format output %s", diff)
+	}
+}
+
+func TestHCL2Formatter_Format_ShowDiff(t *testing.T) {
+
+	if _, err := exec.LookPath("diff"); err != nil {
+		t.Skip("Skipping test because diff is not in the executable PATH")
+	}
+
+	var buf bytes.Buffer
+	f := HCL2Formatter{
+		Output:   &buf,
+		ShowDiff: true,
+	}
+
+	_, diags := f.Format("testdata/format/unformatted.pkr.hcl")
+	if diags.HasErrors() {
+		t.Fatalf("the call to Format failed unexpectedly %s", diags.Error())
+	}
+
+	diffHeader := `
+--- old/testdata/format/unformatted.pkr.hcl
++++ new/testdata/format/unformatted.pkr.hcl
+@@ -1,149 +1,149 @@
+`
+	if !strings.Contains(buf.String(), diffHeader) {
+		t.Errorf("expected buf to contain a file diff, but instead we got %s", buf.String())
+	}
+
+}
diff --git a/hcl2template/function/Consul.go b/hcl2template/function/Consul.go
index 4fc81a1e0..7690759b8 100644
--- a/hcl2template/function/Consul.go
+++ b/hcl2template/function/Consul.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 
-	commontpl "github.com/hashicorp/packer/common/template"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // ConsulFunc constructs a function that retrieves KV secrets from HC vault
diff --git a/hcl2template/function/aws_secretetkey.go b/hcl2template/function/aws_secretetkey.go
index a76482464..24ec6053f 100644
--- a/hcl2template/function/aws_secretetkey.go
+++ b/hcl2template/function/aws_secretetkey.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 
-	commontpl "github.com/hashicorp/packer/common/template"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // AWSSecret constructs a function that retrieves secrets from aws secrets
diff --git a/hcl2template/function/env.go b/hcl2template/function/env.go
new file mode 100644
index 000000000..98eac11cc
--- /dev/null
+++ b/hcl2template/function/env.go
@@ -0,0 +1,32 @@
+package function
+
+import (
+	"os"
+
+	"github.com/zclconf/go-cty/cty"
+	"github.com/zclconf/go-cty/cty/function"
+)
+
+// EnvFunc constructs a function that returns a string representation of the
+// env var behind a value
+var EnvFunc = function.New(&function.Spec{
+	Params: []function.Parameter{
+		{
+			Name:         "key",
+			Type:         cty.String,
+			AllowNull:    false,
+			AllowUnknown: false,
+		},
+	},
+	Type: function.StaticReturnType(cty.String),
+	Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
+		key := args[0].AsString()
+		value := os.Getenv(key)
+		return cty.StringVal(value), nil
+	},
+})
+
+// Env returns a string representation of the env var behind key.
+func Env(key cty.Value) (cty.Value, error) {
+	return EnvFunc.Call([]cty.Value{key})
+}
diff --git a/hcl2template/function/length.go b/hcl2template/function/length.go
new file mode 100644
index 000000000..c1a1e8862
--- /dev/null
+++ b/hcl2template/function/length.go
@@ -0,0 +1,59 @@
+package function
+
+import (
+	"errors"
+
+	"github.com/zclconf/go-cty/cty"
+	"github.com/zclconf/go-cty/cty/function"
+	"github.com/zclconf/go-cty/cty/function/stdlib"
+)
+
+var LengthFunc = function.New(&function.Spec{
+	Params: []function.Parameter{
+		{
+			Name:             "value",
+			Type:             cty.DynamicPseudoType,
+			AllowDynamicType: true,
+			AllowUnknown:     true,
+		},
+	},
+	Type: func(args []cty.Value) (cty.Type, error) {
+		collTy := args[0].Type()
+		switch {
+		case collTy == cty.String || collTy.IsTupleType() || collTy.IsObjectType() || collTy.IsListType() || collTy.IsMapType() || collTy.IsSetType() || collTy == cty.DynamicPseudoType:
+			return cty.Number, nil
+		default:
+			return cty.Number, errors.New("argument must be a string, a collection type, or a structural type")
+		}
+	},
+	Impl: func(args []cty.Value, retType cty.Type) (cty.Value, error) {
+		coll := args[0]
+		collTy := args[0].Type()
+		switch {
+		case collTy == cty.DynamicPseudoType:
+			return cty.UnknownVal(cty.Number), nil
+		case collTy.IsTupleType():
+			l := len(collTy.TupleElementTypes())
+			return cty.NumberIntVal(int64(l)), nil
+		case collTy.IsObjectType():
+			l := len(collTy.AttributeTypes())
+			return cty.NumberIntVal(int64(l)), nil
+		case collTy == cty.String:
+			// We'll delegate to the cty stdlib strlen function here, because
+			// it deals with all of the complexities of tokenizing unicode
+			// grapheme clusters.
+			return stdlib.Strlen(coll)
+		case collTy.IsListType() || collTy.IsSetType() || collTy.IsMapType():
+			return coll.Length(), nil
+		default:
+			// Should never happen, because of the checks in our Type func above
+			return cty.UnknownVal(cty.Number), errors.New("impossible value type for length(...)")
+		}
+	},
+})
+
+// Length returns the number of elements in the given collection or number of
+// Unicode characters in the given string.
+func Length(collection cty.Value) (cty.Value, error) {
+	return LengthFunc.Call([]cty.Value{collection})
+}
diff --git a/hcl2template/function/length_test.go b/hcl2template/function/length_test.go
new file mode 100644
index 000000000..5b217a00a
--- /dev/null
+++ b/hcl2template/function/length_test.go
@@ -0,0 +1,139 @@
+package function
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/zclconf/go-cty/cty"
+)
+
+func TestLength(t *testing.T) {
+	tests := []struct {
+		Value cty.Value
+		Want  cty.Value
+	}{
+		{
+			cty.ListValEmpty(cty.Number),
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.ListVal([]cty.Value{cty.True}),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.ListVal([]cty.Value{cty.UnknownVal(cty.Bool)}),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.SetValEmpty(cty.Number),
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.SetVal([]cty.Value{cty.True}),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.MapValEmpty(cty.Bool),
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.MapVal(map[string]cty.Value{"hello": cty.True}),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.EmptyTupleVal,
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.UnknownVal(cty.EmptyTuple),
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.TupleVal([]cty.Value{cty.True}),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.EmptyObjectVal,
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.UnknownVal(cty.EmptyObject),
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.ObjectVal(map[string]cty.Value{"true": cty.True}),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.UnknownVal(cty.List(cty.Bool)),
+			cty.UnknownVal(cty.Number),
+		},
+		{
+			cty.DynamicVal,
+			cty.UnknownVal(cty.Number),
+		},
+		{
+			cty.StringVal("hello"),
+			cty.NumberIntVal(5),
+		},
+		{
+			cty.StringVal(""),
+			cty.NumberIntVal(0),
+		},
+		{
+			cty.StringVal("1"),
+			cty.NumberIntVal(1),
+		},
+		{
+			cty.StringVal("Живой Журнал"),
+			cty.NumberIntVal(12),
+		},
+		{
+			// note that the dieresis here is intentionally a combining
+			// ligature.
+			cty.StringVal("noël"),
+			cty.NumberIntVal(4),
+		},
+		{
+			// The Es in this string has three combining acute accents.
+			// This tests something that NFC-normalization cannot collapse
+			// into a single precombined codepoint, since otherwise we might
+			// be cheating and relying on the single-codepoint forms.
+			cty.StringVal("wé́́é́́é́́!"),
+			cty.NumberIntVal(5),
+		},
+		{
+			// Go's normalization forms don't handle this ligature, so we
+			// will produce the wrong result but this is now a compatibility
+			// constraint and so we'll test it.
+			cty.StringVal("baffle"),
+			cty.NumberIntVal(4),
+		},
+		{
+			cty.StringVal("😸😾"),
+			cty.NumberIntVal(2),
+		},
+		{
+			cty.UnknownVal(cty.String),
+			cty.UnknownVal(cty.Number),
+		},
+		{
+			cty.DynamicVal,
+			cty.UnknownVal(cty.Number),
+		},
+	}
+
+	for _, test := range tests {
+		t.Run(fmt.Sprintf("Length(%#v)", test.Value), func(t *testing.T) {
+			got, err := Length(test.Value)
+
+			if err != nil {
+				t.Fatalf("unexpected error: %s", err)
+			}
+
+			if !got.RawEquals(test.Want) {
+				t.Errorf("wrong result\ngot:  %#v\nwant: %#v", got, test.Want)
+			}
+		})
+	}
+}
diff --git a/hcl2template/function/vault.go b/hcl2template/function/vault.go
index 6bec45935..baedf2c37 100644
--- a/hcl2template/function/vault.go
+++ b/hcl2template/function/vault.go
@@ -4,7 +4,7 @@ import (
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/function"
 
-	commontpl "github.com/hashicorp/packer/common/template"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // VaultFunc constructs a function that retrieves KV secrets from HC vault
diff --git a/hcl2template/functions.go b/hcl2template/functions.go
index f91abdab7..058a3f8da 100644
--- a/hcl2template/functions.go
+++ b/hcl2template/functions.go
@@ -68,7 +68,7 @@ func Functions(basedir string) map[string]function.Function {
 		"jsondecode":         stdlib.JSONDecodeFunc,
 		"jsonencode":         stdlib.JSONEncodeFunc,
 		"keys":               stdlib.KeysFunc,
-		"length":             stdlib.LengthFunc,
+		"length":             pkrfunction.LengthFunc,
 		"log":                stdlib.LogFunc,
 		"lookup":             stdlib.LookupFunc,
 		"lower":              stdlib.LowerFunc,
diff --git a/hcl2template/internal/mock.go b/hcl2template/internal/mock.go
index bf746ed5c..8b1dff62c 100644
--- a/hcl2template/internal/mock.go
+++ b/hcl2template/internal/mock.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/json"
 )
diff --git a/hcl2template/parser.go b/hcl2template/parser.go
index 409157f02..2a856a16f 100644
--- a/hcl2template/parser.go
+++ b/hcl2template/parser.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/ext/dynblock"
 	"github.com/hashicorp/hcl/v2/hclparse"
@@ -47,6 +48,10 @@ var packerBlockSchema = &hcl.BodySchema{
 // the parsed HCL and then return a []packer.Build. Packer will use that list
 // of Builds to run everything in order.
 type Parser struct {
+	CorePackerVersion *version.Version
+
+	CorePackerVersionString string
+
 	*hclparse.Parser
 
 	BuilderSchemas packer.BuilderStore
@@ -115,13 +120,14 @@ func (p *Parser) Parse(filename string, varFiles []string, argVars map[string]st
 		})
 	}
 	cfg := &PackerConfig{
-		Basedir:               basedir,
-		Cwd:                   wd,
-		builderSchemas:        p.BuilderSchemas,
-		provisionersSchemas:   p.ProvisionersSchemas,
-		postProcessorsSchemas: p.PostProcessorsSchemas,
-		parser:                p,
-		files:                 files,
+		Basedir:                 basedir,
+		Cwd:                     wd,
+		CorePackerVersionString: p.CorePackerVersionString,
+		builderSchemas:          p.BuilderSchemas,
+		provisionersSchemas:     p.ProvisionersSchemas,
+		postProcessorsSchemas:   p.PostProcessorsSchemas,
+		parser:                  p,
+		files:                   files,
 	}
 
 	for _, file := range files {
@@ -133,7 +139,7 @@ func (p *Parser) Parse(filename string, varFiles []string, argVars map[string]st
 	// Before we go further, we'll check to make sure this version can read
 	// that file, so we can produce a version-related error message rather than
 	// potentially-confusing downstream errors.
-	versionDiags := cfg.CheckCoreVersionRequirements()
+	versionDiags := cfg.CheckCoreVersionRequirements(p.CorePackerVersion)
 	diags = append(diags, versionDiags...)
 	if versionDiags.HasErrors() {
 		return cfg, diags
diff --git a/hcl2template/testdata/format/formatted.pkr.hcl b/hcl2template/testdata/format/formatted.pkr.hcl
new file mode 100644
index 000000000..17a84d81c
--- /dev/null
+++ b/hcl2template/testdata/format/formatted.pkr.hcl
@@ -0,0 +1,149 @@
+
+// starts resources to provision them.
+build {
+  sources = [
+    "source.amazon-ebs.ubuntu-1604",
+    "source.virtualbox-iso.ubuntu-1204",
+  ]
+
+  provisioner "shell" {
+    string   = coalesce(null, "", "string")
+    int      = "${41 + 1}"
+    int64    = "${42 + 1}"
+    bool     = "true"
+    trilean  = true
+    duration = "${9 + 1}s"
+    map_string_string = {
+      a = "b"
+      c = "d"
+    }
+    slice_string = [
+      "a",
+      "b",
+      "c",
+    ]
+    slice_slice_string = [
+      ["a", "b"],
+      ["c", "d"]
+    ]
+
+    nested {
+      string   = "string"
+      int      = 42
+      int64    = 43
+      bool     = true
+      trilean  = true
+      duration = "10s"
+      map_string_string = {
+        a = "b"
+        c = "d"
+      }
+      slice_string = [
+        "a",
+        "b",
+        "c",
+      ]
+      slice_slice_string = [
+        ["a", "b"],
+        ["c", "d"]
+      ]
+    }
+
+    nested_slice {
+    }
+  }
+
+  provisioner "file" {
+    string   = "string"
+    int      = 42
+    int64    = 43
+    bool     = true
+    trilean  = true
+    duration = "10s"
+    map_string_string = {
+      a = "b"
+      c = "d"
+    }
+    slice_string = [
+      "a",
+      "b",
+      "c",
+    ]
+    slice_slice_string = [
+      ["a", "b"],
+      ["c", "d"]
+    ]
+
+    nested {
+      string   = "string"
+      int      = 42
+      int64    = 43
+      bool     = true
+      trilean  = true
+      duration = "10s"
+      map_string_string = {
+        a = "b"
+        c = "d"
+      }
+      slice_string = [
+        "a",
+        "b",
+        "c",
+      ]
+      slice_slice_string = [
+        ["a", "b"],
+        ["c", "d"]
+      ]
+    }
+
+    nested_slice {
+    }
+  }
+
+  post-processor "amazon-import" {
+    string   = "string"
+    int      = 42
+    int64    = 43
+    bool     = true
+    trilean  = true
+    duration = "10s"
+    map_string_string = {
+      a = "b"
+      c = "d"
+    }
+    slice_string = [
+      "a",
+      "b",
+      "c",
+    ]
+    slice_slice_string = [
+      ["a", "b"],
+      ["c", "d"]
+    ]
+
+    nested {
+      string   = "string"
+      int      = 42
+      int64    = 43
+      bool     = true
+      trilean  = true
+      duration = "10s"
+      map_string_string = {
+        a = "b"
+        c = "d"
+      }
+      slice_string = [
+        "a",
+        "b",
+        "c",
+      ]
+      slice_slice_string = [
+        ["a", "b"],
+        ["c", "d"]
+      ]
+    }
+
+    nested_slice {
+    }
+  }
+}
diff --git a/hcl2template/testdata/format/unformatted.pkr.hcl b/hcl2template/testdata/format/unformatted.pkr.hcl
new file mode 100644
index 000000000..86aa3a154
--- /dev/null
+++ b/hcl2template/testdata/format/unformatted.pkr.hcl
@@ -0,0 +1,149 @@
+
+// starts resources to provision them.
+build {
+    sources = [
+        "source.amazon-ebs.ubuntu-1604",
+        "source.virtualbox-iso.ubuntu-1204",
+    ]
+
+    provisioner "shell" {
+        string  = coalesce(null, "", "string")
+        int     = "${41 + 1}"
+        int64   = "${42 + 1}"
+        bool    = "true"
+        trilean = true
+        duration = "${9 + 1}s"
+        map_string_string = {
+            a = "b"
+            c = "d"
+        }
+        slice_string = [
+            "a",
+            "b",
+            "c",
+        ]
+        slice_slice_string = [
+            ["a","b"],
+            ["c","d"]
+        ]
+
+        nested {
+            string  = "string"
+            int     = 42
+            int64   = 43
+            bool    = true
+            trilean = true
+            duration = "10s"
+            map_string_string = {
+                a = "b"
+                c = "d"
+            }
+            slice_string = [
+                "a",
+                "b",
+                "c",
+            ]
+            slice_slice_string = [
+                ["a","b"],
+                ["c","d"]
+            ]
+        }
+
+        nested_slice {
+        }
+    }
+
+    provisioner "file" {
+        string  = "string"
+        int     = 42
+        int64   = 43
+        bool    = true
+        trilean = true
+        duration          = "10s"
+        map_string_string = {
+            a = "b"
+            c = "d"
+        }
+        slice_string = [
+            "a",
+            "b",
+            "c",
+        ]
+        slice_slice_string = [
+            ["a","b"],
+            ["c","d"]
+        ]
+
+        nested {
+            string   = "string"
+            int      = 42
+            int64    = 43
+            bool     = true
+            trilean  = true
+            duration = "10s"
+            map_string_string = {
+                a = "b"
+                c = "d"
+            }
+            slice_string = [
+                "a",
+                "b",
+                "c",
+            ]
+            slice_slice_string = [
+                ["a","b"],
+                ["c","d"]
+            ]
+        }
+
+        nested_slice {
+        }
+    }
+
+    post-processor "amazon-import" {
+        string   = "string"
+        int      = 42
+        int64    = 43
+        bool     = true
+        trilean  = true
+        duration = "10s"
+        map_string_string = {
+            a = "b"
+            c = "d"
+        }
+        slice_string = [
+            "a",
+            "b",
+            "c",
+        ]
+        slice_slice_string = [
+            ["a","b"],
+            ["c","d"]
+        ]
+
+        nested {
+            string   = "string"
+            int      = 42
+            int64    = 43
+            bool     = true
+            trilean  = true
+            duration = "10s"
+            map_string_string = {
+                a = "b"
+                c = "d"
+            }
+            slice_string = [
+                "a",
+                "b",
+                "c",
+            ]
+            slice_slice_string = [
+                ["a","b"],
+                ["c","d"]
+            ]
+        }
+
+        nested_slice {
+        }
+    }
+}
diff --git a/hcl2template/testdata/variables/validation/invalid_default.pkr.hcl b/hcl2template/testdata/variables/validation/invalid_default.pkr.hcl
new file mode 100644
index 000000000..4fafe369f
--- /dev/null
+++ b/hcl2template/testdata/variables/validation/invalid_default.pkr.hcl
@@ -0,0 +1,9 @@
+
+variable "image_id" {
+  type    = string
+  default = "potato"
+  validation {
+    condition     = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-"
+    error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"."
+  }
+}
diff --git a/hcl2template/testdata/variables/validation/valid.pkr.hcl b/hcl2template/testdata/variables/validation/valid.pkr.hcl
new file mode 100644
index 000000000..e17aa7193
--- /dev/null
+++ b/hcl2template/testdata/variables/validation/valid.pkr.hcl
@@ -0,0 +1,9 @@
+
+variable "image_id" {
+  type    = string
+  default = "ami-something-something"
+  validation {
+    condition     = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-"
+    error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"."
+  }
+}
diff --git a/hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl b/hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl
new file mode 100644
index 000000000..f095e9062
--- /dev/null
+++ b/hcl2template/testdata/variables/validation/valid_map/definition.pkr.hcl
@@ -0,0 +1,17 @@
+
+variable "image_metadata" {
+  default = {
+    key: "value",
+    something: { 
+      foo: "bar",
+    }
+  }
+  validation {
+    condition     = length(var.image_metadata.key) > 4
+    error_message = "The image_metadata.key field must be more than 4 runes."
+  }
+  validation {
+    condition     = substr(var.image_metadata.something.foo, 0, 3) == "bar"
+    error_message = "The image_metadata.something.foo field must start with \"bar\"."
+  }
+}
diff --git a/hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl b/hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl
new file mode 100644
index 000000000..9734f36f6
--- /dev/null
+++ b/hcl2template/testdata/variables/validation/valid_map/invalid_value.auto.pkrvars.hcl
@@ -0,0 +1,7 @@
+
+image_metadata = {
+  key: "value",
+  something: { 
+    foo: "woo",
+  }
+}
diff --git a/hcl2template/types.packer_config.go b/hcl2template/types.packer_config.go
index c62436725..d99a9d89d 100644
--- a/hcl2template/types.packer_config.go
+++ b/hcl2template/types.packer_config.go
@@ -8,9 +8,10 @@ import (
 	"github.com/gobwas/glob"
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
+	pkrfunction "github.com/hashicorp/packer/hcl2template/function"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/version"
 	"github.com/zclconf/go-cty/cty"
+	"github.com/zclconf/go-cty/cty/function"
 )
 
 // PackerConfig represents a loaded Packer HCL config. It will contain
@@ -21,6 +22,10 @@ type PackerConfig struct {
 	}
 	// Directory where the config files are defined
 	Basedir string
+
+	// Core Packer version, for reference by plugins and template functions.
+	CorePackerVersionString string
+
 	// directory Packer was called from
 	Cwd string
 
@@ -84,7 +89,7 @@ func (cfg *PackerConfig) EvalContext(variables map[string]cty.Value) *hcl.EvalCo
 			}),
 			buildAccessor: cty.UnknownVal(cty.EmptyObject),
 			packerAccessor: cty.ObjectVal(map[string]cty.Value{
-				"version": cty.StringVal(version.FormattedVersion()),
+				"version": cty.StringVal(cfg.CorePackerVersionString),
 			}),
 			pathVariablesAccessor: cty.ObjectVal(map[string]cty.Value{
 				"cwd":  cty.StringVal(strings.ReplaceAll(cfg.Cwd, `\`, `/`)),
@@ -107,16 +112,23 @@ func (c *PackerConfig) decodeInputVariables(f *hcl.File) hcl.Diagnostics {
 	content, moreDiags := f.Body.Content(configSchema)
 	diags = append(diags, moreDiags...)
 
+	// for input variables we allow to use env in the default value section.
+	ectx := &hcl.EvalContext{
+		Functions: map[string]function.Function{
+			"env": pkrfunction.EnvFunc,
+		},
+	}
+
 	for _, block := range content.Blocks {
 		switch block.Type {
 		case variableLabel:
-			moreDiags := c.InputVariables.decodeVariableBlock(block, nil)
+			moreDiags := c.InputVariables.decodeVariableBlock(block, ectx)
 			diags = append(diags, moreDiags...)
 		case variablesLabel:
 			attrs, moreDiags := block.Body.JustAttributes()
 			diags = append(diags, moreDiags...)
 			for key, attr := range attrs {
-				moreDiags = c.InputVariables.decodeVariable(key, attr, nil)
+				moreDiags = c.InputVariables.decodeVariable(key, attr, ectx)
 				diags = append(diags, moreDiags...)
 			}
 		}
@@ -210,9 +222,13 @@ func (c *PackerConfig) evaluateLocalVariable(local *LocalBlock) hcl.Diagnostics
 		return diags
 	}
 	c.LocalVariables[local.Name] = &Variable{
-		Name:         local.Name,
-		DefaultValue: value,
-		Type:         value.Type(),
+		Name: local.Name,
+		Values: []VariableAssignment{{
+			Value: value,
+			Expr:  local.Expr,
+			From:  "default",
+		}},
+		Type: value.Type(),
 	}
 
 	return diags
diff --git a/hcl2template/types.packer_config_test.go b/hcl2template/types.packer_config_test.go
index 90498c172..662026da1 100644
--- a/hcl2template/types.packer_config_test.go
+++ b/hcl2template/types.packer_config_test.go
@@ -25,49 +25,76 @@ func TestParser_complete(t *testing.T) {
 				Basedir: "testdata/complete",
 				InputVariables: Variables{
 					"foo": &Variable{
-						Name:         "foo",
-						DefaultValue: cty.StringVal("value"),
+						Name:   "foo",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value")}},
+						Type:   cty.String,
 					},
 					"image_id": &Variable{
-						Name:         "image_id",
-						DefaultValue: cty.StringVal("image-id-default"),
+						Name:   "image_id",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("image-id-default")}},
+						Type:   cty.String,
 					},
 					"port": &Variable{
-						Name:         "port",
-						DefaultValue: cty.NumberIntVal(42),
+						Name:   "port",
+						Values: []VariableAssignment{{From: "default", Value: cty.NumberIntVal(42)}},
+						Type:   cty.Number,
 					},
 					"availability_zone_names": &Variable{
 						Name: "availability_zone_names",
-						DefaultValue: cty.ListVal([]cty.Value{
-							cty.StringVal("A"),
-							cty.StringVal("B"),
-							cty.StringVal("C"),
-						}),
+						Values: []VariableAssignment{{
+							From: "default",
+							Value: cty.ListVal([]cty.Value{
+								cty.StringVal("A"),
+								cty.StringVal("B"),
+								cty.StringVal("C"),
+							}),
+						}},
+						Type: cty.List(cty.String),
 					},
 				},
 				LocalVariables: Variables{
 					"feefoo": &Variable{
-						Name:         "feefoo",
-						DefaultValue: cty.StringVal("value_image-id-default"),
+						Name:   "feefoo",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value_image-id-default")}},
+						Type:   cty.String,
 					},
 					"standard_tags": &Variable{
 						Name: "standard_tags",
-						DefaultValue: cty.ObjectVal(map[string]cty.Value{
-							"Component":   cty.StringVal("user-service"),
-							"Environment": cty.StringVal("production"),
+						Values: []VariableAssignment{{From: "default",
+							Value: cty.ObjectVal(map[string]cty.Value{
+								"Component":   cty.StringVal("user-service"),
+								"Environment": cty.StringVal("production"),
+							}),
+						}},
+						Type: cty.Object(map[string]cty.Type{
+							"Component":   cty.String,
+							"Environment": cty.String,
 						}),
 					},
 					"abc_map": &Variable{
 						Name: "abc_map",
-						DefaultValue: cty.TupleVal([]cty.Value{
-							cty.ObjectVal(map[string]cty.Value{
-								"id": cty.StringVal("a"),
+						Values: []VariableAssignment{{From: "default",
+							Value: cty.TupleVal([]cty.Value{
+								cty.ObjectVal(map[string]cty.Value{
+									"id": cty.StringVal("a"),
+								}),
+								cty.ObjectVal(map[string]cty.Value{
+									"id": cty.StringVal("b"),
+								}),
+								cty.ObjectVal(map[string]cty.Value{
+									"id": cty.StringVal("c"),
+								}),
 							}),
-							cty.ObjectVal(map[string]cty.Value{
-								"id": cty.StringVal("b"),
+						}},
+						Type: cty.Tuple([]cty.Type{
+							cty.Object(map[string]cty.Type{
+								"id": cty.String,
 							}),
-							cty.ObjectVal(map[string]cty.Value{
-								"id": cty.StringVal("c"),
+							cty.Object(map[string]cty.Type{
+								"id": cty.String,
+							}),
+							cty.Object(map[string]cty.Type{
+								"id": cty.String,
 							}),
 						}),
 					},
diff --git a/hcl2template/types.variables.go b/hcl2template/types.variables.go
index 2598eacfc..ede4a014c 100644
--- a/hcl2template/types.variables.go
+++ b/hcl2template/types.variables.go
@@ -2,16 +2,22 @@ package hcl2template
 
 import (
 	"fmt"
+	"log"
 	"strings"
+	"unicode"
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/ext/typeexpr"
 	"github.com/hashicorp/hcl/v2/gohcl"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
+	"github.com/hashicorp/packer/hcl2template/addrs"
 	"github.com/zclconf/go-cty/cty"
 	"github.com/zclconf/go-cty/cty/convert"
 )
 
+// A consistent detail message for all "not a valid identifier" diagnostics.
+const badIdentifierDetail = "A name must start with a letter or underscore and may contain only letters, digits, underscores, and dashes."
+
 // Local represents a single entry from a "locals" block in a file.
 // The "locals" block itself is not represented, because it serves only to
 // provide context for us to interpret its contents.
@@ -20,15 +26,26 @@ type LocalBlock struct {
 	Expr hcl.Expression
 }
 
+// VariableAssignment represents a way a variable was set: the expression
+// setting it and the value of that expression. It helps pinpoint were
+// something was set in diagnostics.
+type VariableAssignment struct {
+	// From tells were it was taken from, command/varfile/env/default
+	From  string
+	Value cty.Value
+	Expr  hcl.Expression
+}
+
 type Variable struct {
-	// CmdValue, VarfileValue, EnvValue, DefaultValue are possible values of
-	// the variable; The first value set from these will be the one used. If
-	// none is set; an error will be returned if a user tries to use the
-	// Variable.
-	CmdValue     cty.Value
-	VarfileValue cty.Value
-	EnvValue     cty.Value
-	DefaultValue cty.Value
+	// Values contains possible values for the variable; The last value set
+	// from these will be the one used. If none is set; an error will be
+	// returned by Value().
+	Values []VariableAssignment
+
+	// Validations contains all variables validation rules to be applied to the
+	// used value. Only the used value - the last value from Values - is
+	// validated.
+	Validations []*VariableValidation
 
 	// Cty Type of the variable. If the default value or a collected value is
 	// not of this type nor can be converted to this type an error diagnostic
@@ -51,35 +68,101 @@ type Variable struct {
 }
 
 func (v *Variable) GoString() string {
-	return fmt.Sprintf("{Type:%s,CmdValue:%s,VarfileValue:%s,EnvValue:%s,DefaultValue:%s}",
-		v.Type.GoString(),
-		PrintableCtyValue(v.CmdValue),
-		PrintableCtyValue(v.VarfileValue),
-		PrintableCtyValue(v.EnvValue),
-		PrintableCtyValue(v.DefaultValue),
-	)
+	b := &strings.Builder{}
+	fmt.Fprintf(b, "{type:%s", v.Type.GoString())
+	for _, vv := range v.Values {
+		fmt.Fprintf(b, ",%s:%s", vv.From, vv.Value)
+	}
+	fmt.Fprintf(b, "}")
+	return b.String()
 }
 
-func (v *Variable) Value() (cty.Value, *hcl.Diagnostic) {
-	for _, value := range []cty.Value{
-		v.CmdValue,
-		v.VarfileValue,
-		v.EnvValue,
-		v.DefaultValue,
-	} {
-		if value != cty.NilVal {
-			return value, nil
+// validateValue ensures that all of the configured custom validations for a
+// variable value are passing.
+//
+func (v *Variable) validateValue(val VariableAssignment) (diags hcl.Diagnostics) {
+	if len(v.Validations) == 0 {
+		log.Printf("[TRACE] validateValue: not active for %s, so skipping", v.Name)
+		return nil
+	}
+
+	hclCtx := &hcl.EvalContext{
+		Variables: map[string]cty.Value{
+			"var": cty.ObjectVal(map[string]cty.Value{
+				v.Name: val.Value,
+			}),
+		},
+		Functions: Functions(""),
+	}
+
+	for _, validation := range v.Validations {
+		const errInvalidCondition = "Invalid variable validation result"
+
+		result, moreDiags := validation.Condition.Value(hclCtx)
+		diags = append(diags, moreDiags...)
+		if moreDiags.HasErrors() {
+			log.Printf("[TRACE] evalVariableValidations: %s rule %s condition expression failed: %s", v.Name, validation.DeclRange, moreDiags.Error())
+		}
+		if !result.IsKnown() {
+			log.Printf("[TRACE] evalVariableValidations: %s rule %s condition value is unknown, so skipping validation for now", v.Name, validation.DeclRange)
+			continue // We'll wait until we've learned more, then.
+		}
+		if result.IsNull() {
+			diags = append(diags, &hcl.Diagnostic{
+				Severity:    hcl.DiagError,
+				Summary:     errInvalidCondition,
+				Detail:      "Validation condition expression must return either true or false, not null.",
+				Subject:     validation.Condition.Range().Ptr(),
+				Expression:  validation.Condition,
+				EvalContext: hclCtx,
+			})
+			continue
+		}
+		var err error
+		result, err = convert.Convert(result, cty.Bool)
+		if err != nil {
+			diags = append(diags, &hcl.Diagnostic{
+				Severity:    hcl.DiagError,
+				Summary:     errInvalidCondition,
+				Detail:      fmt.Sprintf("Invalid validation condition result value: %s.", err),
+				Subject:     validation.Condition.Range().Ptr(),
+				Expression:  validation.Condition,
+				EvalContext: hclCtx,
+			})
+			continue
+		}
+
+		if result.False() {
+			subj := validation.DeclRange.Ptr()
+			if val.Expr != nil {
+				subj = val.Expr.Range().Ptr()
+			}
+			diags = append(diags, &hcl.Diagnostic{
+				Severity: hcl.DiagError,
+				Summary:  fmt.Sprintf("Invalid value for %s variable", val.From),
+				Detail:   fmt.Sprintf("%s\n\nThis was checked by the validation rule at %s.", validation.ErrorMessage, validation.DeclRange.String()),
+				Subject:  subj,
+			})
 		}
 	}
 
-	return cty.UnknownVal(v.Type), &hcl.Diagnostic{
-		Severity: hcl.DiagError,
-		Summary:  fmt.Sprintf("Unset variable %q", v.Name),
-		Detail: "A used variable must be set or have a default value; see " +
-			"https://packer.io/docs/configuration/from-1.5/syntax for " +
-			"details.",
-		Context: v.Range.Ptr(),
+	return diags
+}
+
+// Value returns the last found value from the list of variable settings.
+func (v *Variable) Value() (cty.Value, hcl.Diagnostics) {
+	if len(v.Values) == 0 {
+		return cty.UnknownVal(v.Type), hcl.Diagnostics{&hcl.Diagnostic{
+			Severity: hcl.DiagError,
+			Summary:  fmt.Sprintf("Unset variable %q", v.Name),
+			Detail: "A used variable must be set or have a default value; see " +
+				"https://packer.io/docs/configuration/from-1.5/syntax for " +
+				"details.",
+			Context: v.Range.Ptr(),
+		}}
 	}
+	val := v.Values[len(v.Values)-1]
+	return val.Value, v.validateValue(v.Values[len(v.Values)-1])
 }
 
 type Variables map[string]*Variable
@@ -96,10 +179,8 @@ func (variables Variables) Values() (map[string]cty.Value, hcl.Diagnostics) {
 	res := map[string]cty.Value{}
 	var diags hcl.Diagnostics
 	for k, v := range variables {
-		value, diag := v.Value()
-		if diag != nil {
-			diags = append(diags, diag)
-		}
+		value, moreDiags := v.Value()
+		diags = append(diags, moreDiags...)
 		res[k] = value
 	}
 	return res, diags
@@ -130,16 +211,43 @@ func (variables *Variables) decodeVariable(key string, attr *hcl.Attribute, ectx
 	}
 
 	(*variables)[key] = &Variable{
-		Name:         key,
-		DefaultValue: value,
-		Type:         value.Type(),
-		Range:        attr.Range,
+		Name: key,
+		Values: []VariableAssignment{{
+			From:  "default",
+			Value: value,
+			Expr:  attr.Expr,
+		}},
+		Type:  value.Type(),
+		Range: attr.Range,
 	}
 
 	return diags
 }
 
-// decodeVariableBlock decodes a "variables" section the way packer 1 used to
+var variableBlockSchema = &hcl.BodySchema{
+	Attributes: []hcl.AttributeSchema{
+		{
+			Name: "description",
+		},
+		{
+			Name: "default",
+		},
+		{
+			Name: "type",
+		},
+		{
+			Name: "sensitive",
+		},
+	},
+	Blocks: []hcl.BlockHeaderSchema{
+		{
+			Type: "validation",
+		},
+	},
+}
+
+// decodeVariableBlock decodes a "variable" block
+// ectx is passed only in the evaluation of the default value.
 func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.EvalContext) hcl.Diagnostics {
 	if (*variables) == nil {
 		(*variables) = Variables{}
@@ -155,51 +263,53 @@ func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.Eval
 		}}
 	}
 
-	var b struct {
-		Description string   `hcl:"description,optional"`
-		Sensitive   bool     `hcl:"sensitive,optional"`
-		Rest        hcl.Body `hcl:",remain"`
-	}
-	diags := gohcl.DecodeBody(block.Body, nil, &b)
-
-	if diags.HasErrors() {
-		return diags
-	}
-
 	name := block.Labels[0]
 
-	res := &Variable{
-		Name:        name,
-		Description: b.Description,
-		Sensitive:   b.Sensitive,
-		Range:       block.DefRange,
+	content, diags := block.Body.Content(variableBlockSchema)
+	if !hclsyntax.ValidIdentifier(name) {
+		diags = append(diags, &hcl.Diagnostic{
+			Severity: hcl.DiagError,
+			Summary:  "Invalid variable name",
+			Detail:   badIdentifierDetail,
+			Subject:  &block.LabelRanges[0],
+		})
 	}
 
-	attrs, moreDiags := b.Rest.JustAttributes()
-	diags = append(diags, moreDiags...)
+	v := &Variable{
+		Name:  name,
+		Range: block.DefRange,
+	}
 
-	if t, ok := attrs["type"]; ok {
-		delete(attrs, "type")
+	if attr, exists := content.Attributes["description"]; exists {
+		valDiags := gohcl.DecodeExpression(attr.Expr, nil, &v.Description)
+		diags = append(diags, valDiags...)
+	}
+
+	if t, ok := content.Attributes["type"]; ok {
 		tp, moreDiags := typeexpr.Type(t.Expr)
 		diags = append(diags, moreDiags...)
 		if moreDiags.HasErrors() {
 			return diags
 		}
 
-		res.Type = tp
+		v.Type = tp
 	}
 
-	if def, ok := attrs["default"]; ok {
-		delete(attrs, "default")
+	if attr, exists := content.Attributes["sensitive"]; exists {
+		valDiags := gohcl.DecodeExpression(attr.Expr, nil, &v.Sensitive)
+		diags = append(diags, valDiags...)
+	}
+
+	if def, ok := content.Attributes["default"]; ok {
 		defaultValue, moreDiags := def.Expr.Value(ectx)
 		diags = append(diags, moreDiags...)
 		if moreDiags.HasErrors() {
 			return diags
 		}
 
-		if res.Type != cty.NilType {
+		if v.Type != cty.NilType {
 			var err error
-			defaultValue, err = convert.Convert(defaultValue, res.Type)
+			defaultValue, err = convert.Convert(defaultValue, v.Type)
 			if err != nil {
 				diags = append(diags, &hcl.Diagnostic{
 					Severity: hcl.DiagError,
@@ -211,32 +321,179 @@ func (variables *Variables) decodeVariableBlock(block *hcl.Block, ectx *hcl.Eval
 			}
 		}
 
-		res.DefaultValue = defaultValue
+		v.Values = append(v.Values, VariableAssignment{
+			From:  "default",
+			Value: defaultValue,
+			Expr:  def.Expr,
+		})
 
 		// It's possible no type attribute was assigned so lets make sure we
 		// have a valid type otherwise there could be issues parsing the value.
-		if res.Type == cty.NilType {
-			res.Type = res.DefaultValue.Type()
+		if v.Type == cty.NilType {
+			v.Type = defaultValue.Type()
 		}
 	}
-	if len(attrs) > 0 {
-		keys := []string{}
-		for k := range attrs {
-			keys = append(keys, k)
-		}
-		diags = append(diags, &hcl.Diagnostic{
-			Severity: hcl.DiagWarning,
-			Summary:  "Unknown keys",
-			Detail:   fmt.Sprintf("unknown variable setting(s): %s", keys),
-			Context:  block.DefRange.Ptr(),
-		})
-	}
 
-	(*variables)[name] = res
+	for _, block := range content.Blocks {
+		switch block.Type {
+		case "validation":
+			vv, moreDiags := decodeVariableValidationBlock(v.Name, block)
+			diags = append(diags, moreDiags...)
+			v.Validations = append(v.Validations, vv)
+		}
+	}
+
+	(*variables)[name] = v
 
 	return diags
 }
 
+var variableValidationBlockSchema = &hcl.BodySchema{
+	Attributes: []hcl.AttributeSchema{
+		{
+			Name:     "condition",
+			Required: true,
+		},
+		{
+			Name:     "error_message",
+			Required: true,
+		},
+	},
+}
+
+// VariableValidation represents a configuration-defined validation rule
+// for a particular input variable, given as a "validation" block inside
+// a "variable" block.
+type VariableValidation struct {
+	// Condition is an expression that refers to the variable being tested and
+	// contains no other references. The expression must return true to
+	// indicate that the value is valid or false to indicate that it is
+	// invalid. If the expression produces an error, that's considered a bug in
+	// the block defining the validation rule, not an error in the caller.
+	Condition hcl.Expression
+
+	// ErrorMessage is one or more full sentences, which _should_ be in English
+	// for consistency with the rest of the error message output but can in
+	// practice be in any language as long as it ends with a period. The
+	// message should describe what is required for the condition to return
+	// true in a way that would make sense to a caller of the module.
+	ErrorMessage string
+
+	DeclRange hcl.Range
+}
+
+func decodeVariableValidationBlock(varName string, block *hcl.Block) (*VariableValidation, hcl.Diagnostics) {
+	var diags hcl.Diagnostics
+	vv := &VariableValidation{
+		DeclRange: block.DefRange,
+	}
+
+	content, moreDiags := block.Body.Content(variableValidationBlockSchema)
+	diags = append(diags, moreDiags...)
+
+	if attr, exists := content.Attributes["condition"]; exists {
+		vv.Condition = attr.Expr
+
+		// The validation condition must refer to the variable itself and
+		// nothing else; to ensure that the variable declaration can't create
+		// additional edges in the dependency graph.
+		goodRefs := 0
+		for _, traversal := range vv.Condition.Variables() {
+
+			ref, moreDiags := addrs.ParseRef(traversal)
+			if !moreDiags.HasErrors() {
+				if addr, ok := ref.Subject.(addrs.InputVariable); ok {
+					if addr.Name == varName {
+						goodRefs++
+						continue // Reference is valid
+					}
+				}
+			}
+
+			// If we fall out here then the reference is invalid.
+			diags = diags.Append(&hcl.Diagnostic{
+				Severity: hcl.DiagError,
+				Summary:  "Invalid reference in variable validation",
+				Detail:   fmt.Sprintf("The condition for variable %q can only refer to the variable itself, using var.%s.", varName, varName),
+				Subject:  traversal.SourceRange().Ptr(),
+			})
+		}
+		if goodRefs < 1 {
+			diags = diags.Append(&hcl.Diagnostic{
+				Severity: hcl.DiagError,
+				Summary:  "Invalid variable validation condition",
+				Detail:   fmt.Sprintf("The condition for variable %q must refer to var.%s in order to test incoming values.", varName, varName),
+				Subject:  attr.Expr.Range().Ptr(),
+			})
+		}
+	}
+
+	if attr, exists := content.Attributes["error_message"]; exists {
+		moreDiags := gohcl.DecodeExpression(attr.Expr, nil, &vv.ErrorMessage)
+		diags = append(diags, moreDiags...)
+		if !moreDiags.HasErrors() {
+			const errSummary = "Invalid validation error message"
+			switch {
+			case vv.ErrorMessage == "":
+				diags = diags.Append(&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  errSummary,
+					Detail:   "An empty string is not a valid nor useful error message.",
+					Subject:  attr.Expr.Range().Ptr(),
+				})
+			case !looksLikeSentences(vv.ErrorMessage):
+				// Because we're going to include this string verbatim as part
+				// of a bigger error message written in our usual style, we'll
+				// require the given error message to conform to that. We might
+				// relax this in future if e.g. we start presenting these error
+				// messages in a different way, or if Packer starts supporting
+				// producing error messages in other human languages, etc. For
+				// pragmatism we also allow sentences ending with exclamation
+				// points, but we don't mention it explicitly here because
+				// that's not really consistent with the Packer UI writing
+				// style.
+				diags = diags.Append(&hcl.Diagnostic{
+					Severity: hcl.DiagError,
+					Summary:  errSummary,
+					Detail:   "Validation error message must be at least one full sentence starting with an uppercase letter ( if the alphabet permits it ) and ending with a period or question mark.",
+					Subject:  attr.Expr.Range().Ptr(),
+				})
+			}
+		}
+	}
+
+	return vv, diags
+}
+
+// looksLikeSentence is a simple heuristic that encourages writing error
+// messages that will be presentable when included as part of a larger error
+// diagnostic whose other text is written in the UI writing style.
+//
+// This is intentionally not a very strong validation since we're assuming that
+// authors want to write good messages and might just need a nudge about
+// Packer's specific style, rather than that they are going to try to work
+// around these rules to write a lower-quality message.
+func looksLikeSentences(s string) bool {
+	s = strings.TrimSpace(s)
+	if len(s) < 1 {
+		return false
+	}
+	runes := []rune(s) // HCL guarantees that all strings are valid UTF-8
+	first := runes[0]
+	last := runes[len(runes)-1]
+
+	// If the first rune is a letter then it must be an uppercase letter. To
+	// sorts of nudge people into writting sentences. For alphabets that don't
+	// have the notion of 'upper', this does nothing.
+	if unicode.IsLetter(first) && !unicode.IsUpper(first) {
+		return false
+	}
+
+	// The string must be at least one full sentence, which implies having
+	// sentence-ending punctuation.
+	return last == '.' || last == '?' || last == '!'
+}
+
 // Prefix your environment variables with VarEnvPrefix so that Packer can see
 // them.
 const VarEnvPrefix = "PKR_VAR_"
@@ -288,7 +545,11 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F
 				val = cty.DynamicVal
 			}
 		}
-		variable.EnvValue = val
+		variable.Values = append(variable.Values, VariableAssignment{
+			From:  "env",
+			Value: val,
+			Expr:  expr,
+		})
 	}
 
 	// files will contain files found in the folder then files passed as
@@ -310,7 +571,7 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F
 			})
 			for _, block := range content.Blocks {
 				name := block.Labels[0]
-				diags = diags.Append(&hcl.Diagnostic{
+				diags = append(diags, &hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Variable declaration in a .pkrvar file",
 					Detail: fmt.Sprintf("A .pkrvar file is used to assign "+
@@ -372,7 +633,11 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F
 				}
 			}
 
-			variable.VarfileValue = val
+			variable.Values = append(variable.Values, VariableAssignment{
+				From:  "varfile",
+				Value: val,
+				Expr:  attr.Expr,
+			})
 		}
 	}
 
@@ -416,7 +681,11 @@ func (cfg *PackerConfig) collectInputVariableValues(env []string, files []*hcl.F
 			}
 		}
 
-		variable.CmdValue = val
+		variable.Values = append(variable.Values, VariableAssignment{
+			From:  "cmd",
+			Value: val,
+			Expr:  expr,
+		})
 	}
 
 	return diags
diff --git a/hcl2template/types.variables_test.go b/hcl2template/types.variables_test.go
index b36b6e44f..105c0b8c9 100644
--- a/hcl2template/types.variables_test.go
+++ b/hcl2template/types.variables_test.go
@@ -25,47 +25,68 @@ func TestParse_variables(t *testing.T) {
 				Basedir: filepath.Join("testdata", "variables"),
 				InputVariables: Variables{
 					"image_name": &Variable{
-						Name:         "image_name",
-						DefaultValue: cty.StringVal("foo-image-{{user `my_secret`}}"),
+						Name:   "image_name",
+						Type:   cty.String,
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo-image-{{user `my_secret`}}")}},
 					},
 					"key": &Variable{
-						Name:         "key",
-						DefaultValue: cty.StringVal("value"),
+						Name:   "key",
+						Type:   cty.String,
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("value")}},
 					},
 					"my_secret": &Variable{
-						Name:         "my_secret",
-						DefaultValue: cty.StringVal("foo"),
+						Name:   "my_secret",
+						Type:   cty.String,
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}},
 					},
 					"image_id": &Variable{
-						Name:         "image_id",
-						DefaultValue: cty.StringVal("image-id-default"),
+						Name:   "image_id",
+						Type:   cty.String,
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("image-id-default")}},
 					},
 					"port": &Variable{
-						Name:         "port",
-						DefaultValue: cty.NumberIntVal(42),
+						Name:   "port",
+						Type:   cty.Number,
+						Values: []VariableAssignment{{From: "default", Value: cty.NumberIntVal(42)}},
 					},
 					"availability_zone_names": &Variable{
 						Name: "availability_zone_names",
-						DefaultValue: cty.ListVal([]cty.Value{
-							cty.StringVal("us-west-1a"),
-						}),
+						Values: []VariableAssignment{{
+							From: "default",
+							Value: cty.ListVal([]cty.Value{
+								cty.StringVal("us-west-1a"),
+							}),
+						}},
+						Type:        cty.List(cty.String),
 						Description: fmt.Sprintln("Describing is awesome ;D"),
 					},
 					"super_secret_password": &Variable{
-						Name:         "super_secret_password",
-						Sensitive:    true,
-						DefaultValue: cty.NullVal(cty.String),
-						Description:  fmt.Sprintln("Handle with care plz"),
+						Name:      "super_secret_password",
+						Sensitive: true,
+						Values: []VariableAssignment{{
+							From:  "default",
+							Value: cty.NullVal(cty.String),
+						}},
+						Type:        cty.String,
+						Description: fmt.Sprintln("Handle with care plz"),
 					},
 				},
 				LocalVariables: Variables{
 					"owner": &Variable{
-						Name:         "owner",
-						DefaultValue: cty.StringVal("Community Team"),
+						Name: "owner",
+						Values: []VariableAssignment{{
+							From:  "default",
+							Value: cty.StringVal("Community Team"),
+						}},
+						Type: cty.String,
 					},
 					"service_name": &Variable{
-						Name:         "service_name",
-						DefaultValue: cty.StringVal("forum"),
+						Name: "service_name",
+						Values: []VariableAssignment{{
+							From:  "default",
+							Value: cty.StringVal("forum"),
+						}},
+						Type: cty.String,
 					},
 				},
 			},
@@ -81,6 +102,11 @@ func TestParse_variables(t *testing.T) {
 				InputVariables: Variables{
 					"boolean_value": &Variable{
 						Name: "boolean_value",
+						Values: []VariableAssignment{{
+							From:  "default",
+							Value: cty.BoolVal(false),
+						}},
+						Type: cty.Bool,
 					},
 				},
 			},
@@ -96,6 +122,11 @@ func TestParse_variables(t *testing.T) {
 				InputVariables: Variables{
 					"boolean_value": &Variable{
 						Name: "boolean_value",
+						Values: []VariableAssignment{{
+							From:  "default",
+							Value: cty.BoolVal(false),
+						}},
+						Type: cty.Bool,
 					},
 				},
 			},
@@ -111,6 +142,11 @@ func TestParse_variables(t *testing.T) {
 				InputVariables: Variables{
 					"broken_type": &Variable{
 						Name: "broken_type",
+						Values: []VariableAssignment{{
+							From:  "default",
+							Value: cty.UnknownVal(cty.DynamicPseudoType),
+						}},
+						Type: cty.List(cty.String),
 					},
 				},
 			},
@@ -126,12 +162,13 @@ func TestParse_variables(t *testing.T) {
 				Basedir: filepath.Join("testdata", "variables"),
 				InputVariables: Variables{
 					"broken_variable": &Variable{
-						Name:         "broken_variable",
-						DefaultValue: cty.BoolVal(true),
+						Name:   "broken_variable",
+						Values: []VariableAssignment{{From: "default", Value: cty.BoolVal(true)}},
+						Type:   cty.Bool,
 					},
 				},
 			},
-			true, false,
+			true, true,
 			[]packer.Build{},
 			false,
 		},
@@ -144,6 +181,7 @@ func TestParse_variables(t *testing.T) {
 				InputVariables: Variables{
 					"foo": &Variable{
 						Name: "foo",
+						Type: cty.String,
 					},
 				},
 			},
@@ -160,6 +198,7 @@ func TestParse_variables(t *testing.T) {
 				InputVariables: Variables{
 					"foo": &Variable{
 						Name: "foo",
+						Type: cty.String,
 					},
 				},
 				Sources: map[SourceRef]SourceBlock{
@@ -196,33 +235,46 @@ func TestParse_variables(t *testing.T) {
 				Basedir: "testdata/variables/complicated",
 				InputVariables: Variables{
 					"name_prefix": &Variable{
-						Name:         "name_prefix",
-						DefaultValue: cty.StringVal("foo"),
+						Name:   "name_prefix",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}},
+						Type:   cty.String,
 					},
 				},
 				LocalVariables: Variables{
 					"name_prefix": &Variable{
-						Name:         "name_prefix",
-						DefaultValue: cty.StringVal("foo"),
+						Name:   "name_prefix",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}},
+						Type:   cty.String,
 					},
 					"foo": &Variable{
-						Name:         "foo",
-						DefaultValue: cty.StringVal("foo"),
+						Name:   "foo",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}},
+						Type:   cty.String,
 					},
 					"bar": &Variable{
-						Name:         "bar",
-						DefaultValue: cty.StringVal("foo"),
+						Name:   "bar",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}},
+						Type:   cty.String,
 					},
 					"for_var": &Variable{
-						Name:         "for_var",
-						DefaultValue: cty.StringVal("foo"),
+						Name:   "for_var",
+						Values: []VariableAssignment{{From: "default", Value: cty.StringVal("foo")}},
+						Type:   cty.String,
 					},
 					"bar_var": &Variable{
 						Name: "bar_var",
-						DefaultValue: cty.TupleVal([]cty.Value{
-							cty.StringVal("foo"),
-							cty.StringVal("foo"),
-							cty.StringVal("foo"),
+						Values: []VariableAssignment{{
+							From: "default",
+							Value: cty.TupleVal([]cty.Value{
+								cty.StringVal("foo"),
+								cty.StringVal("foo"),
+								cty.StringVal("foo"),
+							}),
+						}},
+						Type: cty.Tuple([]cty.Type{
+							cty.String,
+							cty.String,
+							cty.String,
 						}),
 					},
 				},
@@ -250,9 +302,12 @@ func TestParse_variables(t *testing.T) {
 				Basedir: filepath.Join("testdata", "variables"),
 				InputVariables: Variables{
 					"foo": &Variable{
-						DefaultValue: cty.StringVal("bar"),
-						Name:         "foo",
-						VarfileValue: cty.StringVal("wee"),
+						Name: "foo",
+						Values: []VariableAssignment{
+							VariableAssignment{"default", cty.StringVal("bar"), nil},
+							VariableAssignment{"varfile", cty.StringVal("wee"), nil},
+						},
+						Type: cty.String,
 					},
 				},
 			},
@@ -279,14 +334,14 @@ func TestParse_variables(t *testing.T) {
 				Basedir: filepath.Join("testdata", "variables"),
 				InputVariables: Variables{
 					"max_retries": &Variable{
-						Name:         "max_retries",
-						DefaultValue: cty.StringVal("1"),
-						Type:         cty.String,
+						Name:   "max_retries",
+						Values: []VariableAssignment{{"default", cty.StringVal("1"), nil}},
+						Type:   cty.String,
 					},
 					"max_retries_int": &Variable{
-						Name:         "max_retries_int",
-						DefaultValue: cty.NumberIntVal(1),
-						Type:         cty.Number,
+						Name:   "max_retries_int",
+						Values: []VariableAssignment{{"default", cty.NumberIntVal(1), nil}},
+						Type:   cty.Number,
 					},
 				},
 				Sources: map[SourceRef]SourceBlock{
@@ -357,6 +412,54 @@ func TestParse_variables(t *testing.T) {
 			},
 			false,
 		},
+
+		{"valid validation block",
+			defaultParser,
+			parseTestArgs{"testdata/variables/validation/valid.pkr.hcl", nil, nil},
+			&PackerConfig{
+				Basedir: filepath.Join("testdata", "variables", "validation"),
+				InputVariables: Variables{
+					"image_id": &Variable{
+						Values: []VariableAssignment{
+							{"default", cty.StringVal("ami-something-something"), nil},
+						},
+						Name: "image_id",
+						Type: cty.String,
+						Validations: []*VariableValidation{
+							&VariableValidation{
+								ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`,
+							},
+						},
+					},
+				},
+			},
+			false, false,
+			[]packer.Build{},
+			false,
+		},
+
+		{"valid validation block - invalid default",
+			defaultParser,
+			parseTestArgs{"testdata/variables/validation/invalid_default.pkr.hcl", nil, nil},
+			&PackerConfig{
+				Basedir: filepath.Join("testdata", "variables", "validation"),
+				InputVariables: Variables{
+					"image_id": &Variable{
+						Values: []VariableAssignment{{"default", cty.StringVal("potato"), nil}},
+						Name:   "image_id",
+						Type:   cty.String,
+						Validations: []*VariableValidation{
+							&VariableValidation{
+								ErrorMessage: `The image_id value must be a valid AMI id, starting with "ami-".`,
+							},
+						},
+					},
+				},
+			},
+			true, true,
+			nil,
+			false,
+		},
 	}
 	testParse(t, tests)
 }
@@ -380,8 +483,10 @@ func TestVariables_collectVariableValues(t *testing.T) {
 
 		{name: "string",
 			variables: Variables{"used_string": &Variable{
-				DefaultValue: cty.StringVal("default_value"),
-				Type:         cty.String,
+				Values: []VariableAssignment{
+					{"default", cty.StringVal("default_value"), nil},
+				},
+				Type: cty.String,
 			}},
 			args: args{
 				env: []string{`PKR_VAR_used_string=env_value`},
@@ -398,11 +503,14 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiags: false,
 			wantVariables: Variables{
 				"used_string": &Variable{
-					Type:         cty.String,
-					CmdValue:     cty.StringVal("cmd_value"),
-					VarfileValue: cty.StringVal("varfile_value"),
-					EnvValue:     cty.StringVal("env_value"),
-					DefaultValue: cty.StringVal("default_value"),
+					Type: cty.String,
+					Values: []VariableAssignment{
+						{"default", cty.StringVal(`default_value`), nil},
+						{"env", cty.StringVal(`env_value`), nil},
+						{"varfile", cty.StringVal(`xy`), nil},
+						{"varfile", cty.StringVal(`varfile_value`), nil},
+						{"cmd", cty.StringVal(`cmd_value`), nil},
+					},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -412,8 +520,10 @@ func TestVariables_collectVariableValues(t *testing.T) {
 
 		{name: "quoted string",
 			variables: Variables{"quoted_string": &Variable{
-				DefaultValue: cty.StringVal(`"default_value"`),
-				Type:         cty.String,
+				Values: []VariableAssignment{
+					{"default", cty.StringVal(`"default_value"`), nil},
+				},
+				Type: cty.String,
 			}},
 			args: args{
 				env: []string{`PKR_VAR_quoted_string="env_value"`},
@@ -430,11 +540,14 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiags: false,
 			wantVariables: Variables{
 				"quoted_string": &Variable{
-					Type:         cty.String,
-					CmdValue:     cty.StringVal(`"cmd_value"`),
-					VarfileValue: cty.StringVal(`"varfile_value"`),
-					EnvValue:     cty.StringVal(`"env_value"`),
-					DefaultValue: cty.StringVal(`"default_value"`),
+					Type: cty.String,
+					Values: []VariableAssignment{
+						{"default", cty.StringVal(`"default_value"`), nil},
+						{"env", cty.StringVal(`"env_value"`), nil},
+						{"varfile", cty.StringVal(`"xy"`), nil},
+						{"varfile", cty.StringVal(`"varfile_value"`), nil},
+						{"cmd", cty.StringVal(`"cmd_value"`), nil},
+					},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -444,8 +557,10 @@ func TestVariables_collectVariableValues(t *testing.T) {
 
 		{name: "array of strings",
 			variables: Variables{"used_strings": &Variable{
-				DefaultValue: stringListVal("default_value_1"),
-				Type:         cty.List(cty.String),
+				Values: []VariableAssignment{
+					{"default", stringListVal("default_value_1"), nil},
+				},
+				Type: cty.List(cty.String),
 			}},
 			args: args{
 				env: []string{`PKR_VAR_used_strings=["env_value_1", "env_value_2"]`},
@@ -462,11 +577,14 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiags: false,
 			wantVariables: Variables{
 				"used_strings": &Variable{
-					Type:         cty.List(cty.String),
-					CmdValue:     stringListVal("cmd_value_1"),
-					VarfileValue: stringListVal("varfile_value_1"),
-					EnvValue:     stringListVal("env_value_1", "env_value_2"),
-					DefaultValue: stringListVal("default_value_1"),
+					Type: cty.List(cty.String),
+					Values: []VariableAssignment{
+						{"default", stringListVal("default_value_1"), nil},
+						{"env", stringListVal("env_value_1", "env_value_2"), nil},
+						{"varfile", stringListVal("xy"), nil},
+						{"varfile", stringListVal("varfile_value_1"), nil},
+						{"cmd", stringListVal("cmd_value_1"), nil},
+					},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -476,8 +594,8 @@ func TestVariables_collectVariableValues(t *testing.T) {
 
 		{name: "bool",
 			variables: Variables{"enabled": &Variable{
-				DefaultValue: cty.False,
-				Type:         cty.Bool,
+				Values: []VariableAssignment{{"default", cty.False, nil}},
+				Type:   cty.Bool,
 			}},
 			args: args{
 				env: []string{`PKR_VAR_enabled=true`},
@@ -493,11 +611,13 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiags: false,
 			wantVariables: Variables{
 				"enabled": &Variable{
-					Type:         cty.Bool,
-					CmdValue:     cty.True,
-					VarfileValue: cty.False,
-					EnvValue:     cty.True,
-					DefaultValue: cty.False,
+					Type: cty.Bool,
+					Values: []VariableAssignment{
+						{"default", cty.False, nil},
+						{"env", cty.True, nil},
+						{"varfile", cty.False, nil},
+						{"cmd", cty.True, nil},
+					},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -507,8 +627,8 @@ func TestVariables_collectVariableValues(t *testing.T) {
 
 		{name: "invalid env var",
 			variables: Variables{"used_string": &Variable{
-				DefaultValue: cty.StringVal("default_value"),
-				Type:         cty.String,
+				Values: []VariableAssignment{{"default", cty.StringVal("default_value"), nil}},
+				Type:   cty.String,
 			}},
 			args: args{
 				env: []string{`PKR_VAR_used_string`},
@@ -518,8 +638,8 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiags: false,
 			wantVariables: Variables{
 				"used_string": &Variable{
-					Type:         cty.String,
-					DefaultValue: cty.StringVal("default_value"),
+					Type:   cty.String,
+					Values: []VariableAssignment{{"default", cty.StringVal("default_value"), nil}},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -598,8 +718,8 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiagsHasError: true,
 			wantVariables: Variables{
 				"used_string": &Variable{
-					Type:     cty.List(cty.String),
-					EnvValue: cty.DynamicVal,
+					Type:   cty.List(cty.String),
+					Values: []VariableAssignment{{"env", cty.DynamicVal, nil}},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -622,8 +742,8 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiagsHasError: true,
 			wantVariables: Variables{
 				"used_string": &Variable{
-					Type:         cty.Bool,
-					VarfileValue: cty.DynamicVal,
+					Type:   cty.Bool,
+					Values: []VariableAssignment{{"varfile", cty.DynamicVal, nil}},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -648,8 +768,8 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			wantDiagsHasError: true,
 			wantVariables: Variables{
 				"used_string": &Variable{
-					Type:     cty.Bool,
-					CmdValue: cty.DynamicVal,
+					Type:   cty.Bool,
+					Values: []VariableAssignment{{"cmd", cty.DynamicVal, nil}},
 				},
 			},
 			wantValues: map[string]cty.Value{
@@ -692,7 +812,7 @@ func TestVariables_collectVariableValues(t *testing.T) {
 			if tt.wantDiagsHasError != gotDiags.HasErrors() {
 				t.Fatalf("Variables.collectVariableValues() unexpected diagnostics HasErrors. %s", gotDiags)
 			}
-			if diff := cmp.Diff(fmt.Sprintf("%#v", tt.wantVariables), fmt.Sprintf("%#v", tt.variables)); diff != "" {
+			if diff := cmp.Diff(tt.wantVariables, tt.variables, cmpOpts...); diff != "" {
 				t.Fatalf("didn't get expected variables: %s", diff)
 			}
 			values := map[string]cty.Value{}
diff --git a/hcl2template/version_required.go b/hcl2template/version_required.go
index 516d84823..10d50bb82 100644
--- a/hcl2template/version_required.go
+++ b/hcl2template/version_required.go
@@ -3,8 +3,8 @@ package hcl2template
 import (
 	"fmt"
 
+	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl/v2"
-	pkrversion "github.com/hashicorp/packer/version"
 )
 
 // CheckCoreVersionRequirements visits each of the block in the given
@@ -14,7 +14,7 @@ import (
 // The returned diagnostics will contain errors if any constraints do not match.
 // The returned diagnostics might also return warnings, which should be
 // displayed to the user.
-func (cfg *PackerConfig) CheckCoreVersionRequirements() hcl.Diagnostics {
+func (cfg *PackerConfig) CheckCoreVersionRequirements(coreVersion *version.Version) hcl.Diagnostics {
 	if cfg == nil {
 		return nil
 	}
@@ -22,13 +22,13 @@ func (cfg *PackerConfig) CheckCoreVersionRequirements() hcl.Diagnostics {
 	var diags hcl.Diagnostics
 
 	for _, constraint := range cfg.Packer.VersionConstraints {
-		if !constraint.Required.Check(pkrversion.SemVer) {
+		if !constraint.Required.Check(coreVersion) {
 			diags = diags.Append(&hcl.Diagnostic{
 				Severity: hcl.DiagError,
 				Summary:  "Unsupported Packer Core version",
 				Detail: fmt.Sprintf(
 					"This configuration does not support Packer version %s. To proceed, either choose another supported Packer version or update this version constraint. Version constraints are normally set for good reason, so updating the constraint may lead to other errors or unexpected behavior.",
-					pkrversion.String(),
+					coreVersion.String(),
 				),
 				Subject: constraint.DeclRange.Ptr(),
 			})
diff --git a/helper/builder/testing/testing.go b/helper/builder/testing/testing.go
index 06b0a31b6..dc4129e74 100644
--- a/helper/builder/testing/testing.go
+++ b/helper/builder/testing/testing.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 // TestEnvVar must be set to a non-empty value for acceptance tests to run.
diff --git a/helper/common/shared_state.go b/helper/common/shared_state.go
deleted file mode 100644
index b75d9e091..000000000
--- a/helper/common/shared_state.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package common
-
-// This is used in the BasicPlaceholderData() func in the packer/provisioner.go
-// To force users to access generated data via the "generated" func.
-const PlaceholderMsg = "To set this dynamically in the Packer template, " +
-	"you must use the `build` function"
diff --git a/helper/communicator/comm_host.go b/helper/communicator/comm_host.go
index 8bebcc888..6c7e55eb5 100644
--- a/helper/communicator/comm_host.go
+++ b/helper/communicator/comm_host.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Generic commHost function that should work for most cloud builders.
diff --git a/helper/communicator/config.go b/helper/communicator/config.go
index f27cd2a76..0dcc21bbc 100644
--- a/helper/communicator/config.go
+++ b/helper/communicator/config.go
@@ -12,12 +12,12 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	packerssh "github.com/hashicorp/packer/communicator/ssh"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
-	helperssh "github.com/hashicorp/packer/helper/ssh"
+	helperssh "github.com/hashicorp/packer/helper/communicator/ssh"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	packerssh "github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/masterzen/winrm"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
diff --git a/helper/communicator/config_test.go b/helper/communicator/config_test.go
index b09916d0c..6eed1848f 100644
--- a/helper/communicator/config_test.go
+++ b/helper/communicator/config_test.go
@@ -4,8 +4,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/masterzen/winrm"
 )
 
diff --git a/helper/ssh/key_pair.go b/helper/communicator/ssh/key_pair.go
similarity index 100%
rename from helper/ssh/key_pair.go
rename to helper/communicator/ssh/key_pair.go
diff --git a/helper/ssh/key_pair_test.go b/helper/communicator/ssh/key_pair_test.go
similarity index 99%
rename from helper/ssh/key_pair_test.go
rename to helper/communicator/ssh/key_pair_test.go
index 5ff182467..f24664913 100644
--- a/helper/ssh/key_pair_test.go
+++ b/helper/communicator/ssh/key_pair_test.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/hashicorp/packer/common/uuid"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	"golang.org/x/crypto/ed25519"
 	gossh "golang.org/x/crypto/ssh"
 )
diff --git a/helper/ssh/ssh.go b/helper/communicator/ssh/ssh.go
similarity index 100%
rename from helper/ssh/ssh.go
rename to helper/communicator/ssh/ssh.go
diff --git a/helper/ssh/tunnel.go b/helper/communicator/ssh/tunnel.go
similarity index 94%
rename from helper/ssh/tunnel.go
rename to helper/communicator/ssh/tunnel.go
index eeb45b51e..a9695d011 100644
--- a/helper/ssh/tunnel.go
+++ b/helper/communicator/ssh/tunnel.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh"
 )
 
 // ParseTunnelArgument parses an SSH tunneling argument compatible with the openssh client form.
diff --git a/helper/ssh/tunnel_test.go b/helper/communicator/ssh/tunnel_test.go
similarity index 96%
rename from helper/ssh/tunnel_test.go
rename to helper/communicator/ssh/tunnel_test.go
index 447a71ef3..e834201b7 100644
--- a/helper/ssh/tunnel_test.go
+++ b/helper/communicator/ssh/tunnel_test.go
@@ -3,7 +3,7 @@ package ssh
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/communicator/ssh"
+	"github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh"
 )
 
 const (
diff --git a/helper/communicator/step_connect.go b/helper/communicator/step_connect.go
index 1eaf48bf8..8ecaa6b0e 100644
--- a/helper/communicator/step_connect.go
+++ b/helper/communicator/step_connect.go
@@ -6,9 +6,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/communicator/none"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/none"
 	gossh "golang.org/x/crypto/ssh"
 )
 
diff --git a/helper/communicator/step_connect_ssh.go b/helper/communicator/step_connect_ssh.go
index 3ddaed115..93ba8a3a6 100644
--- a/helper/communicator/step_connect_ssh.go
+++ b/helper/communicator/step_connect_ssh.go
@@ -13,10 +13,10 @@ import (
 
 	"golang.org/x/crypto/ssh/terminal"
 
-	"github.com/hashicorp/packer/communicator/ssh"
-	"github.com/hashicorp/packer/helper/multistep"
-	helperssh "github.com/hashicorp/packer/helper/ssh"
+	helperssh "github.com/hashicorp/packer/helper/communicator/ssh"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/ssh"
 	gossh "golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 	"golang.org/x/net/proxy"
diff --git a/helper/communicator/step_connect_test.go b/helper/communicator/step_connect_test.go
index fb61f6463..e31741b86 100644
--- a/helper/communicator/step_connect_test.go
+++ b/helper/communicator/step_connect_test.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepConnect_impl(t *testing.T) {
diff --git a/helper/communicator/step_connect_winrm.go b/helper/communicator/step_connect_winrm.go
index 2600440ee..62d248701 100644
--- a/helper/communicator/step_connect_winrm.go
+++ b/helper/communicator/step_connect_winrm.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/communicator/winrm"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/sdk-internals/communicator/winrm"
 	winrmcmd "github.com/masterzen/winrm"
 	"golang.org/x/net/http/httpproxy"
 )
diff --git a/helper/communicator/step_debug_ssh_keys.go b/helper/communicator/step_debug_ssh_keys.go
index e6623fdf1..cd67e0641 100644
--- a/helper/communicator/step_debug_ssh_keys.go
+++ b/helper/communicator/step_debug_ssh_keys.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepDumpSSHKey is a multistep Step implementation that writes the ssh
diff --git a/helper/communicator/step_ssh_keygen.go b/helper/communicator/step_ssh_keygen.go
index 3bdf2899b..73e340529 100644
--- a/helper/communicator/step_ssh_keygen.go
+++ b/helper/communicator/step_ssh_keygen.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/packer/helper/communicator/sshkey"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepSSHKeyGen is a Packer build step that generates SSH key pairs.
diff --git a/helper/communicator/testing.go b/helper/communicator/testing.go
index 4f4894b6a..176412fc7 100644
--- a/helper/communicator/testing.go
+++ b/helper/communicator/testing.go
@@ -3,7 +3,7 @@ package communicator
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 func TestPEM(t *testing.T) string {
diff --git a/helper/config/custom_types.go b/helper/config/custom_types.go
deleted file mode 100644
index df7038459..000000000
--- a/helper/config/custom_types.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package config
-
-import (
-	"strconv"
-)
-
-type Trilean uint8
-
-const (
-	// This will assign unset to 0, which is the default value in interpolation
-	TriUnset Trilean = iota
-	TriTrue
-	TriFalse
-)
-
-func (t Trilean) ToString() string {
-	if t == TriTrue {
-		return "TriTrue"
-	} else if t == TriFalse {
-		return "TriFalse"
-	}
-	return "TriUnset"
-}
-
-func (t Trilean) ToBoolPointer() *bool {
-	if t == TriTrue {
-		return boolPointer(true)
-	} else if t == TriFalse {
-		return boolPointer(false)
-	}
-	return nil
-}
-
-func (t Trilean) True() bool {
-	if t == TriTrue {
-		return true
-	}
-	return false
-}
-
-func (t Trilean) False() bool {
-	if t == TriFalse {
-		return true
-	}
-	return false
-}
-
-func TrileanFromString(s string) (Trilean, error) {
-	if s == "" {
-		return TriUnset, nil
-	}
-
-	b, err := strconv.ParseBool(s)
-	if err != nil {
-		return TriUnset, err
-	} else if b == true {
-		return TriTrue, nil
-	} else {
-		return TriFalse, nil
-	}
-}
-
-func TrileanFromBool(b bool) Trilean {
-	if b {
-		return TriTrue
-	}
-	return TriFalse
-}
-
-func boolPointer(b bool) *bool {
-	return &b
-}
diff --git a/main.go b/main.go
index 5079d9a61..55b295b78 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 // This is the main package for the `packer` application.
 
 //go:generate go run ./scripts/generate-plugins.go
-//go:generate go generate ./common/bootcommand/...
+//go:generate go generate ./packer-plugin-sdk/bootcommand/...
 package main
 
 import (
@@ -19,8 +19,8 @@ import (
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/packer/command"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/hashicorp/packer/packer/plugin"
-	"github.com/hashicorp/packer/packer/tmp"
 	"github.com/hashicorp/packer/version"
 	"github.com/mitchellh/cli"
 	"github.com/mitchellh/panicwrap"
diff --git a/common/adapter/adapter.go b/packer-plugin-sdk/adapter/adapter.go
similarity index 100%
rename from common/adapter/adapter.go
rename to packer-plugin-sdk/adapter/adapter.go
diff --git a/common/adapter/adapter_test.go b/packer-plugin-sdk/adapter/adapter_test.go
similarity index 100%
rename from common/adapter/adapter_test.go
rename to packer-plugin-sdk/adapter/adapter_test.go
diff --git a/packer-plugin-sdk/adapter/doc.go b/packer-plugin-sdk/adapter/doc.go
new file mode 100644
index 000000000..f079dc594
--- /dev/null
+++ b/packer-plugin-sdk/adapter/doc.go
@@ -0,0 +1,8 @@
+/*
+Package adapter helps command line tools connect to the guest via a Packer
+communicator. A typical use is for custom provisioners that wrap command line
+tools. For example, the Ansible provisioner and the Inspec provisioner both
+use this package to proxy communicator calls.
+*/
+
+package adapter
diff --git a/common/adapter/scp.go b/packer-plugin-sdk/adapter/scp.go
similarity index 99%
rename from common/adapter/scp.go
rename to packer-plugin-sdk/adapter/scp.go
index 06043ff20..5fe6e45b2 100644
--- a/common/adapter/scp.go
+++ b/packer-plugin-sdk/adapter/scp.go
@@ -13,7 +13,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 const (
diff --git a/common/bootcommand/boot_command.go b/packer-plugin-sdk/bootcommand/boot_command.go
similarity index 100%
rename from common/bootcommand/boot_command.go
rename to packer-plugin-sdk/bootcommand/boot_command.go
diff --git a/common/bootcommand/boot_command.pigeon b/packer-plugin-sdk/bootcommand/boot_command.pigeon
similarity index 100%
rename from common/bootcommand/boot_command.pigeon
rename to packer-plugin-sdk/bootcommand/boot_command.pigeon
diff --git a/common/bootcommand/boot_command_ast.go b/packer-plugin-sdk/bootcommand/boot_command_ast.go
similarity index 100%
rename from common/bootcommand/boot_command_ast.go
rename to packer-plugin-sdk/bootcommand/boot_command_ast.go
diff --git a/common/bootcommand/boot_command_ast_test.go b/packer-plugin-sdk/bootcommand/boot_command_ast_test.go
similarity index 100%
rename from common/bootcommand/boot_command_ast_test.go
rename to packer-plugin-sdk/bootcommand/boot_command_ast_test.go
diff --git a/common/bootcommand/config.go b/packer-plugin-sdk/bootcommand/config.go
similarity index 93%
rename from common/bootcommand/config.go
rename to packer-plugin-sdk/bootcommand/config.go
index 8a1cff791..79c14d3d5 100644
--- a/common/bootcommand/config.go
+++ b/packer-plugin-sdk/bootcommand/config.go
@@ -7,9 +7,18 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
+// PackerKeyEnv is used to specify the key interval (delay) between keystrokes
+// sent to the VM, typically in boot commands. This is to prevent host CPU
+// utilization from causing key presses to be skipped or repeated incorrectly.
+const PackerKeyEnv = "PACKER_KEY_INTERVAL"
+
+// PackerKeyDefault 100ms is appropriate for shared build infrastructure while a
+// shorter delay (e.g. 10ms) can be used on a workstation. See PackerKeyEnv.
+const PackerKeyDefault = 100 * time.Millisecond
+
 // The boot configuration is very important: `boot_command` specifies the keys
 // to type when the virtual machine is first booted in order to start the OS
 // installer. This command is typed after boot_wait, which gives the virtual
diff --git a/common/bootcommand/config_test.go b/packer-plugin-sdk/bootcommand/config_test.go
similarity index 93%
rename from common/bootcommand/config_test.go
rename to packer-plugin-sdk/bootcommand/config_test.go
index 0f56e1c15..6abf9b0ad 100644
--- a/common/bootcommand/config_test.go
+++ b/packer-plugin-sdk/bootcommand/config_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestConfigPrepare(t *testing.T) {
diff --git a/packer-plugin-sdk/bootcommand/doc.go b/packer-plugin-sdk/bootcommand/doc.go
new file mode 100644
index 000000000..9a908528c
--- /dev/null
+++ b/packer-plugin-sdk/bootcommand/doc.go
@@ -0,0 +1,13 @@
+/*
+Package bootcommand generates and sends boot commands to the remote instance.
+
+This package is relevant to people who want to create new builders, particularly
+builders with the capacity to build a VM from an iso.
+
+You can choose between three different drivers to send the command: a vnc
+driver, a usb driver, and a PX-XT keyboard driver. The driver you choose will
+depend on what kind of keyboard codes your hypervisor expects, and how you want
+to implement the connection.
+*/
+
+package bootcommand
diff --git a/common/bootcommand/driver.go b/packer-plugin-sdk/bootcommand/driver.go
similarity index 100%
rename from common/bootcommand/driver.go
rename to packer-plugin-sdk/bootcommand/driver.go
diff --git a/common/bootcommand/gen.go b/packer-plugin-sdk/bootcommand/gen.go
similarity index 100%
rename from common/bootcommand/gen.go
rename to packer-plugin-sdk/bootcommand/gen.go
diff --git a/common/bootcommand/pc_xt_driver.go b/packer-plugin-sdk/bootcommand/pc_xt_driver.go
similarity index 97%
rename from common/bootcommand/pc_xt_driver.go
rename to packer-plugin-sdk/bootcommand/pc_xt_driver.go
index 2a3dcb746..93ab9f21f 100644
--- a/common/bootcommand/pc_xt_driver.go
+++ b/packer-plugin-sdk/bootcommand/pc_xt_driver.go
@@ -8,8 +8,6 @@ import (
 	"time"
 	"unicode"
 	"unicode/utf8"
-
-	"github.com/hashicorp/packer/common"
 )
 
 // SendCodeFunc will be called to send codes to the VM
@@ -41,8 +39,8 @@ func (sc *scancode) makeBreak() []string {
 func NewPCXTDriver(send SendCodeFunc, chunkSize int, interval time.Duration) *pcXTDriver {
 	// We delay (default 100ms) between each input event to allow for CPU or
 	// network latency. See PackerKeyEnv for tuning.
-	keyInterval := common.PackerKeyDefault
-	if delay, err := time.ParseDuration(os.Getenv(common.PackerKeyEnv)); err == nil {
+	keyInterval := PackerKeyDefault
+	if delay, err := time.ParseDuration(os.Getenv(PackerKeyEnv)); err == nil {
 		keyInterval = delay
 	}
 	// Override interval based on builder-specific override
diff --git a/common/bootcommand/pc_xt_driver_test.go b/packer-plugin-sdk/bootcommand/pc_xt_driver_test.go
similarity index 100%
rename from common/bootcommand/pc_xt_driver_test.go
rename to packer-plugin-sdk/bootcommand/pc_xt_driver_test.go
diff --git a/common/bootcommand/usb_driver.go b/packer-plugin-sdk/bootcommand/usb_driver.go
similarity index 95%
rename from common/bootcommand/usb_driver.go
rename to packer-plugin-sdk/bootcommand/usb_driver.go
index 519c28525..c79c5a312 100644
--- a/common/bootcommand/usb_driver.go
+++ b/packer-plugin-sdk/bootcommand/usb_driver.go
@@ -8,7 +8,6 @@ import (
 	"time"
 	"unicode"
 
-	"github.com/hashicorp/packer/common"
 	"golang.org/x/mobile/event/key"
 )
 
@@ -25,8 +24,8 @@ type usbDriver struct {
 func NewUSBDriver(send SendUsbScanCodes, interval time.Duration) *usbDriver {
 	// We delay (default 100ms) between each key event to allow for CPU or
 	// network latency. See PackerKeyEnv for tuning.
-	keyInterval := common.PackerKeyDefault
-	if delay, err := time.ParseDuration(os.Getenv(common.PackerKeyEnv)); err == nil {
+	keyInterval := PackerKeyDefault
+	if delay, err := time.ParseDuration(os.Getenv(PackerKeyEnv)); err == nil {
 		keyInterval = delay
 	}
 	// override interval based on builder-specific override.
diff --git a/common/bootcommand/usb_driver_test.go b/packer-plugin-sdk/bootcommand/usb_driver_test.go
similarity index 100%
rename from common/bootcommand/usb_driver_test.go
rename to packer-plugin-sdk/bootcommand/usb_driver_test.go
diff --git a/common/bootcommand/vnc_driver.go b/packer-plugin-sdk/bootcommand/vnc_driver.go
similarity index 95%
rename from common/bootcommand/vnc_driver.go
rename to packer-plugin-sdk/bootcommand/vnc_driver.go
index 027bcffca..f1b98ae8d 100644
--- a/common/bootcommand/vnc_driver.go
+++ b/packer-plugin-sdk/bootcommand/vnc_driver.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"time"
 	"unicode"
-
-	"github.com/hashicorp/packer/common"
 )
 
 const KeyLeftShift uint32 = 0xFFE1
@@ -28,8 +26,8 @@ type vncDriver struct {
 func NewVNCDriver(c VNCKeyEvent, interval time.Duration) *vncDriver {
 	// We delay (default 100ms) between each key event to allow for CPU or
 	// network latency. See PackerKeyEnv for tuning.
-	keyInterval := common.PackerKeyDefault
-	if delay, err := time.ParseDuration(os.Getenv(common.PackerKeyEnv)); err == nil {
+	keyInterval := PackerKeyDefault
+	if delay, err := time.ParseDuration(os.Getenv(PackerKeyEnv)); err == nil {
 		keyInterval = delay
 	}
 	// override interval based on builder-specific override.
diff --git a/common/bootcommand/vnc_driver_test.go b/packer-plugin-sdk/bootcommand/vnc_driver_test.go
similarity index 100%
rename from common/bootcommand/vnc_driver_test.go
rename to packer-plugin-sdk/bootcommand/vnc_driver_test.go
diff --git a/common/chroot/cleanup.go b/packer-plugin-sdk/chroot/cleanup.go
similarity index 73%
rename from common/chroot/cleanup.go
rename to packer-plugin-sdk/chroot/cleanup.go
index 0befac174..37691305a 100644
--- a/common/chroot/cleanup.go
+++ b/packer-plugin-sdk/chroot/cleanup.go
@@ -1,7 +1,7 @@
 package chroot
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // Cleanup is an interface that some steps implement for early cleanup.
diff --git a/common/chroot/communicator.go b/packer-plugin-sdk/chroot/communicator.go
similarity index 96%
rename from common/chroot/communicator.go
rename to packer-plugin-sdk/chroot/communicator.go
index a813baca8..33a6c4598 100644
--- a/common/chroot/communicator.go
+++ b/packer-plugin-sdk/chroot/communicator.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // Communicator is a special communicator that works by executing
diff --git a/common/chroot/communicator_test.go b/packer-plugin-sdk/chroot/communicator_test.go
similarity index 100%
rename from common/chroot/communicator_test.go
rename to packer-plugin-sdk/chroot/communicator_test.go
diff --git a/packer-plugin-sdk/chroot/doc.go b/packer-plugin-sdk/chroot/doc.go
new file mode 100644
index 000000000..d433e0618
--- /dev/null
+++ b/packer-plugin-sdk/chroot/doc.go
@@ -0,0 +1,25 @@
+/*
+Package chroot provides convenience tooling specific to chroot builders.
+
+Chroot builders work by creating a new volume from an existing source image and
+attaching it into an already-running instance. Once attached, a chroot is used
+to provision the system within that volume. After provisioning, the volume is
+detached, snapshotted, and a cloud-specific image is made.
+
+Using this process, minutes can be shaved off image build processes because a
+new instance doesn't need to be launched in the cloud before provisioning can
+take place.
+
+There are some restrictions, however. The host instance where the volume is
+attached to must be a similar system (generally the same OS version, kernel
+versions, etc.) as the image being built. Additionally, this process is much
+more expensive because the instance used to perform the build must be kept
+running persistently in order to build images, whereas the other non-chroot
+cloud image builders start instances on-demand to build images as needed.
+
+The HashiCorp-maintained Amazon and Azure builder plugins have chroot builders
+which use this option and can serve as an example for how the chroot steps and
+communicator are used.
+*/
+
+package chroot
diff --git a/common/chroot/interpolate_context_provider.go b/packer-plugin-sdk/chroot/interpolate_context_provider.go
similarity index 56%
rename from common/chroot/interpolate_context_provider.go
rename to packer-plugin-sdk/chroot/interpolate_context_provider.go
index ee19a19de..9d30b0dc1 100644
--- a/common/chroot/interpolate_context_provider.go
+++ b/packer-plugin-sdk/chroot/interpolate_context_provider.go
@@ -1,6 +1,6 @@
 package chroot
 
-import "github.com/hashicorp/packer/template/interpolate"
+import "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 
 type interpolateContextProvider interface {
 	GetContext() interpolate.Context
diff --git a/common/chroot/run_local_commands.go b/packer-plugin-sdk/chroot/run_local_commands.go
similarity index 83%
rename from common/chroot/run_local_commands.go
rename to packer-plugin-sdk/chroot/run_local_commands.go
index 8141d09e5..320c7dcca 100644
--- a/common/chroot/run_local_commands.go
+++ b/packer-plugin-sdk/chroot/run_local_commands.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func RunLocalCommands(commands []string, wrappedCommand common.CommandWrapper, ictx interpolate.Context, ui packer.Ui) error {
diff --git a/common/chroot/step_chroot_provision.go b/packer-plugin-sdk/chroot/step_chroot_provision.go
similarity index 81%
rename from common/chroot/step_chroot_provision.go
rename to packer-plugin-sdk/chroot/step_chroot_provision.go
index 5ab7182eb..e3e9030a7 100644
--- a/common/chroot/step_chroot_provision.go
+++ b/packer-plugin-sdk/chroot/step_chroot_provision.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"log"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 // StepChrootProvision provisions the instance within a chroot.
@@ -26,7 +27,7 @@ func (s *StepChrootProvision) Run(ctx context.Context, state multistep.StateBag)
 	}
 
 	// Loads hook data from builder's state, if it has been set.
-	hookData := common.PopulateProvisionHookData(state)
+	hookData := commonsteps.PopulateProvisionHookData(state)
 
 	// Update state generated_data with complete hookData
 	// to make them accessible by post-processors
diff --git a/common/chroot/step_copy_files.go b/packer-plugin-sdk/chroot/step_copy_files.go
similarity index 95%
rename from common/chroot/step_copy_files.go
rename to packer-plugin-sdk/chroot/step_copy_files.go
index ecf011b38..1d2efa7cf 100644
--- a/common/chroot/step_copy_files.go
+++ b/packer-plugin-sdk/chroot/step_copy_files.go
@@ -8,9 +8,9 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepCopyFiles copies some files from the host into the chroot environment.
diff --git a/common/chroot/step_copy_files_test.go b/packer-plugin-sdk/chroot/step_copy_files_test.go
similarity index 96%
rename from common/chroot/step_copy_files_test.go
rename to packer-plugin-sdk/chroot/step_copy_files_test.go
index 381f7ab82..e5ebabc85 100644
--- a/common/chroot/step_copy_files_test.go
+++ b/packer-plugin-sdk/chroot/step_copy_files_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // testUI returns a test ui plus a function to retrieve the errors written to the ui
diff --git a/common/chroot/step_early_cleanup.go b/packer-plugin-sdk/chroot/step_early_cleanup.go
similarity index 93%
rename from common/chroot/step_early_cleanup.go
rename to packer-plugin-sdk/chroot/step_early_cleanup.go
index 42d7d66c5..e84ac77e2 100644
--- a/common/chroot/step_early_cleanup.go
+++ b/packer-plugin-sdk/chroot/step_early_cleanup.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"log"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepEarlyCleanup performs some of the cleanup steps early in order to
diff --git a/common/chroot/step_mount_extra.go b/packer-plugin-sdk/chroot/step_mount_extra.go
similarity index 96%
rename from common/chroot/step_mount_extra.go
rename to packer-plugin-sdk/chroot/step_mount_extra.go
index a8a9f3ffb..8d460718c 100644
--- a/common/chroot/step_mount_extra.go
+++ b/packer-plugin-sdk/chroot/step_mount_extra.go
@@ -8,9 +8,9 @@ import (
 	"os/exec"
 	"syscall"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepMountExtra mounts the attached device.
diff --git a/common/chroot/step_mount_extra_test.go b/packer-plugin-sdk/chroot/step_mount_extra_test.go
similarity index 100%
rename from common/chroot/step_mount_extra_test.go
rename to packer-plugin-sdk/chroot/step_mount_extra_test.go
diff --git a/common/chroot/step_post_mount_commands.go b/packer-plugin-sdk/chroot/step_post_mount_commands.go
similarity index 91%
rename from common/chroot/step_post_mount_commands.go
rename to packer-plugin-sdk/chroot/step_post_mount_commands.go
index 77f0cfc72..d6ee85968 100644
--- a/common/chroot/step_post_mount_commands.go
+++ b/packer-plugin-sdk/chroot/step_post_mount_commands.go
@@ -3,9 +3,9 @@ package chroot
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type postMountCommandsData struct {
diff --git a/common/chroot/step_pre_mount_commands.go b/packer-plugin-sdk/chroot/step_pre_mount_commands.go
similarity index 90%
rename from common/chroot/step_pre_mount_commands.go
rename to packer-plugin-sdk/chroot/step_pre_mount_commands.go
index 8ff829917..20404659f 100644
--- a/common/chroot/step_pre_mount_commands.go
+++ b/packer-plugin-sdk/chroot/step_pre_mount_commands.go
@@ -3,9 +3,9 @@ package chroot
 import (
 	"context"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type preMountCommandsData struct {
diff --git a/packer-plugin-sdk/common/command.go b/packer-plugin-sdk/common/command.go
new file mode 100644
index 000000000..cdc8f7b95
--- /dev/null
+++ b/packer-plugin-sdk/common/command.go
@@ -0,0 +1,22 @@
+package common
+
+import (
+	"os/exec"
+)
+
+// CommandWrapper is a type that given a command, will modify that
+// command in-flight. This might return an error.
+// For example, your command could be `foo` and your CommandWrapper could be
+// func(s string) (string, error) {
+//	 return fmt.Sprintf("/bin/sh/ %s", s)
+// }
+// Using the CommandWrapper, you can set environment variables or perform
+// string interpolation once rather than many times, to save some lines of code
+// if similar wrapping needs to be performed many times during a plugin run.
+type CommandWrapper func(string) (string, error)
+
+// ShellCommand takes a command string and returns an *exec.Cmd to execute
+// it within the context of a shell (/bin/sh).
+func ShellCommand(command string) *exec.Cmd {
+	return exec.Command("/bin/sh", "-c", command)
+}
diff --git a/common/packer_config.go b/packer-plugin-sdk/common/packer_config.go
similarity index 85%
rename from common/packer_config.go
rename to packer-plugin-sdk/common/packer_config.go
index dcf77f9fb..2a666bc5d 100644
--- a/common/packer_config.go
+++ b/packer-plugin-sdk/common/packer_config.go
@@ -2,10 +2,12 @@ package common
 
 // PackerConfig is a struct that contains the configuration keys that
 // are sent by packer, properly tagged already so mapstructure can load
-// them. Embed this structure into your configuration class to get it.
+// them. Embed this structure into your configuration class to get access to
+// this information from the Packer Core.
 type PackerConfig struct {
 	PackerBuildName     string            `mapstructure:"packer_build_name"`
 	PackerBuilderType   string            `mapstructure:"packer_builder_type"`
+	PackerCoreVersion   string            `mapstructure:"packer_core_version"`
 	PackerDebug         bool              `mapstructure:"packer_debug"`
 	PackerForce         bool              `mapstructure:"packer_force"`
 	PackerOnError       string            `mapstructure:"packer_on_error"`
diff --git a/packer-plugin-sdk/filelock/doc.go b/packer-plugin-sdk/filelock/doc.go
new file mode 100644
index 000000000..28a5c9ad6
--- /dev/null
+++ b/packer-plugin-sdk/filelock/doc.go
@@ -0,0 +1,6 @@
+/*
+Package filelock makes it easy to create and check file locks for concurrent
+processes.
+*/
+
+package filelock
diff --git a/common/filelock/filelock.go b/packer-plugin-sdk/filelock/filelock.go
similarity index 100%
rename from common/filelock/filelock.go
rename to packer-plugin-sdk/filelock/filelock.go
diff --git a/common/filelock/filelock_solaris.go b/packer-plugin-sdk/filelock/filelock_solaris.go
similarity index 100%
rename from common/filelock/filelock_solaris.go
rename to packer-plugin-sdk/filelock/filelock_solaris.go
diff --git a/common/filelock/noop.go b/packer-plugin-sdk/filelock/noop.go
similarity index 100%
rename from common/filelock/noop.go
rename to packer-plugin-sdk/filelock/noop.go
diff --git a/packer-plugin-sdk/guestexec/doc.go b/packer-plugin-sdk/guestexec/doc.go
new file mode 100644
index 000000000..391ee5c29
--- /dev/null
+++ b/packer-plugin-sdk/guestexec/doc.go
@@ -0,0 +1,12 @@
+/*
+Package guestexec provides a shim for running common operating system commands
+on the guest/remote instance that is being provisioned. It helps provisioners
+which need to perform operating-system specific calls do so in a way that is
+simple and repeatable.
+
+Note that to successfully use this package your provisioner must have knowledge
+of the guest type, which is not information that builders generally collect --
+your provisioner will have to require guest information in its config.
+*/
+
+package guestexec
diff --git a/provisioner/elevated.go b/packer-plugin-sdk/guestexec/elevated.go
similarity index 98%
rename from provisioner/elevated.go
rename to packer-plugin-sdk/guestexec/elevated.go
index 71addb563..4abfc99af 100644
--- a/provisioner/elevated.go
+++ b/packer-plugin-sdk/guestexec/elevated.go
@@ -1,4 +1,4 @@
-package provisioner
+package guestexec
 
 import (
 	"bytes"
@@ -8,8 +8,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/hashicorp/packer/common/uuid"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type ElevatedProvisioner interface {
diff --git a/provisioner/elevated_test.go b/packer-plugin-sdk/guestexec/elevated_test.go
similarity index 97%
rename from provisioner/elevated_test.go
rename to packer-plugin-sdk/guestexec/elevated_test.go
index ac8759ef2..c9d44e817 100644
--- a/provisioner/elevated_test.go
+++ b/packer-plugin-sdk/guestexec/elevated_test.go
@@ -1,4 +1,4 @@
-package provisioner
+package guestexec
 
 import (
 	"regexp"
diff --git a/provisioner/guest_commands.go b/packer-plugin-sdk/guestexec/guest_commands.go
similarity index 99%
rename from provisioner/guest_commands.go
rename to packer-plugin-sdk/guestexec/guest_commands.go
index ca2b238a4..549ba3ccb 100644
--- a/provisioner/guest_commands.go
+++ b/packer-plugin-sdk/guestexec/guest_commands.go
@@ -1,4 +1,4 @@
-package provisioner
+package guestexec
 
 import (
 	"fmt"
diff --git a/provisioner/guest_commands_test.go b/packer-plugin-sdk/guestexec/guest_commands_test.go
similarity index 99%
rename from provisioner/guest_commands_test.go
rename to packer-plugin-sdk/guestexec/guest_commands_test.go
index ffbad4bbd..d6300c8e3 100644
--- a/provisioner/guest_commands_test.go
+++ b/packer-plugin-sdk/guestexec/guest_commands_test.go
@@ -1,4 +1,4 @@
-package provisioner
+package guestexec
 
 import (
 	"testing"
diff --git a/common/iochan/iochan.go b/packer-plugin-sdk/iochan/iochan.go
similarity index 100%
rename from common/iochan/iochan.go
rename to packer-plugin-sdk/iochan/iochan.go
diff --git a/common/iochan/iochan_test.go b/packer-plugin-sdk/iochan/iochan_test.go
similarity index 100%
rename from common/iochan/iochan_test.go
rename to packer-plugin-sdk/iochan/iochan_test.go
diff --git a/common/json/unmarshal.go b/packer-plugin-sdk/json/unmarshal.go
similarity index 100%
rename from common/json/unmarshal.go
rename to packer-plugin-sdk/json/unmarshal.go
diff --git a/common/json/unmarshal_test.go b/packer-plugin-sdk/json/unmarshal_test.go
similarity index 100%
rename from common/json/unmarshal_test.go
rename to packer-plugin-sdk/json/unmarshal_test.go
diff --git a/helper/multistep/LICENSE.md b/packer-plugin-sdk/multistep/LICENSE.md
similarity index 100%
rename from helper/multistep/LICENSE.md
rename to packer-plugin-sdk/multistep/LICENSE.md
diff --git a/helper/multistep/basic_runner.go b/packer-plugin-sdk/multistep/basic_runner.go
similarity index 100%
rename from helper/multistep/basic_runner.go
rename to packer-plugin-sdk/multistep/basic_runner.go
diff --git a/helper/multistep/basic_runner_test.go b/packer-plugin-sdk/multistep/basic_runner_test.go
similarity index 100%
rename from helper/multistep/basic_runner_test.go
rename to packer-plugin-sdk/multistep/basic_runner_test.go
diff --git a/packer-plugin-sdk/multistep/commonsteps/doc.go b/packer-plugin-sdk/multistep/commonsteps/doc.go
new file mode 100644
index 000000000..b5b7e90af
--- /dev/null
+++ b/packer-plugin-sdk/multistep/commonsteps/doc.go
@@ -0,0 +1,16 @@
+/*
+The commonsteps package contains the multistep runner that comprises the main
+architectural convention of Packer builder plugins. It enables builders
+to respect global Packer flags like "on-error" and "debug". It also contains
+a selection of convenience "multistep" steps that perform globally relevant
+tasks that many or most builders will want to implement -- for example,
+launching Packer's internal HTTP server for serving files to the instance.
+
+It also provides step_provision, which contains the hooks necessary for allowing
+provisioners to run inside your builder.
+
+While it is possible to create a simple builder without using the multistep
+runner or step_provision, your builder will lack core Packer functionality.
+*/
+
+package commonsteps
diff --git a/common/extra_iso_config.go b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go
similarity index 96%
rename from common/extra_iso_config.go
rename to packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go
index 56665bbc3..749a59bf7 100644
--- a/common/extra_iso_config.go
+++ b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go
@@ -1,6 +1,6 @@
 //go:generate struct-markdown
 
-package common
+package commonsteps
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // An iso (CD) containing custom files can be made available for your build.
diff --git a/common/extra_iso_config_test.go b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go
similarity index 99%
rename from common/extra_iso_config_test.go
rename to packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go
index bcc555976..70b87057f 100644
--- a/common/extra_iso_config_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/extra_iso_config_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"testing"
diff --git a/common/floppy_config.go b/packer-plugin-sdk/multistep/commonsteps/floppy_config.go
similarity index 96%
rename from common/floppy_config.go
rename to packer-plugin-sdk/multistep/commonsteps/floppy_config.go
index 5a78b4f7a..71685e23c 100644
--- a/common/floppy_config.go
+++ b/packer-plugin-sdk/multistep/commonsteps/floppy_config.go
@@ -1,6 +1,6 @@
 //go:generate struct-markdown
 
-package common
+package commonsteps
 
 import (
 	"fmt"
@@ -8,7 +8,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // A floppy can be made available for your build. This is most useful for
diff --git a/common/floppy_config_test.go b/packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go
similarity index 98%
rename from common/floppy_config_test.go
rename to packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go
index ee9c742ff..235652e24 100644
--- a/common/floppy_config_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/floppy_config_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"testing"
diff --git a/common/http_config.go b/packer-plugin-sdk/multistep/commonsteps/http_config.go
similarity index 96%
rename from common/http_config.go
rename to packer-plugin-sdk/multistep/commonsteps/http_config.go
index 4977b68ce..6939c43ec 100644
--- a/common/http_config.go
+++ b/packer-plugin-sdk/multistep/commonsteps/http_config.go
@@ -1,11 +1,11 @@
 //go:generate struct-markdown
 
-package common
+package commonsteps
 
 import (
 	"errors"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Packer will create an http server serving `http_directory` when it is set, a
diff --git a/common/http_config_test.go b/packer-plugin-sdk/multistep/commonsteps/http_config_test.go
similarity index 97%
rename from common/http_config_test.go
rename to packer-plugin-sdk/multistep/commonsteps/http_config_test.go
index 02b800845..add5c9304 100644
--- a/common/http_config_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/http_config_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"testing"
diff --git a/common/iso_config.go b/packer-plugin-sdk/multistep/commonsteps/iso_config.go
similarity index 98%
rename from common/iso_config.go
rename to packer-plugin-sdk/multistep/commonsteps/iso_config.go
index a84d5076d..5034939a0 100644
--- a/common/iso_config.go
+++ b/packer-plugin-sdk/multistep/commonsteps/iso_config.go
@@ -1,6 +1,6 @@
 //go:generate struct-markdown
 
-package common
+package commonsteps
 
 import (
 	"context"
@@ -12,7 +12,7 @@ import (
 
 	getter "github.com/hashicorp/go-getter/v2"
 	urlhelper "github.com/hashicorp/go-getter/v2/helper/url"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // By default, Packer will symlink, download or copy image files to the Packer
diff --git a/common/iso_config_test.go b/packer-plugin-sdk/multistep/commonsteps/iso_config_test.go
similarity index 99%
rename from common/iso_config_test.go
rename to packer-plugin-sdk/multistep/commonsteps/iso_config_test.go
index 502195d52..cdf97aa6f 100644
--- a/common/iso_config_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/iso_config_test.go
@@ -1,6 +1,6 @@
 // +build !windows
 
-package common
+package commonsteps
 
 import (
 	"io"
diff --git a/common/multistep_debug.go b/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go
similarity index 93%
rename from common/multistep_debug.go
rename to packer-plugin-sdk/multistep/commonsteps/multistep_debug.go
index 2d1a58291..74b45a61c 100644
--- a/common/multistep_debug.go
+++ b/packer-plugin-sdk/multistep/commonsteps/multistep_debug.go
@@ -1,12 +1,12 @@
-package common
+package commonsteps
 
 import (
 	"fmt"
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // MultistepDebugFn will return a proper multistep.DebugPauseFn to
diff --git a/common/multistep_runner.go b/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go
similarity index 90%
rename from common/multistep_runner.go
rename to packer-plugin-sdk/multistep/commonsteps/multistep_runner.go
index 7dd614562..d9654cc6c 100644
--- a/common/multistep_runner.go
+++ b/packer-plugin-sdk/multistep/commonsteps/multistep_runner.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -8,11 +8,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
-func newRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) {
+func newRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) (multistep.Runner, multistep.DebugPauseFn) {
 	switch config.PackerOnError {
 	case "", "cleanup":
 	case "abort":
@@ -47,7 +48,7 @@ func newRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) (multi
 
 // NewRunner returns a multistep.Runner that runs steps augmented with support
 // for -debug and -on-error command line arguments.
-func NewRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) multistep.Runner {
+func NewRunner(steps []multistep.Step, config common.PackerConfig, ui packer.Ui) multistep.Runner {
 	runner, _ := newRunner(steps, config, ui)
 	return runner
 }
@@ -56,7 +57,7 @@ func NewRunner(steps []multistep.Step, config PackerConfig, ui packer.Ui) multis
 // with support for -debug and -on-error command line arguments.  With -debug it
 // puts the multistep.DebugPauseFn that will pause execution between steps into
 // the state under the key "pauseFn".
-func NewRunnerWithPauseFn(steps []multistep.Step, config PackerConfig, ui packer.Ui, state multistep.StateBag) multistep.Runner {
+func NewRunnerWithPauseFn(steps []multistep.Step, config common.PackerConfig, ui packer.Ui, state multistep.StateBag) multistep.Runner {
 	runner, pauseFn := newRunner(steps, config, ui)
 	if pauseFn != nil {
 		state.Put("pauseFn", pauseFn)
diff --git a/common/step_cleanup_temp_keys.go b/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go
similarity index 96%
rename from common/step_cleanup_temp_keys.go
rename to packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go
index a6235a91d..0bb41c342 100644
--- a/common/step_cleanup_temp_keys.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_cleanup_temp_keys.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -6,8 +6,8 @@ import (
 	"log"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type StepCleanupTempKeys struct {
diff --git a/common/step_create_cdrom.go b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go
similarity index 97%
rename from common/step_create_cdrom.go
rename to packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go
index 3a350cce9..0729ae09c 100644
--- a/common/step_create_cdrom.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -11,10 +11,10 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/builder/localexec"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell-local/localexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 // StepCreateCD will create a CD disk with the given files.
diff --git a/common/step_create_cdrom_test.go b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go
similarity index 97%
rename from common/step_create_cdrom_test.go
rename to packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go
index bdcc83535..efec6b9fc 100644
--- a/common/step_create_cdrom_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_create_cdrom_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"bytes"
@@ -8,8 +8,8 @@ import (
 	"path"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestStepCreateCD_Impl(t *testing.T) {
diff --git a/common/step_create_floppy.go b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go
similarity index 98%
rename from common/step_create_floppy.go
rename to packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go
index 128a0e78b..5354143df 100644
--- a/common/step_create_floppy.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -10,9 +10,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/mitchellh/go-fs"
 	"github.com/mitchellh/go-fs/fat"
 )
diff --git a/common/step_create_floppy_test.go b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go
similarity index 98%
rename from common/step_create_floppy_test.go
rename to packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go
index e2680acdb..d4cde0c94 100644
--- a/common/step_create_floppy_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_create_floppy_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"bytes"
@@ -12,8 +12,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 const TestFixtures = "test-fixtures"
diff --git a/common/step_download.go b/packer-plugin-sdk/multistep/commonsteps/step_download.go
similarity index 98%
rename from common/step_download.go
rename to packer-plugin-sdk/multistep/commonsteps/step_download.go
index f2f0ca177..36a38ae7c 100644
--- a/common/step_download.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_download.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -17,9 +17,9 @@ import (
 	getter "github.com/hashicorp/go-getter/v2"
 	urlhelper "github.com/hashicorp/go-getter/v2/helper/url"
 
-	"github.com/hashicorp/packer/common/filelock"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/filelock"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepDownload downloads a remote file using the download client within
diff --git a/common/step_download_test.go b/packer-plugin-sdk/multistep/commonsteps/step_download_test.go
similarity index 98%
rename from common/step_download_test.go
rename to packer-plugin-sdk/multistep/commonsteps/step_download_test.go
index 26cd026e9..77ae98a68 100644
--- a/common/step_download_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_download_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"bytes"
@@ -17,9 +17,9 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	urlhelper "github.com/hashicorp/go-getter/v2/helper/url"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 var _ multistep.Step = new(StepDownload)
diff --git a/common/step_http_server.go b/packer-plugin-sdk/multistep/commonsteps/step_http_server.go
similarity index 92%
rename from common/step_http_server.go
rename to packer-plugin-sdk/multistep/commonsteps/step_http_server.go
index c63e51dcd..6da16718e 100644
--- a/common/step_http_server.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_http_server.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -6,9 +6,9 @@ import (
 
 	"net/http"
 
-	"github.com/hashicorp/packer/common/net"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 // This step creates and runs the HTTP server that is serving files from the
diff --git a/common/step_output_dir.go b/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go
similarity index 95%
rename from common/step_output_dir.go
rename to packer-plugin-sdk/multistep/commonsteps/step_output_dir.go
index 4f68b80c2..c1e43716a 100644
--- a/common/step_output_dir.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_output_dir.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepOutputDir sets up the output directory by creating it if it does
diff --git a/common/step_output_dir_test.go b/packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go
similarity index 97%
rename from common/step_output_dir_test.go
rename to packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go
index 7a5f58d95..f10e2ddd3 100644
--- a/common/step_output_dir_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_output_dir_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"bytes"
@@ -7,8 +7,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testState(t *testing.T) multistep.StateBag {
diff --git a/common/step_provision.go b/packer-plugin-sdk/multistep/commonsteps/step_provision.go
similarity index 98%
rename from common/step_provision.go
rename to packer-plugin-sdk/multistep/commonsteps/step_provision.go
index 2326649b9..9b7cc47e2 100644
--- a/common/step_provision.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_provision.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"context"
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 // StepProvision runs the provisioners.
diff --git a/common/step_provision_test.go b/packer-plugin-sdk/multistep/commonsteps/step_provision_test.go
similarity index 97%
rename from common/step_provision_test.go
rename to packer-plugin-sdk/multistep/commonsteps/step_provision_test.go
index 33a971e13..903fea023 100644
--- a/common/step_provision_test.go
+++ b/packer-plugin-sdk/multistep/commonsteps/step_provision_test.go
@@ -1,4 +1,4 @@
-package common
+package commonsteps
 
 import (
 	"fmt"
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func testCommConfig() *communicator.Config {
diff --git a/common/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/SomeDir/myfile.txt
similarity index 100%
rename from common/test-fixtures/SomeDir/myfile.txt
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/SomeDir/myfile.txt
diff --git a/common/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file1
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-0/file1
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file1
diff --git a/common/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file2
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-0/file2
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file2
diff --git a/common/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file3
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-0/file3
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-0/file3
diff --git a/common/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-1/dir1/file1
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file1
diff --git a/common/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-1/dir1/file2
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file2
diff --git a/common/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-1/dir1/file3
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-1/dir1/file3
diff --git a/common/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-2/dir1/file1
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/file1
diff --git a/common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
diff --git a/common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
diff --git a/common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
diff --git a/common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
similarity index 100%
rename from common/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
diff --git a/common/test-fixtures/root/another.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt
similarity index 100%
rename from common/test-fixtures/root/another.txt
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt
diff --git a/common/test-fixtures/root/another.txt.sha1sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt.sha1sum
similarity index 100%
rename from common/test-fixtures/root/another.txt.sha1sum
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/another.txt.sha1sum
diff --git a/common/test-fixtures/root/basic.txt b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt
similarity index 100%
rename from common/test-fixtures/root/basic.txt
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt
diff --git a/common/test-fixtures/root/basic.txt.sha1sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt.sha1sum
similarity index 100%
rename from common/test-fixtures/root/basic.txt.sha1sum
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/basic.txt.sha1sum
diff --git a/common/test-fixtures/root/subfolder.sum b/packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/subfolder.sum
similarity index 100%
rename from common/test-fixtures/root/subfolder.sum
rename to packer-plugin-sdk/multistep/commonsteps/test-fixtures/root/subfolder.sum
diff --git a/helper/multistep/debug_runner.go b/packer-plugin-sdk/multistep/debug_runner.go
similarity index 100%
rename from helper/multistep/debug_runner.go
rename to packer-plugin-sdk/multistep/debug_runner.go
diff --git a/helper/multistep/debug_runner_test.go b/packer-plugin-sdk/multistep/debug_runner_test.go
similarity index 100%
rename from helper/multistep/debug_runner_test.go
rename to packer-plugin-sdk/multistep/debug_runner_test.go
diff --git a/helper/multistep/doc.go b/packer-plugin-sdk/multistep/doc.go
similarity index 100%
rename from helper/multistep/doc.go
rename to packer-plugin-sdk/multistep/doc.go
diff --git a/helper/multistep/if.go b/packer-plugin-sdk/multistep/if.go
similarity index 86%
rename from helper/multistep/if.go
rename to packer-plugin-sdk/multistep/if.go
index f485c50dc..f9705af62 100644
--- a/helper/multistep/if.go
+++ b/packer-plugin-sdk/multistep/if.go
@@ -3,7 +3,7 @@ package multistep
 // if returns step only if on is true.
 func If(on bool, step Step) Step {
 	if on == false {
-		return nil
+		return &nullStep{}
 	}
 	return step
 }
diff --git a/helper/multistep/multistep.go b/packer-plugin-sdk/multistep/multistep.go
similarity index 92%
rename from helper/multistep/multistep.go
rename to packer-plugin-sdk/multistep/multistep.go
index a4629bacf..a3e427c0c 100644
--- a/helper/multistep/multistep.go
+++ b/packer-plugin-sdk/multistep/multistep.go
@@ -61,3 +61,11 @@ type Runner interface {
 	// Run runs the steps with the given initial state.
 	Run(context.Context, StateBag)
 }
+
+type nullStep struct{}
+
+func (s nullStep) Run(ctx context.Context, state StateBag) StepAction {
+	return ActionContinue
+}
+
+func (s nullStep) Cleanup(state StateBag) {}
diff --git a/helper/multistep/multistep_test.go b/packer-plugin-sdk/multistep/multistep_test.go
similarity index 100%
rename from helper/multistep/multistep_test.go
rename to packer-plugin-sdk/multistep/multistep_test.go
diff --git a/helper/multistep/statebag.go b/packer-plugin-sdk/multistep/statebag.go
similarity index 100%
rename from helper/multistep/statebag.go
rename to packer-plugin-sdk/multistep/statebag.go
diff --git a/helper/multistep/statebag_test.go b/packer-plugin-sdk/multistep/statebag_test.go
similarity index 100%
rename from helper/multistep/statebag_test.go
rename to packer-plugin-sdk/multistep/statebag_test.go
diff --git a/common/net/configure_port.go b/packer-plugin-sdk/net/configure_port.go
similarity index 86%
rename from common/net/configure_port.go
rename to packer-plugin-sdk/net/configure_port.go
index 796acd5e6..3ab0bed3e 100644
--- a/common/net/configure_port.go
+++ b/packer-plugin-sdk/net/configure_port.go
@@ -10,18 +10,18 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/hashicorp/packer/common/filelock"
-	"github.com/hashicorp/packer/common/retry"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/filelock"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 var _ net.Listener = &Listener{}
 
-// Listener wraps a net.Lister with some magic packer capabilies. For example
-// until you call Listener.Close, any call to ListenRangeConfig.Listen cannot
-// bind to Port. Packer tries tells moving parts which port they can use, but
-// often the port has to be released before a 3rd party is started, like a VNC
-// server.
+// Listener wraps a net.Lister with some Packer-specific capabilies. For
+// example, until you call Listener.Close, any call to ListenRangeConfig.Listen
+// cannot bind to a Port. Packer tries to tell moving parts which port they can
+// use, but often the port has to be released before a 3rd party is started,
+// like a VNC server.
 type Listener struct {
 	// Listener can be closed but Port will be file locked by packer until
 	// Close is called.
diff --git a/common/net/configure_port_test.go b/packer-plugin-sdk/net/configure_port_test.go
similarity index 100%
rename from common/net/configure_port_test.go
rename to packer-plugin-sdk/net/configure_port_test.go
diff --git a/helper/common/default_client.go b/packer-plugin-sdk/net/default_client.go
similarity index 93%
rename from helper/common/default_client.go
rename to packer-plugin-sdk/net/default_client.go
index a9829568d..ae9b30b29 100644
--- a/helper/common/default_client.go
+++ b/packer-plugin-sdk/net/default_client.go
@@ -1,4 +1,4 @@
-package common
+package net
 
 import (
 	"net/http"
diff --git a/packer-plugin-sdk/packerbuilderdata/generated_data.go b/packer-plugin-sdk/packerbuilderdata/generated_data.go
new file mode 100644
index 000000000..c8b986081
--- /dev/null
+++ b/packer-plugin-sdk/packerbuilderdata/generated_data.go
@@ -0,0 +1,27 @@
+package packerbuilderdata
+
+import "github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+
+// This is used in the BasicPlaceholderData() func in the packer/provisioner.go
+// To force users to access generated data via the "generated" func.
+const PlaceholderMsg = "To set this dynamically in the Packer template, " +
+	"you must use the `build` function"
+
+// GeneratedData manages variables created and exported by a builder after
+// it starts, so that provisioners and post-processors can have access to
+// build data generated at runtime -- for example, instance ID or instance IP
+// address. Internally, it uses the builder's multistep.StateBag. The user
+// must make sure that the State field is not is not nil before calling Put().
+type GeneratedData struct {
+	// The builder's StateBag
+	State multistep.StateBag
+}
+
+func (gd *GeneratedData) Put(key string, data interface{}) {
+	genData := make(map[string]interface{})
+	if _, ok := gd.State.GetOk("generated_data"); ok {
+		genData = gd.State.Get("generated_data").(map[string]interface{})
+	}
+	genData[key] = data
+	gd.State.Put("generated_data", genData)
+}
diff --git a/builder/generated_data_test.go b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go
similarity index 91%
rename from builder/generated_data_test.go
rename to packer-plugin-sdk/packerbuilderdata/generated_data_test.go
index 09f673cc1..001754f76 100644
--- a/builder/generated_data_test.go
+++ b/packer-plugin-sdk/packerbuilderdata/generated_data_test.go
@@ -1,9 +1,9 @@
-package builder
+package packerbuilderdata
 
 import (
 	"testing"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestGeneratedData_Put(t *testing.T) {
diff --git a/common/random/string.go b/packer-plugin-sdk/random/string.go
similarity index 54%
rename from common/random/string.go
rename to packer-plugin-sdk/random/string.go
index 17926c401..bac4a355b 100644
--- a/common/random/string.go
+++ b/packer-plugin-sdk/random/string.go
@@ -19,11 +19,23 @@ var (
 
 var rnd = rand.New(rand.NewSource(time.Now().UnixNano() + int64(os.Getpid())))
 
-func Numbers(length int) string       { return String(PossibleNumbers, length) }
-func AlphaNum(length int) string      { return String(PossibleAlphaNum, length) }
+// Numbers returns a random numeric string of the given length
+func Numbers(length int) string { return String(PossibleNumbers, length) }
+
+// AlphaNum returns a random alphanumeric string of the given length. The
+// returned string can contain both uppercase and lowercase letters.
+func AlphaNum(length int) string { return String(PossibleAlphaNum, length) }
+
+// AlphaNumLower returns a random alphanumeric string of the given length. The
+// returned string can contain lowercase letters, but not uppercase.
 func AlphaNumLower(length int) string { return String(PossibleAlphaNumLower, length) }
+
+// AlphaNumUpper returns a random alphanumeric string of the given length. The
+// returned string can contain uppercase letters, but not lowercase.
 func AlphaNumUpper(length int) string { return String(PossibleAlphaNumUpper, length) }
 
+// String returns a random string of the given length, using only the component
+// characters provided in the "chooseFrom" string.
 func String(chooseFrom string, length int) (randomString string) {
 	cflen := len(chooseFrom)
 	bytes := make([]byte, length)
diff --git a/common/retry/retry.go b/packer-plugin-sdk/retry/retry.go
similarity index 82%
rename from common/retry/retry.go
rename to packer-plugin-sdk/retry/retry.go
index 746a6fc28..61e47050e 100644
--- a/common/retry/retry.go
+++ b/packer-plugin-sdk/retry/retry.go
@@ -36,7 +36,16 @@ func (err *RetryExhaustedError) Error() string {
 	return fmt.Sprintf("retry count exhausted. Last err: %s", err.Err)
 }
 
-// Run fn until context is cancelled up until StartTimeout time has passed.
+// Run will repeatedly retry the proivided fn within the constraints set in the
+// retry Config. It will retry until one of the following conditions is met:
+// - The provided context is cancelled.
+// - The Config.StartTimeout time has passed.
+// - The function returns without an error.
+// - The maximum number of tries, Config.Tries is exceeded.
+// - The function returns with an error that does not satisfy conditions
+//   set in the Config.ShouldRetry function.
+// If the given function (fn) does not return an error, then Run will return
+// nil. Otherwise, Run will return a relevant error.
 func (cfg Config) Run(ctx context.Context, fn func(context.Context) error) error {
 	retryDelay := func() time.Duration { return 2 * time.Second }
 	if cfg.RetryDelay != nil {
diff --git a/common/retry/retry_test.go b/packer-plugin-sdk/retry/retry_test.go
similarity index 100%
rename from common/retry/retry_test.go
rename to packer-plugin-sdk/retry/retry_test.go
diff --git a/common/retry/utils_test.go b/packer-plugin-sdk/retry/utils_test.go
similarity index 100%
rename from common/retry/utils_test.go
rename to packer-plugin-sdk/retry/utils_test.go
diff --git a/communicator/none/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/none/communicator.go
similarity index 100%
rename from communicator/none/communicator.go
rename to packer-plugin-sdk/sdk-internals/communicator/none/communicator.go
diff --git a/communicator/none/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/none/communicator_test.go
similarity index 100%
rename from communicator/none/communicator_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/none/communicator_test.go
diff --git a/communicator/ssh/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go
similarity index 99%
rename from communicator/ssh/communicator.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go
index 6636f6bda..03250953d 100644
--- a/communicator/ssh/communicator.go
+++ b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator.go
@@ -17,7 +17,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/pkg/sftp"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
diff --git a/communicator/ssh/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/communicator_test.go
similarity index 100%
rename from communicator/ssh/communicator_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/communicator_test.go
diff --git a/communicator/ssh/connect.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go
similarity index 100%
rename from communicator/ssh/connect.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connect.go
diff --git a/communicator/ssh/connect_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go
similarity index 95%
rename from communicator/ssh/connect_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go
index 3e8ba0e6e..9e4c0cc8b 100644
--- a/communicator/ssh/connect_test.go
+++ b/packer-plugin-sdk/sdk-internals/communicator/ssh/connect_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	helperssh "github.com/hashicorp/packer/helper/ssh"
+	helperssh "github.com/hashicorp/packer/helper/communicator/ssh"
 	"golang.org/x/crypto/ssh"
 )
 
diff --git a/communicator/ssh/connection.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go
similarity index 100%
rename from communicator/ssh/connection.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/connection.go
diff --git a/communicator/ssh/keyboard_interactive.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go
similarity index 100%
rename from communicator/ssh/keyboard_interactive.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive.go
diff --git a/communicator/ssh/keyboard_interactive_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive_test.go
similarity index 100%
rename from communicator/ssh/keyboard_interactive_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/keyboard_interactive_test.go
diff --git a/communicator/ssh/password.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/password.go
similarity index 100%
rename from communicator/ssh/password.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/password.go
diff --git a/communicator/ssh/password_test.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/password_test.go
similarity index 100%
rename from communicator/ssh/password_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/password_test.go
diff --git a/communicator/ssh/tunnel.go b/packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go
similarity index 100%
rename from communicator/ssh/tunnel.go
rename to packer-plugin-sdk/sdk-internals/communicator/ssh/tunnel.go
diff --git a/communicator/winrm/communicator.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go
similarity index 100%
rename from communicator/winrm/communicator.go
rename to packer-plugin-sdk/sdk-internals/communicator/winrm/communicator.go
diff --git a/communicator/winrm/communicator_test.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/communicator_test.go
similarity index 100%
rename from communicator/winrm/communicator_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/winrm/communicator_test.go
diff --git a/communicator/winrm/config.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/config.go
similarity index 100%
rename from communicator/winrm/config.go
rename to packer-plugin-sdk/sdk-internals/communicator/winrm/config.go
diff --git a/communicator/winrm/time.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/time.go
similarity index 100%
rename from communicator/winrm/time.go
rename to packer-plugin-sdk/sdk-internals/communicator/winrm/time.go
diff --git a/communicator/winrm/time_test.go b/packer-plugin-sdk/sdk-internals/communicator/winrm/time_test.go
similarity index 100%
rename from communicator/winrm/time_test.go
rename to packer-plugin-sdk/sdk-internals/communicator/winrm/time_test.go
diff --git a/common/shell-local/communicator.go b/packer-plugin-sdk/shell-local/communicator.go
similarity index 100%
rename from common/shell-local/communicator.go
rename to packer-plugin-sdk/shell-local/communicator.go
diff --git a/common/shell-local/communicator_test.go b/packer-plugin-sdk/shell-local/communicator_test.go
similarity index 100%
rename from common/shell-local/communicator_test.go
rename to packer-plugin-sdk/shell-local/communicator_test.go
diff --git a/common/shell-local/config.go b/packer-plugin-sdk/shell-local/config.go
similarity index 97%
rename from common/shell-local/config.go
rename to packer-plugin-sdk/shell-local/config.go
index cc819ae30..9ee2d614d 100644
--- a/common/shell-local/config.go
+++ b/packer-plugin-sdk/shell-local/config.go
@@ -10,10 +10,10 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/hashicorp/packer/common/shell"
-	configHelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
+	configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/common/shell-local/config.hcl2spec.go b/packer-plugin-sdk/shell-local/config.hcl2spec.go
similarity index 95%
rename from common/shell-local/config.hcl2spec.go
rename to packer-plugin-sdk/shell-local/config.hcl2spec.go
index e5f99372e..670cfde83 100644
--- a/common/shell-local/config.hcl2spec.go
+++ b/packer-plugin-sdk/shell-local/config.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/common/shell-local/config_test.go b/packer-plugin-sdk/shell-local/config_test.go
similarity index 100%
rename from common/shell-local/config_test.go
rename to packer-plugin-sdk/shell-local/config_test.go
diff --git a/packer-plugin-sdk/shell-local/doc.go b/packer-plugin-sdk/shell-local/doc.go
new file mode 100644
index 000000000..a27dec1fe
--- /dev/null
+++ b/packer-plugin-sdk/shell-local/doc.go
@@ -0,0 +1,14 @@
+/*
+Package shell-local is designed to make it easier to shell out locally on the
+machine running Packer. The top level tools in this package are probably not
+relevant to plugin maintainers, as they are implementation details shared
+between the HashiCorp-maintained shell-local provisioner and shell-local
+post-processor.
+
+The localexec sub-package can be used in any plugins that need local shell
+access, whether that is in a driver for a hypervisor, or a command to a third
+party cli tool. Please make sure that any third party tool dependencies are
+noted in your plugin's documentation.
+*/
+
+package shell_local
diff --git a/helper/builder/localexec/run_and_stream.go b/packer-plugin-sdk/shell-local/localexec/run_and_stream.go
similarity index 88%
rename from helper/builder/localexec/run_and_stream.go
rename to packer-plugin-sdk/shell-local/localexec/run_and_stream.go
index f40076cdb..d1c7d8d1c 100644
--- a/helper/builder/localexec/run_and_stream.go
+++ b/packer-plugin-sdk/shell-local/localexec/run_and_stream.go
@@ -10,10 +10,14 @@ import (
 	"sync"
 	"syscall"
 
-	"github.com/hashicorp/packer/common/iochan"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/iochan"
 )
 
+// RunAndStream allows you to run a local command and stream output to the UI.
+// This does not require use of a shell-local communicator, so is a nice tool
+// for plugins that need to shell out to a local dependency and provide clear
+// output to users.
 func RunAndStream(cmd *exec.Cmd, ui packer.Ui, sensitive []string) error {
 	stdout_r, stdout_w := io.Pipe()
 	stderr_r, stderr_w := io.Pipe()
diff --git a/helper/builder/localexec/run_and_stream_test.go b/packer-plugin-sdk/shell-local/localexec/run_and_stream_test.go
similarity index 100%
rename from helper/builder/localexec/run_and_stream_test.go
rename to packer-plugin-sdk/shell-local/localexec/run_and_stream_test.go
diff --git a/common/shell-local/run.go b/packer-plugin-sdk/shell-local/run.go
similarity index 94%
rename from common/shell-local/run.go
rename to packer-plugin-sdk/shell-local/run.go
index 7bf657123..8e52f5a09 100644
--- a/common/shell-local/run.go
+++ b/packer-plugin-sdk/shell-local/run.go
@@ -11,10 +11,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 func Run(ctx context.Context, ui packer.Ui, config *Config, generatedData map[string]interface{}) (bool, error) {
@@ -181,15 +181,15 @@ func createFlattenedEnvVars(config *Config) (string, error) {
 
 	// expose ip address variables
 	httpAddr := config.generatedData["PackerHTTPAddr"]
-	if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented {
+	if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented {
 		envVars["PACKER_HTTP_ADDR"] = httpAddr.(string)
 	}
 	httpIP := config.generatedData["PackerHTTPIP"]
-	if httpIP != nil && httpIP != common.HttpIPNotImplemented {
+	if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented {
 		envVars["PACKER_HTTP_IP"] = httpIP.(string)
 	}
 	httpPort := config.generatedData["PackerHTTPPort"]
-	if httpPort != nil && httpPort != common.HttpPortNotImplemented {
+	if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented {
 		envVars["PACKER_HTTP_PORT"] = httpPort.(string)
 	}
 
diff --git a/common/shell/exit_code.go b/packer-plugin-sdk/shell/exit_code.go
similarity index 100%
rename from common/shell/exit_code.go
rename to packer-plugin-sdk/shell/exit_code.go
diff --git a/common/shell/exit_code_test.go b/packer-plugin-sdk/shell/exit_code_test.go
similarity index 100%
rename from common/shell/exit_code_test.go
rename to packer-plugin-sdk/shell/exit_code_test.go
diff --git a/common/shell/shell.go b/packer-plugin-sdk/shell/shell.go
similarity index 67%
rename from common/shell/shell.go
rename to packer-plugin-sdk/shell/shell.go
index 2484de74d..6aa03dfb0 100644
--- a/common/shell/shell.go
+++ b/packer-plugin-sdk/shell/shell.go
@@ -1,9 +1,19 @@
 // Package shell defines code that is common in shells
 package shell
 
-import "github.com/hashicorp/packer/common"
+import "github.com/hashicorp/packer/packer-plugin-sdk/common"
 
-// Provisioner contains common fields to all shell provisioners
+// Provisioner contains common fields to all shell provisioners.
+// It is provided as a convenience to encourage plugin developers to
+// consider implementing these options, which we believe are valuable for all
+// shell-type provisioners. It also helps guarantee that option names for
+// similar options are the same across the various shell provisioners.
+// Validation and defaulting are left to the maintainer because appropriate
+// values and defaults will be different depending on which shell is used.
+// To use the Provisioner struct, embed it in your shell provisioner's config
+// using the `mapstructure:",squash"` struct tag. Examples can be found in the
+// HashiCorp-maintained "shell", "shell-local", "windows-shell" and "powershell"
+// provisioners.
 type Provisioner struct {
 	common.PackerConfig `mapstructure:",squash"`
 
diff --git a/common/shutdowncommand/config.go b/packer-plugin-sdk/shutdowncommand/config.go
similarity index 69%
rename from common/shutdowncommand/config.go
rename to packer-plugin-sdk/shutdowncommand/config.go
index efea7db8d..108b56d85 100644
--- a/common/shutdowncommand/config.go
+++ b/packer-plugin-sdk/shutdowncommand/config.go
@@ -5,9 +5,16 @@ package shutdowncommand
 import (
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
+// ShutdownConfig defines implementation details for shutting down a VM once it
+// is done provisioned.
+// It is provided as a convenience to encourage builder developers to
+// consider implementing these options, which we believe are valuable for all
+// builders. It also helps guarantee that option names for similar options
+// are the same across the various builders. Embed it in your builder config
+// using the `mapstructure:",squash"` struct tag.
 type ShutdownConfig struct {
 	// The command to use to gracefully shut down the machine once all
 	// provisioning is complete. By default this is an empty string, which
diff --git a/common/shutdowncommand/config_test.go b/packer-plugin-sdk/shutdowncommand/config_test.go
similarity index 91%
rename from common/shutdowncommand/config_test.go
rename to packer-plugin-sdk/shutdowncommand/config_test.go
index ada363a2f..50380b926 100644
--- a/common/shutdowncommand/config_test.go
+++ b/packer-plugin-sdk/shutdowncommand/config_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func testShutdownConfig() *ShutdownConfig {
diff --git a/hcl2template/types.kv.go b/packer-plugin-sdk/template/config/custom_types.go
similarity index 52%
rename from hcl2template/types.kv.go
rename to packer-plugin-sdk/template/config/custom_types.go
index a743b5778..398f24dd4 100644
--- a/hcl2template/types.kv.go
+++ b/packer-plugin-sdk/template/config/custom_types.go
@@ -1,7 +1,78 @@
 //go:generate mapstructure-to-hcl2 -type KeyValue,KeyValues,KeyValueFilter,NameValue,NameValues,NameValueFilter
+package config
 
-package hcl2template
+import (
+	"strconv"
+)
 
+type Trilean uint8
+
+const (
+	// This will assign unset to 0, which is the default value in interpolation
+	TriUnset Trilean = iota
+	TriTrue
+	TriFalse
+)
+
+func (t Trilean) ToString() string {
+	if t == TriTrue {
+		return "TriTrue"
+	} else if t == TriFalse {
+		return "TriFalse"
+	}
+	return "TriUnset"
+}
+
+func (t Trilean) ToBoolPointer() *bool {
+	if t == TriTrue {
+		return boolPointer(true)
+	} else if t == TriFalse {
+		return boolPointer(false)
+	}
+	return nil
+}
+
+func (t Trilean) True() bool {
+	if t == TriTrue {
+		return true
+	}
+	return false
+}
+
+func (t Trilean) False() bool {
+	if t == TriFalse {
+		return true
+	}
+	return false
+}
+
+func TrileanFromString(s string) (Trilean, error) {
+	if s == "" {
+		return TriUnset, nil
+	}
+
+	b, err := strconv.ParseBool(s)
+	if err != nil {
+		return TriUnset, err
+	} else if b == true {
+		return TriTrue, nil
+	} else {
+		return TriFalse, nil
+	}
+}
+
+func TrileanFromBool(b bool) Trilean {
+	if b {
+		return TriTrue
+	}
+	return TriFalse
+}
+
+func boolPointer(b bool) *bool {
+	return &b
+}
+
+// These are used to convert HCL blocks to key-value pairs
 type KeyValue struct {
 	Key   string
 	Value string
diff --git a/hcl2template/types.kv.hcl2spec.go b/packer-plugin-sdk/template/config/custom_types.hcl2spec.go
similarity index 99%
rename from hcl2template/types.kv.hcl2spec.go
rename to packer-plugin-sdk/template/config/custom_types.hcl2spec.go
index 9880d5207..6d78cda43 100644
--- a/hcl2template/types.kv.hcl2spec.go
+++ b/packer-plugin-sdk/template/config/custom_types.hcl2spec.go
@@ -1,5 +1,5 @@
 // Code generated by "mapstructure-to-hcl2 -type KeyValue,KeyValues,KeyValueFilter,NameValue,NameValues,NameValueFilter"; DO NOT EDIT.
-package hcl2template
+package config
 
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
diff --git a/helper/config/custom_types_test.go b/packer-plugin-sdk/template/config/custom_types_test.go
similarity index 100%
rename from helper/config/custom_types_test.go
rename to packer-plugin-sdk/template/config/custom_types_test.go
diff --git a/helper/config/decode.go b/packer-plugin-sdk/template/config/decode.go
similarity index 90%
rename from helper/config/decode.go
rename to packer-plugin-sdk/template/config/decode.go
index e351d20d0..4aa78530e 100644
--- a/helper/config/decode.go
+++ b/packer-plugin-sdk/template/config/decode.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 	"github.com/ryanuber/go-glob"
 	"github.com/zclconf/go-cty/cty"
@@ -113,6 +113,7 @@ func Decode(target interface{}, config *DecodeOpts, raws ...interface{}) error {
 		} else {
 			config.InterpolateContext.BuildName = ctx.BuildName
 			config.InterpolateContext.BuildType = ctx.BuildType
+			config.InterpolateContext.CorePackerVersionString = ctx.CorePackerVersionString
 			config.InterpolateContext.TemplatePath = ctx.TemplatePath
 			config.InterpolateContext.UserVariables = ctx.UserVariables
 			if config.InterpolateContext.Data == nil {
@@ -259,11 +260,12 @@ func DetectContextData(raws ...interface{}) (map[interface{}]interface{}, []inte
 // detecting things like user variables from the raw configuration params.
 func DetectContext(raws ...interface{}) (*interpolate.Context, error) {
 	var s struct {
-		BuildName     string            `mapstructure:"packer_build_name"`
-		BuildType     string            `mapstructure:"packer_builder_type"`
-		TemplatePath  string            `mapstructure:"packer_template_path"`
-		Vars          map[string]string `mapstructure:"packer_user_variables"`
-		SensitiveVars []string          `mapstructure:"packer_sensitive_variables"`
+		BuildName               string            `mapstructure:"packer_build_name"`
+		BuildType               string            `mapstructure:"packer_builder_type"`
+		CorePackerVersionString string            `mapstructure:"packer_core_version"`
+		TemplatePath            string            `mapstructure:"packer_template_path"`
+		Vars                    map[string]string `mapstructure:"packer_user_variables"`
+		SensitiveVars           []string          `mapstructure:"packer_sensitive_variables"`
 	}
 
 	for _, r := range raws {
@@ -274,11 +276,12 @@ func DetectContext(raws ...interface{}) (*interpolate.Context, error) {
 	}
 
 	return &interpolate.Context{
-		BuildName:          s.BuildName,
-		BuildType:          s.BuildType,
-		TemplatePath:       s.TemplatePath,
-		UserVariables:      s.Vars,
-		SensitiveVariables: s.SensitiveVars,
+		BuildName:               s.BuildName,
+		BuildType:               s.BuildType,
+		CorePackerVersionString: s.CorePackerVersionString,
+		TemplatePath:            s.TemplatePath,
+		UserVariables:           s.Vars,
+		SensitiveVariables:      s.SensitiveVars,
 	}, nil
 }
 
diff --git a/helper/config/decode_test.go b/packer-plugin-sdk/template/config/decode_test.go
similarity index 98%
rename from helper/config/decode_test.go
rename to packer-plugin-sdk/template/config/decode_test.go
index 4bc68d93a..d5caafb4c 100644
--- a/helper/config/decode_test.go
+++ b/packer-plugin-sdk/template/config/decode_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 func TestDecode(t *testing.T) {
diff --git a/helper/config/deprecated_options.go b/packer-plugin-sdk/template/config/deprecated_options.go
similarity index 100%
rename from helper/config/deprecated_options.go
rename to packer-plugin-sdk/template/config/deprecated_options.go
diff --git a/common/template/funcs.go b/packer-plugin-sdk/template/funcs.go
similarity index 85%
rename from common/template/funcs.go
rename to packer-plugin-sdk/template/funcs.go
index 06911cfdb..5c89553c0 100644
--- a/common/template/funcs.go
+++ b/packer-plugin-sdk/template/funcs.go
@@ -9,7 +9,7 @@ import (
 	"sync"
 
 	consulapi "github.com/hashicorp/consul/api"
-	awssmapi "github.com/hashicorp/packer/template/interpolate/aws/secretsmanager"
+	awssmapi "github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate/aws/secretsmanager"
 	vaultapi "github.com/hashicorp/vault/api"
 )
 
@@ -26,7 +26,8 @@ func DeprecatedTemplateFunc(funcName, useInstead string, deprecated func(string)
 	}
 }
 
-// Vault retrieves a secret from an HC vault KV store
+// Vault retrieves a secret from a HashiCorp Vault KV store.
+// It assumes the necessary environment variables are set.
 func Vault(path string, key string) (string, error) {
 
 	if token := os.Getenv("VAULT_TOKEN"); token == "" {
@@ -64,6 +65,8 @@ func Vault(path string, key string) (string, error) {
 	return "", errors.New("Vault path does not contain the requested key")
 }
 
+// Consul retrieves a value from a HashiCorp Consul KV store.
+// It assumes the necessary environment variables are set.
 func Consul(k string) (string, error) {
 	consulConfig := consulapi.DefaultConfig()
 	client, err := consulapi.NewClient(consulConfig)
@@ -88,6 +91,9 @@ func Consul(k string) (string, error) {
 	return value, nil
 }
 
+// GetAwsSecret retrieves a value from an AWS Secrets Manager.
+// It assumes that credentials are properly set in the AWS SDK's credential
+// chain.
 func GetAWSSecret(name, key string) (string, error) {
 	// Check if at least 1 parameter has been used
 	if len(name) == 0 {
diff --git a/template/interpolate/aws/secretsmanager/secretsmanager.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go
similarity index 100%
rename from template/interpolate/aws/secretsmanager/secretsmanager.go
rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager.go
diff --git a/template/interpolate/aws/secretsmanager/secretsmanager_test.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go
similarity index 100%
rename from template/interpolate/aws/secretsmanager/secretsmanager_test.go
rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/secretsmanager_test.go
diff --git a/template/interpolate/aws/secretsmanager/types.go b/packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go
similarity index 100%
rename from template/interpolate/aws/secretsmanager/types.go
rename to packer-plugin-sdk/template/interpolate/aws/secretsmanager/types.go
diff --git a/template/interpolate/funcs.go b/packer-plugin-sdk/template/interpolate/funcs.go
similarity index 94%
rename from template/interpolate/funcs.go
rename to packer-plugin-sdk/template/interpolate/funcs.go
index 8ec9b8c1f..d8b6e13f5 100644
--- a/template/interpolate/funcs.go
+++ b/packer-plugin-sdk/template/interpolate/funcs.go
@@ -10,10 +10,9 @@ import (
 	"text/template"
 	"time"
 
-	commontpl "github.com/hashicorp/packer/common/template"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/common"
-	"github.com/hashicorp/packer/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	commontpl "github.com/hashicorp/packer/packer-plugin-sdk/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 	strftime "github.com/jehiah/go-strftime"
 )
 
@@ -170,7 +169,7 @@ func passthroughOrInterpolate(data map[interface{}]interface{}, s string) (strin
 			// If we're in the first interpolation pass, the goal is to
 			// make sure that we pass the value through.
 			// TODO match against an actual string constant
-			if strings.Contains(hp, common.PlaceholderMsg) {
+			if strings.Contains(hp, packerbuilderdata.PlaceholderMsg) {
 				return fmt.Sprintf("{{.%s}}", s), nil
 			} else {
 				return hp, nil
@@ -242,8 +241,12 @@ func funcGenUuid(ctx *Context) interface{} {
 }
 
 func funcGenPackerVersion(ctx *Context) interface{} {
-	return func() string {
-		return version.FormattedVersion()
+	return func() (string, error) {
+		if ctx == nil || ctx.CorePackerVersionString == "" {
+			return "", errors.New("packer_version not available")
+		}
+
+		return ctx.CorePackerVersionString, nil
 	}
 }
 
diff --git a/template/interpolate/funcs_test.go b/packer-plugin-sdk/template/interpolate/funcs_test.go
similarity index 95%
rename from template/interpolate/funcs_test.go
rename to packer-plugin-sdk/template/interpolate/funcs_test.go
index 363ee9672..7de9b4707 100644
--- a/template/interpolate/funcs_test.go
+++ b/packer-plugin-sdk/template/interpolate/funcs_test.go
@@ -9,8 +9,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/helper/common"
-	"github.com/hashicorp/packer/version"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 func TestFuncBuildName(t *testing.T) {
@@ -351,7 +350,7 @@ func TestFuncPackerBuild(t *testing.T) {
 		},
 		// Data map is a map[string]string and contains value with placeholder.
 		{
-			DataMap:     map[string]string{"PartyVar": "PartyVal" + common.PlaceholderMsg},
+			DataMap:     map[string]string{"PartyVar": "PartyVal" + packerbuilderdata.PlaceholderMsg},
 			ErrExpected: false,
 			Template:    "{{ build `PartyVar` }}",
 			OutVal:      "{{.PartyVar}}",
@@ -372,14 +371,14 @@ func TestFuncPackerBuild(t *testing.T) {
 		},
 		// Data map is a map[interface{}]interface{} and contains value with placeholder.
 		{
-			DataMap:     map[interface{}]interface{}{"PartyVar": "PartyVal" + common.PlaceholderMsg},
+			DataMap:     map[interface{}]interface{}{"PartyVar": "PartyVal" + packerbuilderdata.PlaceholderMsg},
 			ErrExpected: false,
 			Template:    "{{ build `PartyVar` }}",
 			OutVal:      "{{.PartyVar}}",
 		},
 		// Data map is a map[interface{}]interface{} and doesn't have value.
 		{
-			DataMap:     map[interface{}]interface{}{"BadVar": "PartyVal" + common.PlaceholderMsg},
+			DataMap:     map[interface{}]interface{}{"BadVar": "PartyVal" + packerbuilderdata.PlaceholderMsg},
 			ErrExpected: true,
 			Template:    "{{ build `MissingVar` }}",
 			OutVal:      "",
@@ -413,7 +412,9 @@ func TestFuncPackerBuild(t *testing.T) {
 func TestFuncPackerVersion(t *testing.T) {
 	template := `{{packer_version}}`
 
-	ctx := &Context{}
+	ctx := &Context{
+		CorePackerVersionString: "1.4.3-dev [DEADC0DE]",
+	}
 	i := &I{Value: template}
 
 	result, err := i.Render(ctx)
@@ -422,9 +423,9 @@ func TestFuncPackerVersion(t *testing.T) {
 	}
 
 	// Only match the X.Y.Z portion of the whole version string.
-	if !strings.HasPrefix(result, version.Version) {
+	if !strings.HasPrefix(result, "1.4.3-dev [DEADC0DE]") {
 		t.Fatalf("Expected input to include: %s\n\nGot: %s",
-			version.Version, result)
+			"1.4.3-dev [DEADC0DE]", result)
 	}
 }
 
diff --git a/template/interpolate/i.go b/packer-plugin-sdk/template/interpolate/i.go
similarity index 96%
rename from template/interpolate/i.go
rename to packer-plugin-sdk/template/interpolate/i.go
index 852f7f116..8ad4e50df 100644
--- a/template/interpolate/i.go
+++ b/packer-plugin-sdk/template/interpolate/i.go
@@ -35,9 +35,10 @@ type Context struct {
 	//
 	// TemplatePath is the path to the template that this is being
 	// rendered within.
-	BuildName    string
-	BuildType    string
-	TemplatePath string
+	BuildName               string
+	BuildType               string
+	CorePackerVersionString string
+	TemplatePath            string
 }
 
 // NewContext returns an initialized empty context.
diff --git a/template/interpolate/i_test.go b/packer-plugin-sdk/template/interpolate/i_test.go
similarity index 100%
rename from template/interpolate/i_test.go
rename to packer-plugin-sdk/template/interpolate/i_test.go
diff --git a/template/interpolate/parse.go b/packer-plugin-sdk/template/interpolate/parse.go
similarity index 100%
rename from template/interpolate/parse.go
rename to packer-plugin-sdk/template/interpolate/parse.go
diff --git a/template/interpolate/parse_test.go b/packer-plugin-sdk/template/interpolate/parse_test.go
similarity index 100%
rename from template/interpolate/parse_test.go
rename to packer-plugin-sdk/template/interpolate/parse_test.go
diff --git a/template/interpolate/render.go b/packer-plugin-sdk/template/interpolate/render.go
similarity index 100%
rename from template/interpolate/render.go
rename to packer-plugin-sdk/template/interpolate/render.go
diff --git a/template/interpolate/render_test.go b/packer-plugin-sdk/template/interpolate/render_test.go
similarity index 100%
rename from template/interpolate/render_test.go
rename to packer-plugin-sdk/template/interpolate/render_test.go
diff --git a/template/parse.go b/packer-plugin-sdk/template/parse.go
similarity index 99%
rename from template/parse.go
rename to packer-plugin-sdk/template/parse.go
index 6bd4b8fa9..b96ec9d46 100644
--- a/template/parse.go
+++ b/packer-plugin-sdk/template/parse.go
@@ -12,7 +12,7 @@ import (
 	"strings"
 
 	multierror "github.com/hashicorp/go-multierror"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/template/parse_test.go b/packer-plugin-sdk/template/parse_test.go
similarity index 100%
rename from template/parse_test.go
rename to packer-plugin-sdk/template/parse_test.go
diff --git a/template/template.go b/packer-plugin-sdk/template/template.go
similarity index 100%
rename from template/template.go
rename to packer-plugin-sdk/template/template.go
diff --git a/template/template.hcl2spec.go b/packer-plugin-sdk/template/template.hcl2spec.go
similarity index 100%
rename from template/template.hcl2spec.go
rename to packer-plugin-sdk/template/template.hcl2spec.go
diff --git a/template/template_test.go b/packer-plugin-sdk/template/template_test.go
similarity index 100%
rename from template/template_test.go
rename to packer-plugin-sdk/template/template_test.go
diff --git a/template/test-fixtures/error-beginning.json b/packer-plugin-sdk/template/test-fixtures/error-beginning.json
similarity index 100%
rename from template/test-fixtures/error-beginning.json
rename to packer-plugin-sdk/template/test-fixtures/error-beginning.json
diff --git a/template/test-fixtures/error-duplicate-config.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json
similarity index 100%
rename from template/test-fixtures/error-duplicate-config.json
rename to packer-plugin-sdk/template/test-fixtures/error-duplicate-config.json
diff --git a/template/test-fixtures/error-duplicate-variables.json b/packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json
similarity index 100%
rename from template/test-fixtures/error-duplicate-variables.json
rename to packer-plugin-sdk/template/test-fixtures/error-duplicate-variables.json
diff --git a/template/test-fixtures/error-end.json b/packer-plugin-sdk/template/test-fixtures/error-end.json
similarity index 100%
rename from template/test-fixtures/error-end.json
rename to packer-plugin-sdk/template/test-fixtures/error-end.json
diff --git a/template/test-fixtures/error-middle.json b/packer-plugin-sdk/template/test-fixtures/error-middle.json
similarity index 100%
rename from template/test-fixtures/error-middle.json
rename to packer-plugin-sdk/template/test-fixtures/error-middle.json
diff --git a/template/test-fixtures/malformed.json b/packer-plugin-sdk/template/test-fixtures/malformed.json
similarity index 100%
rename from template/test-fixtures/malformed.json
rename to packer-plugin-sdk/template/test-fixtures/malformed.json
diff --git a/template/test-fixtures/parse-basic-config.json b/packer-plugin-sdk/template/test-fixtures/parse-basic-config.json
similarity index 100%
rename from template/test-fixtures/parse-basic-config.json
rename to packer-plugin-sdk/template/test-fixtures/parse-basic-config.json
diff --git a/template/test-fixtures/parse-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-basic.json
similarity index 100%
rename from template/test-fixtures/parse-basic.json
rename to packer-plugin-sdk/template/test-fixtures/parse-basic.json
diff --git a/template/test-fixtures/parse-builder-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json
similarity index 100%
rename from template/test-fixtures/parse-builder-no-type.json
rename to packer-plugin-sdk/template/test-fixtures/parse-builder-no-type.json
diff --git a/template/test-fixtures/parse-builder-repeat.json b/packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json
similarity index 100%
rename from template/test-fixtures/parse-builder-repeat.json
rename to packer-plugin-sdk/template/test-fixtures/parse-builder-repeat.json
diff --git a/template/test-fixtures/parse-comment.json b/packer-plugin-sdk/template/test-fixtures/parse-comment.json
similarity index 100%
rename from template/test-fixtures/parse-comment.json
rename to packer-plugin-sdk/template/test-fixtures/parse-comment.json
diff --git a/template/test-fixtures/parse-contents.json b/packer-plugin-sdk/template/test-fixtures/parse-contents.json
similarity index 100%
rename from template/test-fixtures/parse-contents.json
rename to packer-plugin-sdk/template/test-fixtures/parse-contents.json
diff --git a/template/test-fixtures/parse-description.json b/packer-plugin-sdk/template/test-fixtures/parse-description.json
similarity index 100%
rename from template/test-fixtures/parse-description.json
rename to packer-plugin-sdk/template/test-fixtures/parse-description.json
diff --git a/template/test-fixtures/parse-min-version.json b/packer-plugin-sdk/template/test-fixtures/parse-min-version.json
similarity index 100%
rename from template/test-fixtures/parse-min-version.json
rename to packer-plugin-sdk/template/test-fixtures/parse-min-version.json
diff --git a/template/test-fixtures/parse-monolithic.json b/packer-plugin-sdk/template/test-fixtures/parse-monolithic.json
similarity index 100%
rename from template/test-fixtures/parse-monolithic.json
rename to packer-plugin-sdk/template/test-fixtures/parse-monolithic.json
diff --git a/template/test-fixtures/parse-pp-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json
similarity index 100%
rename from template/test-fixtures/parse-pp-basic.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-basic.json
diff --git a/template/test-fixtures/parse-pp-except.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-except.json
similarity index 100%
rename from template/test-fixtures/parse-pp-except.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-except.json
diff --git a/template/test-fixtures/parse-pp-keep.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json
similarity index 100%
rename from template/test-fixtures/parse-pp-keep.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-keep.json
diff --git a/template/test-fixtures/parse-pp-map.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-map.json
similarity index 100%
rename from template/test-fixtures/parse-pp-map.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-map.json
diff --git a/template/test-fixtures/parse-pp-multi.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json
similarity index 100%
rename from template/test-fixtures/parse-pp-multi.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-multi.json
diff --git a/template/test-fixtures/parse-pp-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json
similarity index 100%
rename from template/test-fixtures/parse-pp-no-type.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-no-type.json
diff --git a/template/test-fixtures/parse-pp-only.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-only.json
similarity index 100%
rename from template/test-fixtures/parse-pp-only.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-only.json
diff --git a/template/test-fixtures/parse-pp-slice.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json
similarity index 100%
rename from template/test-fixtures/parse-pp-slice.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-slice.json
diff --git a/template/test-fixtures/parse-pp-string.json b/packer-plugin-sdk/template/test-fixtures/parse-pp-string.json
similarity index 100%
rename from template/test-fixtures/parse-pp-string.json
rename to packer-plugin-sdk/template/test-fixtures/parse-pp-string.json
diff --git a/template/test-fixtures/parse-provisioner-basic.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-basic.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-basic.json
diff --git a/template/test-fixtures/parse-provisioner-config.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-config.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-config.json
diff --git a/template/test-fixtures/parse-provisioner-except.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-except.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-except.json
diff --git a/template/test-fixtures/parse-provisioner-no-type.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-no-type.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-no-type.json
diff --git a/template/test-fixtures/parse-provisioner-only.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-only.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-only.json
diff --git a/template/test-fixtures/parse-provisioner-override.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-override.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-override.json
diff --git a/template/test-fixtures/parse-provisioner-pause-before.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-pause-before.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-pause-before.json
diff --git a/template/test-fixtures/parse-provisioner-retry.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-retry.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-retry.json
diff --git a/template/test-fixtures/parse-provisioner-timeout.json b/packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json
similarity index 100%
rename from template/test-fixtures/parse-provisioner-timeout.json
rename to packer-plugin-sdk/template/test-fixtures/parse-provisioner-timeout.json
diff --git a/template/test-fixtures/parse-variable-default.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-default.json
similarity index 100%
rename from template/test-fixtures/parse-variable-default.json
rename to packer-plugin-sdk/template/test-fixtures/parse-variable-default.json
diff --git a/template/test-fixtures/parse-variable-required.json b/packer-plugin-sdk/template/test-fixtures/parse-variable-required.json
similarity index 100%
rename from template/test-fixtures/parse-variable-required.json
rename to packer-plugin-sdk/template/test-fixtures/parse-variable-required.json
diff --git a/template/test-fixtures/validate-bad-override.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-override.json
similarity index 100%
rename from template/test-fixtures/validate-bad-override.json
rename to packer-plugin-sdk/template/test-fixtures/validate-bad-override.json
diff --git a/template/test-fixtures/validate-bad-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json
similarity index 100%
rename from template/test-fixtures/validate-bad-pp-except.json
rename to packer-plugin-sdk/template/test-fixtures/validate-bad-pp-except.json
diff --git a/template/test-fixtures/validate-bad-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json
similarity index 100%
rename from template/test-fixtures/validate-bad-pp-only.json
rename to packer-plugin-sdk/template/test-fixtures/validate-bad-pp-only.json
diff --git a/template/test-fixtures/validate-bad-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json
similarity index 100%
rename from template/test-fixtures/validate-bad-prov-except.json
rename to packer-plugin-sdk/template/test-fixtures/validate-bad-prov-except.json
diff --git a/template/test-fixtures/validate-bad-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json
similarity index 100%
rename from template/test-fixtures/validate-bad-prov-only.json
rename to packer-plugin-sdk/template/test-fixtures/validate-bad-prov-only.json
diff --git a/template/test-fixtures/validate-good-override.json b/packer-plugin-sdk/template/test-fixtures/validate-good-override.json
similarity index 100%
rename from template/test-fixtures/validate-good-override.json
rename to packer-plugin-sdk/template/test-fixtures/validate-good-override.json
diff --git a/template/test-fixtures/validate-good-pp-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json
similarity index 100%
rename from template/test-fixtures/validate-good-pp-except.json
rename to packer-plugin-sdk/template/test-fixtures/validate-good-pp-except.json
diff --git a/template/test-fixtures/validate-good-pp-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json
similarity index 100%
rename from template/test-fixtures/validate-good-pp-only.json
rename to packer-plugin-sdk/template/test-fixtures/validate-good-pp-only.json
diff --git a/template/test-fixtures/validate-good-prov-except.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json
similarity index 100%
rename from template/test-fixtures/validate-good-prov-except.json
rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-except.json
diff --git a/template/test-fixtures/validate-good-prov-only.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json
similarity index 100%
rename from template/test-fixtures/validate-good-prov-only.json
rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-only.json
diff --git a/template/test-fixtures/validate-good-prov-timeout.json b/packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json
similarity index 100%
rename from template/test-fixtures/validate-good-prov-timeout.json
rename to packer-plugin-sdk/template/test-fixtures/validate-good-prov-timeout.json
diff --git a/template/test-fixtures/validate-no-builders.json b/packer-plugin-sdk/template/test-fixtures/validate-no-builders.json
similarity index 100%
rename from template/test-fixtures/validate-no-builders.json
rename to packer-plugin-sdk/template/test-fixtures/validate-no-builders.json
diff --git a/packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt b/packer-plugin-sdk/test-fixtures/SomeDir/myfile.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/common/test-fixtures/decompress-tar/outside_parent.tar b/packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar
similarity index 100%
rename from common/test-fixtures/decompress-tar/outside_parent.tar
rename to packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar
diff --git a/common/test-fixtures/floppies/bar.bat b/packer-plugin-sdk/test-fixtures/floppies/bar.bat
similarity index 100%
rename from common/test-fixtures/floppies/bar.bat
rename to packer-plugin-sdk/test-fixtures/floppies/bar.bat
diff --git a/common/test-fixtures/floppies/foo.ps1 b/packer-plugin-sdk/test-fixtures/floppies/foo.ps1
similarity index 100%
rename from common/test-fixtures/floppies/foo.ps1
rename to packer-plugin-sdk/test-fixtures/floppies/foo.ps1
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-0/file3
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-1/dir1/file3
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir1/subdir1/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file1
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2 b/packer-plugin-sdk/test-fixtures/floppy-hier/test-2/dir2/subdir1/file2
new file mode 100644
index 000000000..e69de29bb
diff --git a/packer/tmp/tmp.go b/packer-plugin-sdk/tmp/tmp.go
similarity index 100%
rename from packer/tmp/tmp.go
rename to packer-plugin-sdk/tmp/tmp.go
diff --git a/helper/useragent/useragent.go b/packer-plugin-sdk/useragent/useragent.go
similarity index 55%
rename from helper/useragent/useragent.go
rename to packer-plugin-sdk/useragent/useragent.go
index 575d77aba..12f9facd5 100644
--- a/helper/useragent/useragent.go
+++ b/packer-plugin-sdk/useragent/useragent.go
@@ -3,8 +3,6 @@ package useragent
 import (
 	"fmt"
 	"runtime"
-
-	"github.com/hashicorp/packer/version"
 )
 
 var (
@@ -19,17 +17,10 @@ var (
 
 	// goarch is the architecture - variable for tests.
 	goarch = runtime.GOARCH
-
-	// versionFunc is the func that returns the current version. This is a
-	// function to take into account the different build processes and distinguish
-	// between enterprise and oss builds.
-	versionFunc = func() string {
-		return version.FormattedVersion()
-	}
 )
 
 // String returns the consistent user-agent string for Packer.
-func String() string {
+func String(packerVersion string) string {
 	return fmt.Sprintf("Packer/%s (+%s; %s; %s/%s)",
-		versionFunc(), projectURL, rt, goos, goarch)
+		packerVersion, projectURL, rt, goos, goarch)
 }
diff --git a/helper/useragent/useragent_test.go b/packer-plugin-sdk/useragent/useragent_test.go
similarity index 82%
rename from helper/useragent/useragent_test.go
rename to packer-plugin-sdk/useragent/useragent_test.go
index b792753c6..639e1b4fb 100644
--- a/helper/useragent/useragent_test.go
+++ b/packer-plugin-sdk/useragent/useragent_test.go
@@ -9,9 +9,8 @@ func TestUserAgent(t *testing.T) {
 	rt = "go5.0"
 	goos = "linux"
 	goarch = "amd64"
-	versionFunc = func() string { return "1.2.3" }
 
-	act := String()
+	act := String("1.2.3")
 
 	exp := "Packer/1.2.3 (+https://packer-test.com; go5.0; linux/amd64)"
 	if exp != act {
diff --git a/common/uuid/uuid.go b/packer-plugin-sdk/uuid/uuid.go
similarity index 100%
rename from common/uuid/uuid.go
rename to packer-plugin-sdk/uuid/uuid.go
diff --git a/common/uuid/uuid_test.go b/packer-plugin-sdk/uuid/uuid_test.go
similarity index 100%
rename from common/uuid/uuid_test.go
rename to packer-plugin-sdk/uuid/uuid_test.go
diff --git a/packer-plugin-sdk/version/version.go b/packer-plugin-sdk/version/version.go
new file mode 100644
index 000000000..a7f312a42
--- /dev/null
+++ b/packer-plugin-sdk/version/version.go
@@ -0,0 +1,81 @@
+// Version helps plugin creators set and track the plugin version using the same
+// convenience functions used by the Packer core.
+package version
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/hashicorp/go-version"
+)
+
+// The git commit that was compiled. This will be filled in by the compiler.
+var GitCommit string
+
+// InitializePluginVersion initializes the SemVer and returns a version var.
+// If the provided "version" string is not valid, the call to version.Must
+// will panic. Therefore, this function should always be called in a package
+// init() function to make sure that plugins are following proper semantic
+// versioning and to make sure that plugins which aren't following proper
+// semantic versioning crash immediately rather than later.
+func InitializePluginVersion(vers, versionPrerelease string) *PluginVersion {
+	pv := PluginVersion{
+		version:           vers,
+		versionPrerelease: versionPrerelease,
+	}
+	// This call initializes the SemVer to make sure that if Packer crashes due
+	// to an invalid SemVer it's at the very beginning of the Packer run.
+	pv.semVer = version.Must(version.NewVersion(vers))
+	return &pv
+}
+
+type PluginVersion struct {
+	// The main version number that is being run at the moment.
+	version string
+	// A pre-release marker for the version. If this is "" (empty string)
+	// then it means that it is a final release. Otherwise, this is a pre-release
+	// such as "dev" (in development), "beta", "rc1", etc.
+	versionPrerelease string
+	// The Semantic Version of the plugin. Used for version constraint comparisons
+	semVer *version.Version
+}
+
+func (p *PluginVersion) FormattedVersion() string {
+	var versionString bytes.Buffer
+	fmt.Fprintf(&versionString, "%s", p.version)
+	if p.versionPrerelease != "" {
+		fmt.Fprintf(&versionString, "-%s", p.versionPrerelease)
+
+		if GitCommit != "" {
+			fmt.Fprintf(&versionString, " (%s)", GitCommit)
+		}
+	}
+
+	return versionString.String()
+}
+
+func (p *PluginVersion) SemVer() *version.Version {
+	if p.semVer != nil {
+		// SemVer is an instance of version.Version. This has the secondary
+		// benefit of verifying during tests and init time that our version is a
+		// proper semantic version, which should always be the case.
+		p.semVer = version.Must(version.NewVersion(p.version))
+	}
+	return p.semVer
+}
+
+func (p *PluginVersion) GetVersion() string {
+	return p.version
+}
+
+func (p *PluginVersion) GetVersionPrerelease() string {
+	return p.versionPrerelease
+}
+
+// String returns the complete version string, including prerelease
+func (p *PluginVersion) String() string {
+	if p.versionPrerelease != "" {
+		return fmt.Sprintf("%s-%s", p.version, p.versionPrerelease)
+	}
+	return p.version
+}
diff --git a/packer/build.go b/packer/build.go
index 201922995..28e02f3c5 100644
--- a/packer/build.go
+++ b/packer/build.go
@@ -6,7 +6,8 @@ import (
 	"log"
 	"sync"
 
-	"github.com/hashicorp/packer/helper/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/version"
 )
 
 const (
@@ -19,6 +20,11 @@ const (
 	// such who want to make use of this.
 	BuilderTypeConfigKey = "packer_builder_type"
 
+	// this is the key in the configuration that is set to the version of the
+	// Packer Core. This can be used by plugins to set user agents, etc, without
+	// having to import the Core to find out the Packer version.
+	CoreVersionConfigKey = "packer_core_version"
+
 	// This is the key in configurations that is set to "true" when Packer
 	// debugging is enabled.
 	DebugConfigKey = "packer_debug"
@@ -160,6 +166,7 @@ func (b *CoreBuild) Prepare() (warn []string, err error) {
 	packerConfig := map[string]interface{}{
 		BuildNameConfigKey:     b.Type,
 		BuilderTypeConfigKey:   b.BuilderType,
+		CoreVersionConfigKey:   version.FormattedVersion(),
 		DebugConfigKey:         b.debug,
 		ForceConfigKey:         b.force,
 		OnErrorConfigKey:       b.onError,
@@ -182,7 +189,7 @@ func (b *CoreBuild) Prepare() (warn []string, err error) {
 	if generatedVars != nil {
 		for _, k := range generatedVars {
 			generatedPlaceholderMap[k] = fmt.Sprintf("Build_%s. "+
-				common.PlaceholderMsg, k)
+				packerbuilderdata.PlaceholderMsg, k)
 		}
 	}
 
diff --git a/packer/build_test.go b/packer/build_test.go
index dc1d698b6..49ff68f68 100644
--- a/packer/build_test.go
+++ b/packer/build_test.go
@@ -5,7 +5,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/packer/helper/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/version"
 )
 
 func boolPointer(tf bool) *bool {
@@ -41,6 +42,7 @@ func testDefaultPackerConfig() map[string]interface{} {
 	return map[string]interface{}{
 		BuildNameConfigKey:     "test",
 		BuilderTypeConfigKey:   "foo",
+		CoreVersionConfigKey:   version.FormattedVersion(),
 		DebugConfigKey:         false,
 		ForceConfigKey:         false,
 		OnErrorConfigKey:       "cleanup",
@@ -214,7 +216,7 @@ func TestBuildPrepare_ProvisionerGetsGeneratedMap(t *testing.T) {
 	}
 
 	generated := BasicPlaceholderData()
-	generated["PartyVar"] = "Build_PartyVar. " + common.PlaceholderMsg
+	generated["PartyVar"] = "Build_PartyVar. " + packerbuilderdata.PlaceholderMsg
 	if !reflect.DeepEqual(prov.PrepConfigs, []interface{}{42, packerConfig, generated}) {
 		t.Fatalf("bad: %#v", prov.PrepConfigs)
 	}
diff --git a/packer/communicator_test.go b/packer/communicator_test.go
index 097ca25d0..40450e98e 100644
--- a/packer/communicator_test.go
+++ b/packer/communicator_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/google/go-cmp/cmp"
-	"github.com/hashicorp/packer/common/iochan"
+	"github.com/hashicorp/packer/packer-plugin-sdk/iochan"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/packer/core.go b/packer/core.go
index 400914b33..218c764a8 100644
--- a/packer/core.go
+++ b/packer/core.go
@@ -15,8 +15,8 @@ import (
 	multierror "github.com/hashicorp/go-multierror"
 	version "github.com/hashicorp/go-version"
 	"github.com/hashicorp/hcl/v2"
-	"github.com/hashicorp/packer/template"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Core is the main executor of Packer. If Packer is being used as a
diff --git a/packer/core_test.go b/packer/core_test.go
index 864080072..2c5c70aa7 100644
--- a/packer/core_test.go
+++ b/packer/core_test.go
@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
-	configHelper "github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
+	configHelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 func TestCoreBuildNames(t *testing.T) {
diff --git a/packer/plugin/server.go b/packer/plugin/server.go
index 96e2011ce..1ed44f893 100644
--- a/packer/plugin/server.go
+++ b/packer/plugin/server.go
@@ -21,8 +21,8 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	packrpc "github.com/hashicorp/packer/packer/rpc"
-	"github.com/hashicorp/packer/packer/tmp"
 )
 
 // This is a count of the number of interrupts the process has received.
diff --git a/packer/provisioner.go b/packer/provisioner.go
index 834f7433f..78da57524 100644
--- a/packer/provisioner.go
+++ b/packer/provisioner.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/helper/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
 )
 
 // A provisioner is responsible for installing and configuring software
@@ -79,7 +79,7 @@ var BuilderDataCommonKeys = []string{
 func BasicPlaceholderData() map[string]string {
 	placeholderData := map[string]string{}
 	for _, key := range BuilderDataCommonKeys {
-		placeholderData[key] = fmt.Sprintf("Build_%s. "+common.PlaceholderMsg, key)
+		placeholderData[key] = fmt.Sprintf("Build_%s. "+packerbuilderdata.PlaceholderMsg, key)
 	}
 
 	// Backwards-compatability: WinRM Password can get through without forcing
diff --git a/packer/rpc/client.go b/packer/rpc/client.go
index e8eadfbf5..a23437a72 100644
--- a/packer/rpc/client.go
+++ b/packer/rpc/client.go
@@ -10,8 +10,10 @@ import (
 )
 
 // Client is the client end that communicates with a Packer RPC server.
-// Establishing a connection is up to the user, the Client can just
-// communicate over any ReadWriteCloser.
+// Establishing a connection is up to the user. The Client can communicate over
+// any ReadWriteCloser. In Packer, each "plugin" (builder, provisioner,
+// and post-processor) creates and launches a server. The the packer "core"
+// creates and uses the client.
 type Client struct {
 	mux      *muxBroker
 	client   *rpc.Client
diff --git a/packer/rpc/server.go b/packer/rpc/server.go
index b583e2945..acfea8c7c 100644
--- a/packer/rpc/server.go
+++ b/packer/rpc/server.go
@@ -23,7 +23,9 @@ const (
 )
 
 // Server represents an RPC server for Packer. This must be paired on
-// the other side with a Client.
+// the other side with a Client. In Packer, each "plugin" (builder, provisioner,
+// and post-processor) creates and launches a server. The client created and
+// used by the packer "core"
 type Server struct {
 	mux      *muxBroker
 	streamId uint32
diff --git a/packer/rpc/ui_progress_tracking.go b/packer/rpc/ui_progress_tracking.go
index 4488c1bac..4f22835e1 100644
--- a/packer/rpc/ui_progress_tracking.go
+++ b/packer/rpc/ui_progress_tracking.go
@@ -5,7 +5,7 @@ import (
 	"log"
 	"net/rpc"
 
-	"github.com/hashicorp/packer/common/random"
+	"github.com/hashicorp/packer/packer-plugin-sdk/random"
 )
 
 // TrackProgress starts a pair of ProgressTrackingClient and ProgressProgressTrackingServer
diff --git a/post-processor/alicloud-import/post-processor.go b/post-processor/alicloud-import/post-processor.go
index 67fa91e5f..f965ad77b 100644
--- a/post-processor/alicloud-import/post-processor.go
+++ b/post-processor/alicloud-import/post-processor.go
@@ -19,9 +19,9 @@ import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	packerecs "github.com/hashicorp/packer/builder/alicloud/ecs"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const (
diff --git a/post-processor/alicloud-import/post-processor.hcl2spec.go b/post-processor/alicloud-import/post-processor.hcl2spec.go
index c254ce01b..2a3292281 100644
--- a/post-processor/alicloud-import/post-processor.hcl2spec.go
+++ b/post-processor/alicloud-import/post-processor.hcl2spec.go
@@ -4,7 +4,7 @@ package alicloudimport
 import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/alicloud/ecs"
-	"github.com/hashicorp/packer/hcl2template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/zclconf/go-cty/cty"
 )
 
@@ -13,6 +13,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName                   *string                      `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType                 *string                      `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion                 *string                      `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                       *bool                        `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                       *bool                        `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                     *string                      `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -39,7 +40,7 @@ type FlatConfig struct {
 	AlicloudImageForceDeleteInstances *bool                        `mapstructure:"image_force_delete_instances" cty:"image_force_delete_instances" hcl:"image_force_delete_instances"`
 	AlicloudImageIgnoreDataDisks      *bool                        `mapstructure:"image_ignore_data_disks" required:"false" cty:"image_ignore_data_disks" hcl:"image_ignore_data_disks"`
 	AlicloudImageTags                 map[string]string            `mapstructure:"tags" required:"false" cty:"tags" hcl:"tags"`
-	AlicloudImageTag                  []hcl2template.FlatKeyValue  `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
+	AlicloudImageTag                  []config.FlatKeyValue        `mapstructure:"tag" required:"false" cty:"tag" hcl:"tag"`
 	ECSSystemDiskMapping              *ecs.FlatAlicloudDiskDevice  `mapstructure:"system_disk_mapping" required:"false" cty:"system_disk_mapping" hcl:"system_disk_mapping"`
 	ECSImagesDiskMappings             []ecs.FlatAlicloudDiskDevice `mapstructure:"image_disk_mappings" required:"false" cty:"image_disk_mappings" hcl:"image_disk_mappings"`
 	AssociatePublicIpAddress          *bool                        `mapstructure:"associate_public_ip_address" cty:"associate_public_ip_address" hcl:"associate_public_ip_address"`
@@ -137,6 +138,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":            &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":          &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":          &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                 &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                 &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":              &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -163,7 +165,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"image_force_delete_instances": &hcldec.AttrSpec{Name: "image_force_delete_instances", Type: cty.Bool, Required: false},
 		"image_ignore_data_disks":      &hcldec.AttrSpec{Name: "image_ignore_data_disks", Type: cty.Bool, Required: false},
 		"tags":                         &hcldec.AttrSpec{Name: "tags", Type: cty.Map(cty.String), Required: false},
-		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*hcl2template.FlatKeyValue)(nil).HCL2Spec())},
+		"tag":                          &hcldec.BlockListSpec{TypeName: "tag", Nested: hcldec.ObjectSpec((*config.FlatKeyValue)(nil).HCL2Spec())},
 		"system_disk_mapping":          &hcldec.BlockSpec{TypeName: "system_disk_mapping", Nested: hcldec.ObjectSpec((*ecs.FlatAlicloudDiskDevice)(nil).HCL2Spec())},
 		"image_disk_mappings":          &hcldec.BlockListSpec{TypeName: "image_disk_mappings", Nested: hcldec.ObjectSpec((*ecs.FlatAlicloudDiskDevice)(nil).HCL2Spec())},
 		"associate_public_ip_address":  &hcldec.AttrSpec{Name: "associate_public_ip_address", Type: cty.Bool, Required: false},
diff --git a/post-processor/alicloud-import/version/version.go b/post-processor/alicloud-import/version/version.go
new file mode 100644
index 000000000..4fc90d414
--- /dev/null
+++ b/post-processor/alicloud-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AlicloudImportPluginVersion *version.PluginVersion
+
+func init() {
+	AlicloudImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/amazon-import/post-processor.go b/post-processor/amazon-import/post-processor.go
index 51e5eb829..df4062c6a 100644
--- a/post-processor/amazon-import/post-processor.go
+++ b/post-processor/amazon-import/post-processor.go
@@ -16,11 +16,11 @@ import (
 	"github.com/aws/aws-sdk-go/service/s3/s3manager"
 	"github.com/hashicorp/hcl/v2/hcldec"
 	awscommon "github.com/hashicorp/packer/builder/amazon/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.amazon-import"
diff --git a/post-processor/amazon-import/post-processor.hcl2spec.go b/post-processor/amazon-import/post-processor.hcl2spec.go
index 9b144ea50..511792187 100644
--- a/post-processor/amazon-import/post-processor.hcl2spec.go
+++ b/post-processor/amazon-import/post-processor.hcl2spec.go
@@ -12,6 +12,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName       *string                           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType     *string                           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion     *string                           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug           *bool                             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce           *bool                             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError         *string                           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -28,7 +29,6 @@ type FlatConfig struct {
 	ProfileName           *string                           `mapstructure:"profile" required:"false" cty:"profile" hcl:"profile"`
 	RawRegion             *string                           `mapstructure:"region" required:"true" cty:"region" hcl:"region"`
 	SecretKey             *string                           `mapstructure:"secret_key" required:"true" cty:"secret_key" hcl:"secret_key"`
-	SkipValidation        *bool                             `mapstructure:"skip_region_validation" required:"false" cty:"skip_region_validation" hcl:"skip_region_validation"`
 	SkipMetadataApiCheck  *bool                             `mapstructure:"skip_metadata_api_check" cty:"skip_metadata_api_check" hcl:"skip_metadata_api_check"`
 	SkipCredsValidation   *bool                             `mapstructure:"skip_credential_validation" cty:"skip_credential_validation" hcl:"skip_credential_validation"`
 	Token                 *string                           `mapstructure:"token" required:"false" cty:"token" hcl:"token"`
@@ -65,6 +65,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -81,7 +82,6 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"profile":                       &hcldec.AttrSpec{Name: "profile", Type: cty.String, Required: false},
 		"region":                        &hcldec.AttrSpec{Name: "region", Type: cty.String, Required: false},
 		"secret_key":                    &hcldec.AttrSpec{Name: "secret_key", Type: cty.String, Required: false},
-		"skip_region_validation":        &hcldec.AttrSpec{Name: "skip_region_validation", Type: cty.Bool, Required: false},
 		"skip_metadata_api_check":       &hcldec.AttrSpec{Name: "skip_metadata_api_check", Type: cty.Bool, Required: false},
 		"skip_credential_validation":    &hcldec.AttrSpec{Name: "skip_credential_validation", Type: cty.Bool, Required: false},
 		"token":                         &hcldec.AttrSpec{Name: "token", Type: cty.String, Required: false},
diff --git a/post-processor/amazon-import/version/version.go b/post-processor/amazon-import/version/version.go
new file mode 100644
index 000000000..aba836a09
--- /dev/null
+++ b/post-processor/amazon-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AmazonImportPluginVersion *version.PluginVersion
+
+func init() {
+	AmazonImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/artifice/post-processor.go b/post-processor/artifice/post-processor.go
index 9c80aba75..104d144fe 100644
--- a/post-processor/artifice/post-processor.go
+++ b/post-processor/artifice/post-processor.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // The artifact-override post-processor allows you to specify arbitrary files as
diff --git a/post-processor/artifice/post-processor.hcl2spec.go b/post-processor/artifice/post-processor.hcl2spec.go
index 633940696..d12ec0386 100644
--- a/post-processor/artifice/post-processor.hcl2spec.go
+++ b/post-processor/artifice/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -34,6 +35,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/artifice/version/version.go b/post-processor/artifice/version/version.go
new file mode 100644
index 000000000..ced113f66
--- /dev/null
+++ b/post-processor/artifice/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ArtificePluginVersion *version.PluginVersion
+
+func init() {
+	ArtificePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/checksum/post-processor.go b/post-processor/checksum/post-processor.go
index ce8496812..5d0a9c2b5 100644
--- a/post-processor/checksum/post-processor.go
+++ b/post-processor/checksum/post-processor.go
@@ -15,10 +15,10 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/post-processor/checksum/post-processor.hcl2spec.go b/post-processor/checksum/post-processor.hcl2spec.go
index d58b89aec..f9cf480fc 100644
--- a/post-processor/checksum/post-processor.hcl2spec.go
+++ b/post-processor/checksum/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -34,6 +35,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/checksum/post-processor_test.go b/post-processor/checksum/post-processor_test.go
index e52974ec4..ce527ab23 100644
--- a/post-processor/checksum/post-processor_test.go
+++ b/post-processor/checksum/post-processor_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/hashicorp/packer/builder/file"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 const expectedFileContents = "Hello world!"
diff --git a/post-processor/checksum/version/version.go b/post-processor/checksum/version/version.go
new file mode 100644
index 000000000..9fd9352ac
--- /dev/null
+++ b/post-processor/checksum/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ChecksumPluginVersion *version.PluginVersion
+
+func init() {
+	ChecksumPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/compress/post-processor.go b/post-processor/compress/post-processor.go
index 6b84852cb..0864a5dff 100644
--- a/post-processor/compress/post-processor.go
+++ b/post-processor/compress/post-processor.go
@@ -15,10 +15,10 @@ import (
 
 	"github.com/biogo/hts/bgzf"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/klauspost/pgzip"
 	"github.com/pierrec/lz4"
 	"github.com/ulikunitz/xz"
diff --git a/post-processor/compress/post-processor.hcl2spec.go b/post-processor/compress/post-processor.hcl2spec.go
index f556face6..b03a4539e 100644
--- a/post-processor/compress/post-processor.hcl2spec.go
+++ b/post-processor/compress/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -37,6 +38,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/compress/post-processor_test.go b/post-processor/compress/post-processor_test.go
index 5b4cfcd9f..1e1a7b8a4 100644
--- a/post-processor/compress/post-processor_test.go
+++ b/post-processor/compress/post-processor_test.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/hashicorp/packer/builder/file"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 )
 
 func TestDetectFilename(t *testing.T) {
diff --git a/post-processor/compress/version/version.go b/post-processor/compress/version/version.go
new file mode 100644
index 000000000..1b6e2b9c9
--- /dev/null
+++ b/post-processor/compress/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var CompressPluginVersion *version.PluginVersion
+
+func init() {
+	CompressPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/digitalocean-import/post-processor.go b/post-processor/digitalocean-import/post-processor.go
index 74b63aec1..fe652ecf1 100644
--- a/post-processor/digitalocean-import/post-processor.go
+++ b/post-processor/digitalocean-import/post-processor.go
@@ -21,10 +21,10 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/digitalocean"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.digitalocean-import"
diff --git a/post-processor/digitalocean-import/post-processor.hcl2spec.go b/post-processor/digitalocean-import/post-processor.hcl2spec.go
index 6d40b4af6..502598bb8 100644
--- a/post-processor/digitalocean-import/post-processor.hcl2spec.go
+++ b/post-processor/digitalocean-import/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -45,6 +46,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/digitalocean-import/version/version.go b/post-processor/digitalocean-import/version/version.go
new file mode 100644
index 000000000..921da1ce0
--- /dev/null
+++ b/post-processor/digitalocean-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DigitalOceanImportPluginVersion *version.PluginVersion
+
+func init() {
+	DigitalOceanImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/docker-import/post-processor.go b/post-processor/docker-import/post-processor.go
index 711ff7af2..7cde7c926 100644
--- a/post-processor/docker-import/post-processor.go
+++ b/post-processor/docker-import/post-processor.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.docker-import"
diff --git a/post-processor/docker-import/post-processor.hcl2spec.go b/post-processor/docker-import/post-processor.hcl2spec.go
index c57d7394d..c037be3b3 100644
--- a/post-processor/docker-import/post-processor.hcl2spec.go
+++ b/post-processor/docker-import/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -35,6 +36,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/docker-import/version/version.go b/post-processor/docker-import/version/version.go
new file mode 100644
index 000000000..cf475f281
--- /dev/null
+++ b/post-processor/docker-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DockerImportPluginVersion *version.PluginVersion
+
+func init() {
+	DockerImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/docker-push/post-processor.go b/post-processor/docker-push/post-processor.go
index 7c642988f..facce79b5 100644
--- a/post-processor/docker-push/post-processor.go
+++ b/post-processor/docker-push/post-processor.go
@@ -5,14 +5,15 @@ package dockerpush
 import (
 	"context"
 	"fmt"
+
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	dockerimport "github.com/hashicorp/packer/post-processor/docker-import"
 	dockertag "github.com/hashicorp/packer/post-processor/docker-tag"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderIdImport = "packer.post-processor.docker-import"
diff --git a/post-processor/docker-push/post-processor.hcl2spec.go b/post-processor/docker-push/post-processor.hcl2spec.go
index e7984712e..39c4778ba 100644
--- a/post-processor/docker-push/post-processor.hcl2spec.go
+++ b/post-processor/docker-push/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -41,6 +42,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/docker-push/version/version.go b/post-processor/docker-push/version/version.go
new file mode 100644
index 000000000..46293bdd7
--- /dev/null
+++ b/post-processor/docker-push/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DockerPushPluginVersion *version.PluginVersion
+
+func init() {
+	DockerPushPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/docker-save/post-processor.go b/post-processor/docker-save/post-processor.go
index db572a200..bfa44d065 100644
--- a/post-processor/docker-save/post-processor.go
+++ b/post-processor/docker-save/post-processor.go
@@ -9,12 +9,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	dockerimport "github.com/hashicorp/packer/post-processor/docker-import"
 	dockertag "github.com/hashicorp/packer/post-processor/docker-tag"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.docker-save"
diff --git a/post-processor/docker-save/post-processor.hcl2spec.go b/post-processor/docker-save/post-processor.hcl2spec.go
index 95eb7ddcd..7dbb665b3 100644
--- a/post-processor/docker-save/post-processor.hcl2spec.go
+++ b/post-processor/docker-save/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -33,6 +34,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/docker-save/version/version.go b/post-processor/docker-save/version/version.go
new file mode 100644
index 000000000..3d28839a8
--- /dev/null
+++ b/post-processor/docker-save/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DockerSavePluginVersion *version.PluginVersion
+
+func init() {
+	DockerSavePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/docker-tag/post-processor.go b/post-processor/docker-tag/post-processor.go
index 466176402..254e63859 100644
--- a/post-processor/docker-tag/post-processor.go
+++ b/post-processor/docker-tag/post-processor.go
@@ -8,11 +8,11 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/docker"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	dockerimport "github.com/hashicorp/packer/post-processor/docker-import"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const BuilderId = "packer.post-processor.docker-tag"
diff --git a/post-processor/docker-tag/post-processor.hcl2spec.go b/post-processor/docker-tag/post-processor.hcl2spec.go
index 4b47c4e5f..03d91f522 100644
--- a/post-processor/docker-tag/post-processor.hcl2spec.go
+++ b/post-processor/docker-tag/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -36,6 +37,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/docker-tag/version/version.go b/post-processor/docker-tag/version/version.go
new file mode 100644
index 000000000..49b18e987
--- /dev/null
+++ b/post-processor/docker-tag/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var DockerTagPluginVersion *version.PluginVersion
+
+func init() {
+	DockerTagPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/exoscale-import/post-processor.go b/post-processor/exoscale-import/post-processor.go
index ac190191e..685ef903f 100644
--- a/post-processor/exoscale-import/post-processor.go
+++ b/post-processor/exoscale-import/post-processor.go
@@ -20,11 +20,11 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/file"
 	"github.com/hashicorp/packer/builder/qemu"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer/post-processor/artifice"
-	"github.com/hashicorp/packer/version"
+	"github.com/hashicorp/packer/post-processor/exoscale-import/version"
 )
 
 var (
@@ -51,7 +51,7 @@ type Config struct {
 }
 
 func init() {
-	egoscale.UserAgent = "Packer-Exoscale/" + version.FormattedVersion() + " " + egoscale.UserAgent
+	egoscale.UserAgent = "Packer-Exoscale/" + version.ExoscaleImportPluginVersion.FormattedVersion() + " " + egoscale.UserAgent
 }
 
 type PostProcessor struct {
diff --git a/post-processor/exoscale-import/post-processor.hcl2spec.go b/post-processor/exoscale-import/post-processor.hcl2spec.go
index da906f64a..1143cd7ca 100644
--- a/post-processor/exoscale-import/post-processor.hcl2spec.go
+++ b/post-processor/exoscale-import/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName         *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType       *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion       *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug             *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce             *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError           *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/exoscale-import/version/version.go b/post-processor/exoscale-import/version/version.go
new file mode 100644
index 000000000..14ef05ee9
--- /dev/null
+++ b/post-processor/exoscale-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ExoscaleImportPluginVersion *version.PluginVersion
+
+func init() {
+	ExoscaleImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/googlecompute-export/post-processor.go b/post-processor/googlecompute-export/post-processor.go
index 264338884..f3bcc684a 100644
--- a/post-processor/googlecompute-export/post-processor.go
+++ b/post-processor/googlecompute-export/post-processor.go
@@ -11,13 +11,14 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/googlecompute"
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
@@ -224,7 +225,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
 	}
 
 	// Run the steps.
-	p.runner = common.NewRunner(steps, p.config.PackerConfig, ui)
+	p.runner = commonsteps.NewRunner(steps, p.config.PackerConfig, ui)
 	p.runner.Run(ctx, state)
 
 	result := &Artifact{paths: p.config.Paths}
diff --git a/post-processor/googlecompute-export/post-processor.hcl2spec.go b/post-processor/googlecompute-export/post-processor.hcl2spec.go
index 573083e0d..5fb383954 100644
--- a/post-processor/googlecompute-export/post-processor.hcl2spec.go
+++ b/post-processor/googlecompute-export/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion         *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -43,6 +44,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":           &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":         &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":         &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":             &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/googlecompute-export/version/version.go b/post-processor/googlecompute-export/version/version.go
new file mode 100644
index 000000000..5c850a0cb
--- /dev/null
+++ b/post-processor/googlecompute-export/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var GCPExportPluginVersion *version.PluginVersion
+
+func init() {
+	GCPExportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/googlecompute-import/post-processor.go b/post-processor/googlecompute-import/post-processor.go
index e61af45cd..8605a6629 100644
--- a/post-processor/googlecompute-import/post-processor.go
+++ b/post-processor/googlecompute-import/post-processor.go
@@ -5,7 +5,11 @@ package googlecomputeimport
 
 import (
 	"context"
+	"crypto/x509"
+	"encoding/base64"
+	"encoding/pem"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"strings"
 	"time"
@@ -16,12 +20,12 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/googlecompute"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 	"github.com/hashicorp/packer/post-processor/compress"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 type Config struct {
@@ -48,7 +52,7 @@ type Config struct {
 	//The name of the image family to which the resulting image belongs.
 	ImageFamily string `mapstructure:"image_family"`
 	//A list of features to enable on the guest operating system. Applicable only for bootable images. Valid
-	//values are `MULTI_IP_SUBNET`, `SECURE_BOOT`, `UEFI_COMPATIBLE`,
+	//values are `MULTI_IP_SUBNET`, `UEFI_COMPATIBLE`,
 	//`VIRTIO_SCSI_MULTIQUEUE` and `WINDOWS` currently.
 	ImageGuestOsFeatures []string `mapstructure:"image_guest_os_features"`
 	//Key/value pair labels to apply to the created image.
@@ -61,6 +65,14 @@ type Config struct {
 	//`false`.
 	SkipClean           bool   `mapstructure:"skip_clean"`
 	VaultGCPOauthEngine string `mapstructure:"vault_gcp_oauth_engine"`
+	//A key used to establish the trust relationship between the platform owner and the firmware. You may only specify one platform key, and it must be a valid X.509 certificate.
+	ImagePlatformKey string `mapstructure:"image_platform_key"`
+	//A key used to establish a trust relationship between the firmware and the OS. You may specify multiple comma-separated keys for this value.
+	ImageKeyExchangeKey []string `mapstructure:"image_key_exchange_key"`
+	//A database of certificates that have been revoked and will cause the system to stop booting if a boot file is signed with one of them. You may specify single or multiple comma-separated values for this value.
+	ImageSignaturesDB []string `mapstructure:"image_signatures_db"`
+	//A database of certificates that are trusted and can be used to sign boot files. You may specify single or multiple comma-separated values for this value.
+	ImageForbiddenSignaturesDB []string `mapstructure:"image_forbidden_signatures_db"`
 
 	account *googlecompute.ServiceAccount
 	ctx     interpolate.Context
@@ -165,7 +177,12 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
 		return nil, false, false, err
 	}
 
-	gceImageArtifact, err := CreateGceImage(opts, ui, p.config.ProjectId, rawImageGcsPath, p.config.ImageName, p.config.ImageDescription, p.config.ImageFamily, p.config.ImageLabels, p.config.ImageGuestOsFeatures)
+	shieldedVMStateConfig, err := CreateShieldedVMStateConfig(p.config.ImageGuestOsFeatures, p.config.ImagePlatformKey, p.config.ImageKeyExchangeKey, p.config.ImageSignaturesDB, p.config.ImageForbiddenSignaturesDB)
+	if err != nil {
+		return nil, false, false, err
+	}
+
+	gceImageArtifact, err := CreateGceImage(opts, ui, p.config.ProjectId, rawImageGcsPath, p.config.ImageName, p.config.ImageDescription, p.config.ImageFamily, p.config.ImageLabels, p.config.ImageGuestOsFeatures, shieldedVMStateConfig)
 	if err != nil {
 		return nil, false, false, err
 	}
@@ -180,6 +197,68 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
 	return gceImageArtifact, false, false, nil
 }
 
+func FillFileContentBuffer(certOrKeyFile string) (*compute.FileContentBuffer, error) {
+	data, err := ioutil.ReadFile(certOrKeyFile)
+	if err != nil {
+		err := fmt.Errorf("Unable to read Certificate or Key file %s", certOrKeyFile)
+		return nil, err
+	}
+	shield := &compute.FileContentBuffer{
+		Content:  base64.StdEncoding.EncodeToString(data),
+		FileType: "X509",
+	}
+	block, _ := pem.Decode(data)
+
+	if block == nil || block.Type != "CERTIFICATE" {
+		_, err = x509.ParseCertificate(data)
+	} else {
+		_, err = x509.ParseCertificate(block.Bytes)
+	}
+	if err != nil {
+		shield.FileType = "BIN"
+	}
+	return shield, nil
+
+}
+
+func CreateShieldedVMStateConfig(imageGuestOsFeatures []string, imagePlatformKey string, imageKeyExchangeKey []string, imageSignaturesDB []string, imageForbiddenSignaturesDB []string) (*compute.InitialStateConfig, error) {
+	shieldedVMStateConfig := &compute.InitialStateConfig{}
+	for _, v := range imageGuestOsFeatures {
+		if v == "UEFI_COMPATIBLE" {
+			if imagePlatformKey != "" {
+				shieldedData, err := FillFileContentBuffer(imagePlatformKey)
+				if err != nil {
+					return nil, err
+				}
+				shieldedVMStateConfig.Pk = shieldedData
+			}
+			for _, v := range imageKeyExchangeKey {
+				shieldedData, err := FillFileContentBuffer(v)
+				if err != nil {
+					return nil, err
+				}
+				shieldedVMStateConfig.Keks = append(shieldedVMStateConfig.Keks, shieldedData)
+			}
+			for _, v := range imageSignaturesDB {
+				shieldedData, err := FillFileContentBuffer(v)
+				if err != nil {
+					return nil, err
+				}
+				shieldedVMStateConfig.Dbs = append(shieldedVMStateConfig.Dbs, shieldedData)
+			}
+			for _, v := range imageForbiddenSignaturesDB {
+				shieldedData, err := FillFileContentBuffer(v)
+				if err != nil {
+					return nil, err
+				}
+				shieldedVMStateConfig.Dbxs = append(shieldedVMStateConfig.Dbxs, shieldedData)
+			}
+
+		}
+	}
+	return shieldedVMStateConfig, nil
+}
+
 func UploadToBucket(opts option.ClientOption, ui packer.Ui, artifact packer.Artifact, bucket string, gcsObjectName string) (string, error) {
 	service, err := storage.NewService(context.TODO(), opts)
 	if err != nil {
@@ -216,7 +295,7 @@ func UploadToBucket(opts option.ClientOption, ui packer.Ui, artifact packer.Arti
 	return storageObject.SelfLink, nil
 }
 
-func CreateGceImage(opts option.ClientOption, ui packer.Ui, project string, rawImageURL string, imageName string, imageDescription string, imageFamily string, imageLabels map[string]string, imageGuestOsFeatures []string) (packer.Artifact, error) {
+func CreateGceImage(opts option.ClientOption, ui packer.Ui, project string, rawImageURL string, imageName string, imageDescription string, imageFamily string, imageLabels map[string]string, imageGuestOsFeatures []string, shieldedVMStateConfig *compute.InitialStateConfig) (packer.Artifact, error) {
 	service, err := compute.NewService(context.TODO(), opts)
 
 	if err != nil {
@@ -232,13 +311,14 @@ func CreateGceImage(opts option.ClientOption, ui packer.Ui, project string, rawI
 	}
 
 	gceImage := &compute.Image{
-		Description:     imageDescription,
-		Family:          imageFamily,
-		GuestOsFeatures: imageFeatures,
-		Labels:          imageLabels,
-		Name:            imageName,
-		RawDisk:         &compute.ImageRawDisk{Source: rawImageURL},
-		SourceType:      "RAW",
+		Description:                  imageDescription,
+		Family:                       imageFamily,
+		GuestOsFeatures:              imageFeatures,
+		Labels:                       imageLabels,
+		Name:                         imageName,
+		RawDisk:                      &compute.ImageRawDisk{Source: rawImageURL},
+		SourceType:                   "RAW",
+		ShieldedInstanceInitialState: shieldedVMStateConfig,
 	}
 
 	ui.Say(fmt.Sprintf("Creating GCE image %v...", imageName))
diff --git a/post-processor/googlecompute-import/post-processor.hcl2spec.go b/post-processor/googlecompute-import/post-processor.hcl2spec.go
index 2c1937d8d..2c0a726d2 100644
--- a/post-processor/googlecompute-import/post-processor.hcl2spec.go
+++ b/post-processor/googlecompute-import/post-processor.hcl2spec.go
@@ -9,26 +9,31 @@ import (
 // FlatConfig is an auto-generated flat version of Config.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatConfig struct {
-	PackerBuildName           *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
-	PackerBuilderType         *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
-	PackerDebug               *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
-	PackerForce               *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
-	PackerOnError             *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
-	PackerUserVars            map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
-	PackerSensitiveVars       []string          `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
-	AccountFile               *string           `mapstructure:"account_file" required:"true" cty:"account_file" hcl:"account_file"`
-	ImpersonateServiceAccount *string           `mapstructure:"impersonate_service_account" required:"false" cty:"impersonate_service_account" hcl:"impersonate_service_account"`
-	ProjectId                 *string           `mapstructure:"project_id" required:"true" cty:"project_id" hcl:"project_id"`
-	IAP                       *bool             `mapstructure-to-hcl:",skip" cty:"iap" hcl:"iap"`
-	Bucket                    *string           `mapstructure:"bucket" required:"true" cty:"bucket" hcl:"bucket"`
-	GCSObjectName             *string           `mapstructure:"gcs_object_name" cty:"gcs_object_name" hcl:"gcs_object_name"`
-	ImageDescription          *string           `mapstructure:"image_description" cty:"image_description" hcl:"image_description"`
-	ImageFamily               *string           `mapstructure:"image_family" cty:"image_family" hcl:"image_family"`
-	ImageGuestOsFeatures      []string          `mapstructure:"image_guest_os_features" cty:"image_guest_os_features" hcl:"image_guest_os_features"`
-	ImageLabels               map[string]string `mapstructure:"image_labels" cty:"image_labels" hcl:"image_labels"`
-	ImageName                 *string           `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
-	SkipClean                 *bool             `mapstructure:"skip_clean" cty:"skip_clean" hcl:"skip_clean"`
-	VaultGCPOauthEngine       *string           `mapstructure:"vault_gcp_oauth_engine" cty:"vault_gcp_oauth_engine" hcl:"vault_gcp_oauth_engine"`
+	PackerBuildName            *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
+	PackerBuilderType          *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion          *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
+	PackerDebug                *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
+	PackerForce                *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
+	PackerOnError              *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
+	PackerUserVars             map[string]string `mapstructure:"packer_user_variables" cty:"packer_user_variables" hcl:"packer_user_variables"`
+	PackerSensitiveVars        []string          `mapstructure:"packer_sensitive_variables" cty:"packer_sensitive_variables" hcl:"packer_sensitive_variables"`
+	AccountFile                *string           `mapstructure:"account_file" required:"true" cty:"account_file" hcl:"account_file"`
+	ImpersonateServiceAccount  *string           `mapstructure:"impersonate_service_account" required:"false" cty:"impersonate_service_account" hcl:"impersonate_service_account"`
+	ProjectId                  *string           `mapstructure:"project_id" required:"true" cty:"project_id" hcl:"project_id"`
+	IAP                        *bool             `mapstructure-to-hcl:",skip" cty:"iap" hcl:"iap"`
+	Bucket                     *string           `mapstructure:"bucket" required:"true" cty:"bucket" hcl:"bucket"`
+	GCSObjectName              *string           `mapstructure:"gcs_object_name" cty:"gcs_object_name" hcl:"gcs_object_name"`
+	ImageDescription           *string           `mapstructure:"image_description" cty:"image_description" hcl:"image_description"`
+	ImageFamily                *string           `mapstructure:"image_family" cty:"image_family" hcl:"image_family"`
+	ImageGuestOsFeatures       []string          `mapstructure:"image_guest_os_features" cty:"image_guest_os_features" hcl:"image_guest_os_features"`
+	ImageLabels                map[string]string `mapstructure:"image_labels" cty:"image_labels" hcl:"image_labels"`
+	ImageName                  *string           `mapstructure:"image_name" required:"true" cty:"image_name" hcl:"image_name"`
+	SkipClean                  *bool             `mapstructure:"skip_clean" cty:"skip_clean" hcl:"skip_clean"`
+	VaultGCPOauthEngine        *string           `mapstructure:"vault_gcp_oauth_engine" cty:"vault_gcp_oauth_engine" hcl:"vault_gcp_oauth_engine"`
+	ImagePlatformKey           *string           `mapstructure:"image_platform_key" cty:"image_platform_key" hcl:"image_platform_key"`
+	ImageKeyExchangeKey        []string          `mapstructure:"image_key_exchange_key" cty:"image_key_exchange_key" hcl:"image_key_exchange_key"`
+	ImageSignaturesDB          []string          `mapstructure:"image_signatures_db" cty:"image_signatures_db" hcl:"image_signatures_db"`
+	ImageForbiddenSignaturesDB []string          `mapstructure:"image_forbidden_signatures_db" cty:"image_forbidden_signatures_db" hcl:"image_forbidden_signatures_db"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -43,26 +48,31 @@ func (*Config) FlatMapstructure() interface{ HCL2Spec() map[string]hcldec.Spec }
 // The decoded values from this spec will then be applied to a FlatConfig.
 func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
-		"packer_build_name":           &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
-		"packer_builder_type":         &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
-		"packer_debug":                &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
-		"packer_force":                &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
-		"packer_on_error":             &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
-		"packer_user_variables":       &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
-		"packer_sensitive_variables":  &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
-		"account_file":                &hcldec.AttrSpec{Name: "account_file", Type: cty.String, Required: false},
-		"impersonate_service_account": &hcldec.AttrSpec{Name: "impersonate_service_account", Type: cty.String, Required: false},
-		"project_id":                  &hcldec.AttrSpec{Name: "project_id", Type: cty.String, Required: false},
-		"iap":                         &hcldec.AttrSpec{Name: "iap", Type: cty.Bool, Required: false},
-		"bucket":                      &hcldec.AttrSpec{Name: "bucket", Type: cty.String, Required: false},
-		"gcs_object_name":             &hcldec.AttrSpec{Name: "gcs_object_name", Type: cty.String, Required: false},
-		"image_description":           &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false},
-		"image_family":                &hcldec.AttrSpec{Name: "image_family", Type: cty.String, Required: false},
-		"image_guest_os_features":     &hcldec.AttrSpec{Name: "image_guest_os_features", Type: cty.List(cty.String), Required: false},
-		"image_labels":                &hcldec.AttrSpec{Name: "image_labels", Type: cty.Map(cty.String), Required: false},
-		"image_name":                  &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
-		"skip_clean":                  &hcldec.AttrSpec{Name: "skip_clean", Type: cty.Bool, Required: false},
-		"vault_gcp_oauth_engine":      &hcldec.AttrSpec{Name: "vault_gcp_oauth_engine", Type: cty.String, Required: false},
+		"packer_build_name":             &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
+		"packer_builder_type":           &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":           &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
+		"packer_debug":                  &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
+		"packer_force":                  &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
+		"packer_on_error":               &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
+		"packer_user_variables":         &hcldec.AttrSpec{Name: "packer_user_variables", Type: cty.Map(cty.String), Required: false},
+		"packer_sensitive_variables":    &hcldec.AttrSpec{Name: "packer_sensitive_variables", Type: cty.List(cty.String), Required: false},
+		"account_file":                  &hcldec.AttrSpec{Name: "account_file", Type: cty.String, Required: false},
+		"impersonate_service_account":   &hcldec.AttrSpec{Name: "impersonate_service_account", Type: cty.String, Required: false},
+		"project_id":                    &hcldec.AttrSpec{Name: "project_id", Type: cty.String, Required: false},
+		"iap":                           &hcldec.AttrSpec{Name: "iap", Type: cty.Bool, Required: false},
+		"bucket":                        &hcldec.AttrSpec{Name: "bucket", Type: cty.String, Required: false},
+		"gcs_object_name":               &hcldec.AttrSpec{Name: "gcs_object_name", Type: cty.String, Required: false},
+		"image_description":             &hcldec.AttrSpec{Name: "image_description", Type: cty.String, Required: false},
+		"image_family":                  &hcldec.AttrSpec{Name: "image_family", Type: cty.String, Required: false},
+		"image_guest_os_features":       &hcldec.AttrSpec{Name: "image_guest_os_features", Type: cty.List(cty.String), Required: false},
+		"image_labels":                  &hcldec.AttrSpec{Name: "image_labels", Type: cty.Map(cty.String), Required: false},
+		"image_name":                    &hcldec.AttrSpec{Name: "image_name", Type: cty.String, Required: false},
+		"skip_clean":                    &hcldec.AttrSpec{Name: "skip_clean", Type: cty.Bool, Required: false},
+		"vault_gcp_oauth_engine":        &hcldec.AttrSpec{Name: "vault_gcp_oauth_engine", Type: cty.String, Required: false},
+		"image_platform_key":            &hcldec.AttrSpec{Name: "image_platform_key", Type: cty.String, Required: false},
+		"image_key_exchange_key":        &hcldec.AttrSpec{Name: "image_key_exchange_key", Type: cty.List(cty.String), Required: false},
+		"image_signatures_db":           &hcldec.AttrSpec{Name: "image_signatures_db", Type: cty.List(cty.String), Required: false},
+		"image_forbidden_signatures_db": &hcldec.AttrSpec{Name: "image_forbidden_signatures_db", Type: cty.List(cty.String), Required: false},
 	}
 	return s
 }
diff --git a/post-processor/googlecompute-import/version/version.go b/post-processor/googlecompute-import/version/version.go
new file mode 100644
index 000000000..035e0c4e1
--- /dev/null
+++ b/post-processor/googlecompute-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var GCPImportPluginVersion *version.PluginVersion
+
+func init() {
+	GCPImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/manifest/post-processor.go b/post-processor/manifest/post-processor.go
index c723d17fd..26e9ac191 100644
--- a/post-processor/manifest/post-processor.go
+++ b/post-processor/manifest/post-processor.go
@@ -14,10 +14,10 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/post-processor/manifest/post-processor.hcl2spec.go b/post-processor/manifest/post-processor.hcl2spec.go
index 30b11d040..6559621a6 100644
--- a/post-processor/manifest/post-processor.hcl2spec.go
+++ b/post-processor/manifest/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -36,6 +37,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/manifest/version/version.go b/post-processor/manifest/version/version.go
new file mode 100644
index 000000000..87d2036b7
--- /dev/null
+++ b/post-processor/manifest/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ManifestPluginVersion *version.PluginVersion
+
+func init() {
+	ManifestPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/shell-local/post-processor.go b/post-processor/shell-local/post-processor.go
index a17ce67e3..b7ce71673 100644
--- a/post-processor/shell-local/post-processor.go
+++ b/post-processor/shell-local/post-processor.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 )
 
 type PostProcessor struct {
diff --git a/post-processor/shell-local/version/version.go b/post-processor/shell-local/version/version.go
new file mode 100644
index 000000000..6d79d7f3e
--- /dev/null
+++ b/post-processor/shell-local/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ShellLocalPluginVersion *version.PluginVersion
+
+func init() {
+	ShellLocalPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/ucloud-import/post-processor.go b/post-processor/ucloud-import/post-processor.go
index 276ab907a..1296f326d 100644
--- a/post-processor/ucloud-import/post-processor.go
+++ b/post-processor/ucloud-import/post-processor.go
@@ -13,11 +13,11 @@ import (
 
 	"github.com/hashicorp/hcl/v2/hcldec"
 	ucloudcommon "github.com/hashicorp/packer/builder/ucloud/common"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/ucloud/ucloud-sdk-go/services/ufile"
 	"github.com/ucloud/ucloud-sdk-go/services/uhost"
 	"github.com/ucloud/ucloud-sdk-go/ucloud"
diff --git a/post-processor/ucloud-import/post-processor.hcl2spec.go b/post-processor/ucloud-import/post-processor.hcl2spec.go
index 1bada485e..f20f2ca96 100644
--- a/post-processor/ucloud-import/post-processor.hcl2spec.go
+++ b/post-processor/ucloud-import/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName       *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType     *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion     *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug           *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce           *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError         *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -48,6 +49,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/ucloud-import/version/version.go b/post-processor/ucloud-import/version/version.go
new file mode 100644
index 000000000..ee2a0e653
--- /dev/null
+++ b/post-processor/ucloud-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var UCloudImportPluginVersion *version.PluginVersion
+
+func init() {
+	UCloudImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/vagrant-cloud/client.go b/post-processor/vagrant-cloud/client.go
index 4fbd37454..b2df04035 100644
--- a/post-processor/vagrant-cloud/client.go
+++ b/post-processor/vagrant-cloud/client.go
@@ -11,7 +11,7 @@ import (
 	"os"
 	"strings"
 
-	commonhelper "github.com/hashicorp/packer/helper/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/net"
 )
 
 type VagrantCloudClient struct {
@@ -48,7 +48,7 @@ func (v VagrantCloudErrors) FormatErrors() string {
 
 func (v VagrantCloudClient) New(baseUrl string, token string, InsecureSkipTLSVerify bool) (*VagrantCloudClient, error) {
 	c := &VagrantCloudClient{
-		client:      commonhelper.HttpClientWithEnvironmentProxy(),
+		client:      net.HttpClientWithEnvironmentProxy(),
 		BaseURL:     baseUrl,
 		AccessToken: token,
 	}
@@ -156,6 +156,52 @@ func (v *VagrantCloudClient) Upload(path string, url string) (*http.Response, er
 	return resp, err
 }
 
+func (v *VagrantCloudClient) DirectUpload(path string, url string) (*http.Response, error) {
+	file, err := os.Open(path)
+
+	if err != nil {
+		return nil, fmt.Errorf("Error opening file for upload: %s", err)
+	}
+	defer file.Close()
+
+	fi, err := file.Stat()
+
+	if err != nil {
+		return nil, fmt.Errorf("Error stating file for upload: %s", err)
+	}
+
+	request, err := http.NewRequest("PUT", url, file)
+
+	if err != nil {
+		return nil, fmt.Errorf("Error preparing upload request: %s", err)
+	}
+
+	log.Printf("Post-Processor Vagrant Cloud API Direct Upload: %s %s", path, url)
+
+	request.ContentLength = fi.Size()
+	resp, err := v.client.Do(request)
+
+	log.Printf("Post-Processor Vagrant Cloud Direct Upload Response: \n\n%+v", resp)
+
+	return resp, err
+}
+
+func (v *VagrantCloudClient) Callback(url string) (*http.Response, error) {
+	request, err := v.newRequest("PUT", url, nil)
+
+	if err != nil {
+		return nil, fmt.Errorf("Error preparing callback request: %s", err)
+	}
+
+	log.Printf("Post-Processor Vagrant Cloud API Direct Upload Callback: %s", url)
+
+	resp, err := v.client.Do(request)
+
+	log.Printf("Post-Processor Vagrant Cloud Direct Upload Callback Response: \n\n%+v", resp)
+
+	return resp, err
+}
+
 func (v *VagrantCloudClient) Post(path string, body interface{}) (*http.Response, error) {
 	reqUrl := fmt.Sprintf("%s/%s", v.BaseURL, path)
 
diff --git a/post-processor/vagrant-cloud/post-processor.go b/post-processor/vagrant-cloud/post-processor.go
index 8a46b321c..602393620 100644
--- a/post-processor/vagrant-cloud/post-processor.go
+++ b/post-processor/vagrant-cloud/post-processor.go
@@ -19,11 +19,12 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 var builtins = map[string]string{
@@ -45,8 +46,8 @@ type Config struct {
 	AccessToken           string `mapstructure:"access_token"`
 	VagrantCloudUrl       string `mapstructure:"vagrant_cloud_url"`
 	InsecureSkipTLSVerify bool   `mapstructure:"insecure_skip_tls_verify"`
-
-	BoxDownloadUrl string `mapstructure:"box_download_url"`
+	BoxDownloadUrl        string `mapstructure:"box_download_url"`
+	NoDirectUpload        bool   `mapstructure:"no_direct_upload"`
 
 	ctx interpolate.Context
 }
@@ -181,27 +182,21 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
 	state.Put("boxDownloadUrl", boxDownloadUrl)
 
 	// Build the steps
-	steps := []multistep.Step{}
+	steps := []multistep.Step{
+		new(stepVerifyBox),
+		new(stepCreateVersion),
+		new(stepCreateProvider),
+	}
 	if p.config.BoxDownloadUrl == "" {
-		steps = []multistep.Step{
-			new(stepVerifyBox),
-			new(stepCreateVersion),
-			new(stepCreateProvider),
-			new(stepPrepareUpload),
-			new(stepUpload),
-			new(stepReleaseVersion),
-		}
-	} else {
-		steps = []multistep.Step{
-			new(stepVerifyBox),
-			new(stepCreateVersion),
-			new(stepCreateProvider),
-			new(stepReleaseVersion),
+		steps = append(steps, new(stepPrepareUpload), new(stepUpload))
+		if !p.config.NoDirectUpload {
+			steps = append(steps, new(stepConfirmUpload))
 		}
 	}
+	steps = append(steps, new(stepReleaseVersion))
 
 	// Run the steps
-	p.runner = common.NewRunner(steps, p.config.PackerConfig, ui)
+	p.runner = commonsteps.NewRunner(steps, p.config.PackerConfig, ui)
 	p.runner.Run(ctx, state)
 
 	// If there was an error, return that
diff --git a/post-processor/vagrant-cloud/post-processor.hcl2spec.go b/post-processor/vagrant-cloud/post-processor.hcl2spec.go
index 905e2812f..4fe3592e9 100644
--- a/post-processor/vagrant-cloud/post-processor.hcl2spec.go
+++ b/post-processor/vagrant-cloud/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName       *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType     *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion     *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug           *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce           *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError         *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -24,6 +25,7 @@ type FlatConfig struct {
 	VagrantCloudUrl       *string           `mapstructure:"vagrant_cloud_url" cty:"vagrant_cloud_url" hcl:"vagrant_cloud_url"`
 	InsecureSkipTLSVerify *bool             `mapstructure:"insecure_skip_tls_verify" cty:"insecure_skip_tls_verify" hcl:"insecure_skip_tls_verify"`
 	BoxDownloadUrl        *string           `mapstructure:"box_download_url" cty:"box_download_url" hcl:"box_download_url"`
+	NoDirectUpload        *bool             `mapstructure:"no_direct_upload" cty:"no_direct_upload" hcl:"no_direct_upload"`
 }
 
 // FlatMapstructure returns a new FlatConfig.
@@ -40,6 +42,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -53,6 +56,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"vagrant_cloud_url":          &hcldec.AttrSpec{Name: "vagrant_cloud_url", Type: cty.String, Required: false},
 		"insecure_skip_tls_verify":   &hcldec.AttrSpec{Name: "insecure_skip_tls_verify", Type: cty.Bool, Required: false},
 		"box_download_url":           &hcldec.AttrSpec{Name: "box_download_url", Type: cty.String, Required: false},
+		"no_direct_upload":           &hcldec.AttrSpec{Name: "no_direct_upload", Type: cty.Bool, Required: false},
 	}
 	return s
 }
diff --git a/post-processor/vagrant-cloud/post-processor_test.go b/post-processor/vagrant-cloud/post-processor_test.go
index d7caaf854..52f68c535 100644
--- a/post-processor/vagrant-cloud/post-processor_test.go
+++ b/post-processor/vagrant-cloud/post-processor_test.go
@@ -17,6 +17,13 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+type stubResponse struct {
+	Path       string
+	Method     string
+	Response   string
+	StatusCode int
+}
+
 type tarFiles []struct {
 	Name, Body string
 }
@@ -46,6 +53,36 @@ func testNoAccessTokenProvidedConfig() map[string]interface{} {
 	}
 }
 
+func newStackServer(stack []stubResponse) *httptest.Server {
+	return httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
+		if len(stack) < 1 {
+			rw.Header().Add("Error", fmt.Sprintf("Request stack is empty - Method: %s Path: %s", req.Method, req.URL.Path))
+			http.Error(rw, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+			return
+		}
+		match := stack[0]
+		stack = stack[1:]
+		if match.Method != "" && req.Method != match.Method {
+			rw.Header().Add("Error", fmt.Sprintf("Request %s != %s", match.Method, req.Method))
+			http.Error(rw, fmt.Sprintf("Request %s != %s", match.Method, req.Method), http.StatusInternalServerError)
+			return
+		}
+		if match.Path != "" && match.Path != req.URL.Path {
+			rw.Header().Add("Error", fmt.Sprintf("Request %s != %s", match.Path, req.URL.Path))
+			http.Error(rw, fmt.Sprintf("Request %s != %s", match.Path, req.URL.Path), http.StatusInternalServerError)
+			return
+		}
+		rw.Header().Add("Complete", fmt.Sprintf("Method: %s Path: %s", match.Method, match.Path))
+		rw.WriteHeader(match.StatusCode)
+		if match.Response != "" {
+			_, err := rw.Write([]byte(match.Response))
+			if err != nil {
+				panic("failed to write response: " + err.Error())
+			}
+		}
+	}))
+}
+
 func newSecureServer(token string, handler http.HandlerFunc) *httptest.Server {
 	token = fmt.Sprintf("Bearer %s", token)
 	return httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
@@ -229,6 +266,156 @@ func TestPostProcessor_PostProcess_checkArtifactFileIsBox(t *testing.T) {
 	}
 }
 
+func TestPostProcessor_PostProcess_uploadsAndReleases(t *testing.T) {
+	files := tarFiles{
+		{"foo.txt", "This is a foo file"},
+		{"bar.txt", "This is a bar file"},
+		{"metadata.json", `{"provider": "virtualbox"}`},
+	}
+	boxfile, err := createBox(files)
+	if err != nil {
+		t.Fatalf("%s", err)
+	}
+	defer os.Remove(boxfile.Name())
+
+	artifact := &packer.MockArtifact{
+		BuilderIdValue: "mitchellh.post-processor.vagrant",
+		FilesValue:     []string{boxfile.Name()},
+	}
+
+	s := newStackServer([]stubResponse{stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-path"}})
+	defer s.Close()
+
+	stack := []stubResponse{
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/authenticate"},
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64", Response: `{"tag": "hashicorp/precise64"}`},
+		stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/versions", Response: `{}`},
+		stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/version/0.5/providers", Response: `{}`},
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64/version/0.5/provider/id/upload", Response: `{"upload_path": "` + s.URL + `/box-upload-path"}`},
+		stubResponse{StatusCode: 200, Method: "PUT", Path: "/box/hashicorp/precise64/version/0.5/release"},
+	}
+
+	server := newStackServer(stack)
+	defer server.Close()
+	config := testGoodConfig()
+	config["vagrant_cloud_url"] = server.URL
+	config["no_direct_upload"] = true
+
+	var p PostProcessor
+
+	err = p.Configure(config)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+	_, _, _, err = p.PostProcess(context.Background(), testUi(), artifact)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestPostProcessor_PostProcess_uploadsAndNoRelease(t *testing.T) {
+	files := tarFiles{
+		{"foo.txt", "This is a foo file"},
+		{"bar.txt", "This is a bar file"},
+		{"metadata.json", `{"provider": "virtualbox"}`},
+	}
+	boxfile, err := createBox(files)
+	if err != nil {
+		t.Fatalf("%s", err)
+	}
+	defer os.Remove(boxfile.Name())
+
+	artifact := &packer.MockArtifact{
+		BuilderIdValue: "mitchellh.post-processor.vagrant",
+		FilesValue:     []string{boxfile.Name()},
+	}
+
+	s := newStackServer([]stubResponse{stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-path"}})
+	defer s.Close()
+
+	stack := []stubResponse{
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/authenticate"},
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64", Response: `{"tag": "hashicorp/precise64"}`},
+		stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/versions", Response: `{}`},
+		stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/version/0.5/providers", Response: `{}`},
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64/version/0.5/provider/id/upload", Response: `{"upload_path": "` + s.URL + `/box-upload-path"}`},
+	}
+
+	server := newStackServer(stack)
+	defer server.Close()
+	config := testGoodConfig()
+	config["vagrant_cloud_url"] = server.URL
+	config["no_direct_upload"] = true
+	config["no_release"] = true
+
+	var p PostProcessor
+
+	err = p.Configure(config)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	_, _, _, err = p.PostProcess(context.Background(), testUi(), artifact)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
+func TestPostProcessor_PostProcess_uploadsDirectAndReleases(t *testing.T) {
+	files := tarFiles{
+		{"foo.txt", "This is a foo file"},
+		{"bar.txt", "This is a bar file"},
+		{"metadata.json", `{"provider": "virtualbox"}`},
+	}
+	boxfile, err := createBox(files)
+	if err != nil {
+		t.Fatalf("%s", err)
+	}
+	defer os.Remove(boxfile.Name())
+
+	artifact := &packer.MockArtifact{
+		BuilderIdValue: "mitchellh.post-processor.vagrant",
+		FilesValue:     []string{boxfile.Name()},
+	}
+
+	s := newStackServer(
+		[]stubResponse{
+			stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-path"},
+		},
+	)
+	defer s.Close()
+
+	stack := []stubResponse{
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/authenticate"},
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64", Response: `{"tag": "hashicorp/precise64"}`},
+		stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/versions", Response: `{}`},
+		stubResponse{StatusCode: 200, Method: "POST", Path: "/box/hashicorp/precise64/version/0.5/providers", Response: `{}`},
+		stubResponse{StatusCode: 200, Method: "GET", Path: "/box/hashicorp/precise64/version/0.5/provider/id/upload/direct"},
+		stubResponse{StatusCode: 200, Method: "PUT", Path: "/box-upload-complete"},
+		stubResponse{StatusCode: 200, Method: "PUT", Path: "/box/hashicorp/precise64/version/0.5/release"},
+	}
+
+	server := newStackServer(stack)
+	defer server.Close()
+	config := testGoodConfig()
+	config["vagrant_cloud_url"] = server.URL
+
+	// Set response here so we have API server URL available
+	stack[4].Response = `{"upload_path": "` + s.URL + `/box-upload-path", "callback": "` + server.URL + `/box-upload-complete"}`
+
+	var p PostProcessor
+
+	err = p.Configure(config)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+
+	_, _, _, err = p.PostProcess(context.Background(), testUi(), artifact)
+	if err != nil {
+		t.Fatalf("err: %s", err)
+	}
+}
+
 func testUi() *packer.BasicUi {
 	return &packer.BasicUi{
 		Reader: new(bytes.Buffer),
diff --git a/post-processor/vagrant-cloud/step_confirm_upload.go b/post-processor/vagrant-cloud/step_confirm_upload.go
new file mode 100644
index 000000000..e338fcf8f
--- /dev/null
+++ b/post-processor/vagrant-cloud/step_confirm_upload.go
@@ -0,0 +1,43 @@
+package vagrantcloud
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+)
+
+type stepConfirmUpload struct {
+}
+
+func (s *stepConfirmUpload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
+	client := state.Get("client").(*VagrantCloudClient)
+	ui := state.Get("ui").(packer.Ui)
+	upload := state.Get("upload").(*Upload)
+	url := upload.CallbackPath
+
+	ui.Say("Confirming direct box upload completion")
+
+	resp, err := client.Callback(url)
+
+	if err != nil || resp.StatusCode != 200 {
+		if resp == nil || resp.Body == nil {
+			state.Put("error", "No response from server.")
+		} else {
+			cloudErrors := &VagrantCloudErrors{}
+			err = decodeBody(resp, cloudErrors)
+			if err != nil {
+				ui.Error(fmt.Sprintf("error decoding error response: %s", err))
+			}
+			state.Put("error", fmt.Errorf("Error preparing upload: %s", cloudErrors.FormatErrors()))
+		}
+		return multistep.ActionHalt
+	}
+
+	return multistep.ActionContinue
+}
+
+func (s *stepConfirmUpload) Cleanup(state multistep.StateBag) {
+	// No cleanup
+}
diff --git a/post-processor/vagrant-cloud/step_create_provider.go b/post-processor/vagrant-cloud/step_create_provider.go
index da0c297e3..a6cfaa02f 100644
--- a/post-processor/vagrant-cloud/step_create_provider.go
+++ b/post-processor/vagrant-cloud/step_create_provider.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type Provider struct {
diff --git a/post-processor/vagrant-cloud/step_create_version.go b/post-processor/vagrant-cloud/step_create_version.go
index 6830dc4a4..75bd3f0a4 100644
--- a/post-processor/vagrant-cloud/step_create_version.go
+++ b/post-processor/vagrant-cloud/step_create_version.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type Version struct {
diff --git a/post-processor/vagrant-cloud/step_prepare_upload.go b/post-processor/vagrant-cloud/step_prepare_upload.go
index c76db8d43..463b5afbc 100644
--- a/post-processor/vagrant-cloud/step_prepare_upload.go
+++ b/post-processor/vagrant-cloud/step_prepare_upload.go
@@ -4,12 +4,13 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type Upload struct {
-	UploadPath string `json:"upload_path"`
+	UploadPath   string `json:"upload_path"`
+	CallbackPath string `json:"callback"`
 }
 
 type stepPrepareUpload struct {
@@ -17,6 +18,7 @@ type stepPrepareUpload struct {
 
 func (s *stepPrepareUpload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*VagrantCloudClient)
+	config := state.Get("config").(*Config)
 	ui := state.Get("ui").(packer.Ui)
 	box := state.Get("box").(*Box)
 	version := state.Get("version").(*Version)
@@ -24,6 +26,9 @@ func (s *stepPrepareUpload) Run(ctx context.Context, state multistep.StateBag) m
 	artifactFilePath := state.Get("artifactFilePath").(string)
 
 	path := fmt.Sprintf("box/%s/version/%v/provider/%s/upload", box.Tag, version.Version, provider.Name)
+	if !config.NoDirectUpload {
+		path = path + "/direct"
+	}
 	upload := &Upload{}
 
 	ui.Say(fmt.Sprintf("Preparing upload of box: %s", artifactFilePath))
diff --git a/post-processor/vagrant-cloud/step_release_version.go b/post-processor/vagrant-cloud/step_release_version.go
index 18ec9efd7..d8e41a05a 100644
--- a/post-processor/vagrant-cloud/step_release_version.go
+++ b/post-processor/vagrant-cloud/step_release_version.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type stepReleaseVersion struct {
diff --git a/post-processor/vagrant-cloud/step_upload.go b/post-processor/vagrant-cloud/step_upload.go
index 1eb046ded..669011520 100644
--- a/post-processor/vagrant-cloud/step_upload.go
+++ b/post-processor/vagrant-cloud/step_upload.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"net/http"
 	"time"
 
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
 )
 
 type stepUpload struct {
@@ -16,6 +17,7 @@ type stepUpload struct {
 
 func (s *stepUpload) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	client := state.Get("client").(*VagrantCloudClient)
+	config := state.Get("config").(*Config)
 	ui := state.Get("ui").(packer.Ui)
 	upload := state.Get("upload").(*Upload)
 	artifactFilePath := state.Get("artifactFilePath").(string)
@@ -32,7 +34,14 @@ func (s *stepUpload) Run(ctx context.Context, state multistep.StateBag) multiste
 	}.Run(ctx, func(ctx context.Context) error {
 		ui.Message(fmt.Sprintf("Uploading box"))
 
-		resp, err := client.Upload(artifactFilePath, url)
+		var err error
+		var resp *http.Response
+
+		if config.NoDirectUpload {
+			resp, err = client.Upload(artifactFilePath, url)
+		} else {
+			resp, err = client.DirectUpload(artifactFilePath, url)
+		}
 		if err != nil {
 			ui.Message(fmt.Sprintf(
 				"Error uploading box! Will retry in 10 seconds. Error: %s", err))
diff --git a/post-processor/vagrant-cloud/step_verify_box.go b/post-processor/vagrant-cloud/step_verify_box.go
index 573815986..4cf25a62e 100644
--- a/post-processor/vagrant-cloud/step_verify_box.go
+++ b/post-processor/vagrant-cloud/step_verify_box.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 type Box struct {
diff --git a/post-processor/vagrant-cloud/version/version.go b/post-processor/vagrant-cloud/version/version.go
new file mode 100644
index 000000000..f5e5883f3
--- /dev/null
+++ b/post-processor/vagrant-cloud/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VagrantCloudPluginVersion *version.PluginVersion
+
+func init() {
+	VagrantCloudPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/vagrant/post-processor.go b/post-processor/vagrant/post-processor.go
index 43cde6855..06f546523 100644
--- a/post-processor/vagrant/post-processor.go
+++ b/post-processor/vagrant/post-processor.go
@@ -16,12 +16,12 @@ import (
 	"text/template"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/hashicorp/packer/post-processor/artifice"
-	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/mitchellh/mapstructure"
 )
 
diff --git a/post-processor/vagrant/post-processor.hcl2spec.go b/post-processor/vagrant/post-processor.hcl2spec.go
index 187a218d6..0d0b6f424 100644
--- a/post-processor/vagrant/post-processor.hcl2spec.go
+++ b/post-processor/vagrant/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName              *string                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType            *string                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion            *string                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                  *bool                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                  *bool                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError                *string                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -39,6 +40,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/vagrant/util.go b/post-processor/vagrant/util.go
index 21f3398eb..b58e9ecfe 100644
--- a/post-processor/vagrant/util.go
+++ b/post-processor/vagrant/util.go
@@ -12,7 +12,7 @@ import (
 	"runtime"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/klauspost/pgzip"
 )
 
diff --git a/post-processor/vagrant/version/version.go b/post-processor/vagrant/version/version.go
new file mode 100644
index 000000000..9f54fee7b
--- /dev/null
+++ b/post-processor/vagrant/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VagrantPostprocessorVersion *version.PluginVersion
+
+func init() {
+	VagrantPostprocessorVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/vagrant/virtualbox_test.go b/post-processor/vagrant/virtualbox_test.go
index 3e46f59fe..3f072366d 100644
--- a/post-processor/vagrant/virtualbox_test.go
+++ b/post-processor/vagrant/virtualbox_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/hashicorp/packer/packer/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -18,7 +18,7 @@ func TestDecomressOVA(t *testing.T) {
 	assert.NoError(t, err)
 	defer os.RemoveAll(td)
 
-	fixture := "../../common/test-fixtures/decompress-tar/outside_parent.tar"
+	fixture := "../../packer-plugin-sdk/test-fixtures/decompress-tar/outside_parent.tar"
 	err = DecompressOva(td, fixture)
 	assert.NoError(t, err)
 	_, err = os.Stat(filepath.Join(filepath.Base(td), "demo.poc"))
diff --git a/post-processor/vsphere-template/post-processor.go b/post-processor/vsphere-template/post-processor.go
index bc3e314f5..2d3fc18b4 100644
--- a/post-processor/vsphere-template/post-processor.go
+++ b/post-processor/vsphere-template/post-processor.go
@@ -10,17 +10,17 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/hcl/v2/hcldec"
 	vmwcommon "github.com/hashicorp/packer/builder/vmware/common"
 	vsphere "github.com/hashicorp/packer/builder/vsphere/common"
-	vspherepost "github.com/hashicorp/packer/post-processor/vsphere"
-
-	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
-	"github.com/hashicorp/packer/template/interpolate"
+	vspherepost "github.com/hashicorp/packer/post-processor/vsphere"
 	"github.com/vmware/govmomi"
 )
 
@@ -144,7 +144,7 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
 		NewStepCreateSnapshot(artifact, p),
 		NewStepMarkAsTemplate(artifact, p),
 	}
-	runner := common.NewRunnerWithPauseFn(steps, p.config.PackerConfig, ui, state)
+	runner := commonsteps.NewRunnerWithPauseFn(steps, p.config.PackerConfig, ui, state)
 	runner.Run(ctx, state)
 	if rawErr, ok := state.GetOk("error"); ok {
 		return nil, false, false, rawErr.(error)
diff --git a/post-processor/vsphere-template/post-processor.hcl2spec.go b/post-processor/vsphere-template/post-processor.hcl2spec.go
index 7b3768420..2b4de4334 100644
--- a/post-processor/vsphere-template/post-processor.hcl2spec.go
+++ b/post-processor/vsphere-template/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -42,6 +43,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/vsphere-template/step_choose_datacenter.go b/post-processor/vsphere-template/step_choose_datacenter.go
index f7ba17803..0dd9f8b55 100644
--- a/post-processor/vsphere-template/step_choose_datacenter.go
+++ b/post-processor/vsphere-template/step_choose_datacenter.go
@@ -3,8 +3,8 @@ package vsphere_template
 import (
 	"context"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/find"
 )
diff --git a/post-processor/vsphere-template/step_create_folder.go b/post-processor/vsphere-template/step_create_folder.go
index 181cca0a7..8d16506ac 100644
--- a/post-processor/vsphere-template/step_create_folder.go
+++ b/post-processor/vsphere-template/step_create_folder.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/object"
 )
diff --git a/post-processor/vsphere-template/step_create_snapshot.go b/post-processor/vsphere-template/step_create_snapshot.go
index 7fd0bdde1..6a091e841 100644
--- a/post-processor/vsphere-template/step_create_snapshot.go
+++ b/post-processor/vsphere-template/step_create_snapshot.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 	"github.com/hashicorp/packer/post-processor/vsphere"
 	"github.com/vmware/govmomi"
 )
diff --git a/post-processor/vsphere-template/step_mark_as_template.go b/post-processor/vsphere-template/step_mark_as_template.go
index 4bb231c88..e4af31f83 100644
--- a/post-processor/vsphere-template/step_mark_as_template.go
+++ b/post-processor/vsphere-template/step_mark_as_template.go
@@ -7,9 +7,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer/post-processor/vsphere"
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/object"
diff --git a/post-processor/vsphere-template/version/version.go b/post-processor/vsphere-template/version/version.go
new file mode 100644
index 000000000..c52a47174
--- /dev/null
+++ b/post-processor/vsphere-template/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VSphereTemplatePostprocessorVersion *version.PluginVersion
+
+func init() {
+	VSphereTemplatePostprocessorVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/vsphere/post-processor.go b/post-processor/vsphere/post-processor.go
index b816f31cb..ba3645db5 100644
--- a/post-processor/vsphere/post-processor.go
+++ b/post-processor/vsphere/post-processor.go
@@ -15,11 +15,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	shelllocal "github.com/hashicorp/packer/common/shell-local"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	shelllocal "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 var ovftool string = "ovftool"
diff --git a/post-processor/vsphere/post-processor.hcl2spec.go b/post-processor/vsphere/post-processor.hcl2spec.go
index fa782612d..57c1199fe 100644
--- a/post-processor/vsphere/post-processor.hcl2spec.go
+++ b/post-processor/vsphere/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -47,6 +48,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/vsphere/version/version.go b/post-processor/vsphere/version/version.go
new file mode 100644
index 000000000..413d1da66
--- /dev/null
+++ b/post-processor/vsphere/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var VSpherePostprocessorVersion *version.PluginVersion
+
+func init() {
+	VSpherePostprocessorVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/yandex-export/post-processor.go b/post-processor/yandex-export/post-processor.go
index 3e995f480..8c48da450 100644
--- a/post-processor/yandex-export/post-processor.go
+++ b/post-processor/yandex-export/post-processor.go
@@ -12,14 +12,15 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/builder"
 	"github.com/hashicorp/packer/builder/yandex"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/helper/multistep"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/packerbuilderdata"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
-	"github.com/hashicorp/packer/template/interpolate"
 )
 
 const defaultStorageEndpoint = "storage.yandexcloud.net"
@@ -210,14 +211,14 @@ func (p *PostProcessor) PostProcess(ctx context.Context, ui packer.Ui, artifact
 		},
 		&yandex.StepCreateInstance{
 			Debug:         p.config.PackerDebug,
-			GeneratedData: &builder.GeneratedData{State: state},
+			GeneratedData: &packerbuilderdata.GeneratedData{State: state},
 		},
 		new(yandex.StepWaitCloudInitScript),
 		new(yandex.StepTeardownInstance),
 	}
 
 	// Run the steps.
-	p.runner = common.NewRunner(steps, p.config.PackerConfig, ui)
+	p.runner = commonsteps.NewRunner(steps, p.config.PackerConfig, ui)
 	p.runner.Run(ctx, state)
 	if rawErr, ok := state.GetOk("error"); ok {
 		return nil, false, false, rawErr.(error)
diff --git a/post-processor/yandex-export/post-processor.hcl2spec.go b/post-processor/yandex-export/post-processor.hcl2spec.go
index 084c8dd71..8bbaf48c3 100644
--- a/post-processor/yandex-export/post-processor.hcl2spec.go
+++ b/post-processor/yandex-export/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName       *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType     *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion     *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug           *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce           *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError         *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/yandex-export/post-processor_test.go b/post-processor/yandex-export/post-processor_test.go
index 83f2cb8b8..ac5e850a0 100644
--- a/post-processor/yandex-export/post-processor_test.go
+++ b/post-processor/yandex-export/post-processor_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/hashicorp/packer/builder/yandex"
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep"
 )
 
 func TestPostProcessor_Configure(t *testing.T) {
diff --git a/post-processor/yandex-export/version/version.go b/post-processor/yandex-export/version/version.go
new file mode 100644
index 000000000..7efc8ea03
--- /dev/null
+++ b/post-processor/yandex-export/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var YandexExportPluginVersion *version.PluginVersion
+
+func init() {
+	YandexExportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/post-processor/yandex-import/post-processor.go b/post-processor/yandex-import/post-processor.go
index a4913eebb..8800e2381 100644
--- a/post-processor/yandex-import/post-processor.go
+++ b/post-processor/yandex-import/post-processor.go
@@ -11,13 +11,13 @@ import (
 	"github.com/hashicorp/hcl/v2/hcldec"
 	"github.com/hashicorp/packer/builder/file"
 	"github.com/hashicorp/packer/builder/yandex"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/hashicorp/packer/post-processor/artifice"
 	"github.com/hashicorp/packer/post-processor/compress"
 	yandexexport "github.com/hashicorp/packer/post-processor/yandex-export"
-	"github.com/hashicorp/packer/template/interpolate"
 	"github.com/yandex-cloud/go-genproto/yandex/cloud/iam/v1/awscompatibility"
 )
 
diff --git a/post-processor/yandex-import/post-processor.hcl2spec.go b/post-processor/yandex-import/post-processor.hcl2spec.go
index d05da3da0..1de14d668 100644
--- a/post-processor/yandex-import/post-processor.hcl2spec.go
+++ b/post-processor/yandex-import/post-processor.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName       *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType     *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion     *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug           *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce           *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError         *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -45,6 +46,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/post-processor/yandex-import/version/version.go b/post-processor/yandex-import/version/version.go
new file mode 100644
index 000000000..992e6ad08
--- /dev/null
+++ b/post-processor/yandex-import/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var YandexImportPluginVersion *version.PluginVersion
+
+func init() {
+	YandexImportPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/ansible-local/provisioner.go b/provisioner/ansible-local/provisioner.go
index 75338465d..96f9cf0be 100644
--- a/provisioner/ansible-local/provisioner.go
+++ b/provisioner/ansible-local/provisioner.go
@@ -10,12 +10,12 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 const DefaultStagingDir = "/tmp/packer-provisioner-ansible-local"
diff --git a/provisioner/ansible-local/provisioner.hcl2spec.go b/provisioner/ansible-local/provisioner.hcl2spec.go
index d9fdafff3..fc22fd467 100644
--- a/provisioner/ansible-local/provisioner.hcl2spec.go
+++ b/provisioner/ansible-local/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -47,6 +48,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/ansible-local/provisioner_test.go b/provisioner/ansible-local/provisioner_test.go
index 1b8e5e34a..9d55d549d 100644
--- a/provisioner/ansible-local/provisioner_test.go
+++ b/provisioner/ansible-local/provisioner_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/hashicorp/packer/builder/docker"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template"
 	"github.com/hashicorp/packer/provisioner/file"
-	"github.com/hashicorp/packer/template"
 )
 
 func TestProvisioner_Impl(t *testing.T) {
diff --git a/provisioner/ansible-local/version/version.go b/provisioner/ansible-local/version/version.go
new file mode 100644
index 000000000..1f9f410f9
--- /dev/null
+++ b/provisioner/ansible-local/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AnsibleLocalPluginVersion *version.PluginVersion
+
+func init() {
+	AnsibleLocalPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/examples/ansible/connection-plugin/2.4.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.4.x/packer.py
similarity index 100%
rename from examples/ansible/connection-plugin/2.4.x/packer.py
rename to provisioner/ansible/examples/connection-plugin/2.4.x/packer.py
diff --git a/examples/ansible/connection-plugin/2.5.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.5.x/packer.py
similarity index 100%
rename from examples/ansible/connection-plugin/2.5.x/packer.py
rename to provisioner/ansible/examples/connection-plugin/2.5.x/packer.py
diff --git a/examples/ansible/connection-plugin/2.6.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.6.x/packer.py
similarity index 100%
rename from examples/ansible/connection-plugin/2.6.x/packer.py
rename to provisioner/ansible/examples/connection-plugin/2.6.x/packer.py
diff --git a/provisioner/ansible/provisioner.go b/provisioner/ansible/provisioner.go
index a82aab702..63de5f4df 100644
--- a/provisioner/ansible/provisioner.go
+++ b/provisioner/ansible/provisioner.go
@@ -30,12 +30,13 @@ import (
 	"golang.org/x/crypto/ssh"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/adapter"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/adapter"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 type Config struct {
@@ -739,7 +740,7 @@ func (p *Provisioner) createCmdArgs(httpAddr, inventory, playbook, privKeyFile s
 	args = append(args, "-e", fmt.Sprintf("packer_builder_type=%s", p.config.PackerBuilderType))
 
 	// expose packer_http_addr extra variable
-	if httpAddr != common.HttpAddrNotImplemented {
+	if httpAddr != commonsteps.HttpAddrNotImplemented {
 		args = append(args, "-e", fmt.Sprintf("packer_http_addr=%s", httpAddr))
 	}
 
diff --git a/provisioner/ansible/provisioner.hcl2spec.go b/provisioner/ansible/provisioner.hcl2spec.go
index 61217c677..7d2d08079 100644
--- a/provisioner/ansible/provisioner.hcl2spec.go
+++ b/provisioner/ansible/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName       *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType     *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion     *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug           *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce           *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError         *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -57,6 +58,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/ansible/provisioner_test.go b/provisioner/ansible/provisioner_test.go
index a98fae8a4..b73e5c543 100644
--- a/provisioner/ansible/provisioner_test.go
+++ b/provisioner/ansible/provisioner_test.go
@@ -14,9 +14,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
-	confighelper "github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	confighelper "github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -475,9 +475,9 @@ func basicGenData(input map[string]interface{}) map[string]interface{} {
 		"SSHPrivateKey":     "asdf",
 		"SSHAgentAuth":      false,
 		"User":              "PartyPacker",
-		"PackerHTTPAddr":    common.HttpAddrNotImplemented,
-		"PackerHTTPIP":      common.HttpIPNotImplemented,
-		"PackerHTTPPort":    common.HttpPortNotImplemented,
+		"PackerHTTPAddr":    commonsteps.HttpAddrNotImplemented,
+		"PackerHTTPIP":      commonsteps.HttpIPNotImplemented,
+		"PackerHTTPPort":    commonsteps.HttpPortNotImplemented,
 	}
 	if input == nil {
 		return gd
@@ -510,7 +510,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			generatedData:   basicGenData(nil),
 			ExtraArguments:  []string{"-e", "hello-world"},
 			AnsibleEnvVars:  []string{"ENV_1=pancakes", "ENV_2=bananas"},
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
 			ExpectedArgs:    []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=yes'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"},
 		},
@@ -522,7 +522,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			ExtraArguments:      []string{"-e", "hello-world"},
 			AnsibleSSHExtraArgs: []string{"-o IdentitiesOnly=no"},
 			AnsibleEnvVars:      []string{"ENV_1=pancakes", "ENV_2=bananas"},
-			callArgs:            []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
+			callArgs:            []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
 			ExpectedArgs:        []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "--ssh-extra-args", "'-o IdentitiesOnly=no'", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars:     []string{"ENV_1=pancakes", "ENV_2=bananas"},
 		},
@@ -532,7 +532,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			UseProxy:        confighelper.TriTrue,
 			generatedData:   basicGenData(nil),
 			ExtraArguments:  []string{"-e", "hello-world"},
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
 			ExpectedArgs:    []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=yes'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{},
 		},
@@ -545,7 +545,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			}),
 			ExtraArguments:  []string{"-e", "hello-world"},
 			AnsibleEnvVars:  []string{"ENV_1=pancakes", "ENV_2=bananas"},
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
 			ExpectedArgs:    []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"},
 		},
@@ -584,7 +584,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			}),
 			ExtraArguments:  []string{"-e", "hello-world"},
 			AnsibleEnvVars:  []string{"ENV_1=pancakes", "ENV_2=bananas"},
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
 			ExpectedArgs:    []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{"ENV_1=pancakes", "ENV_2=bananas"},
 		},
@@ -637,7 +637,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			UseProxy:        confighelper.TriTrue,
 			generatedData:   basicGenData(nil),
 			ExtraArguments:  []string{"-e", "hello-world"},
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
 			ExpectedArgs:    []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=yes'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{},
 		},
@@ -648,7 +648,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			generatedData:       basicGenData(nil),
 			AnsibleSSHExtraArgs: []string{"-o IdentitiesOnly=no"},
 			ExtraArguments:      []string{"-e", "hello-world"},
-			callArgs:            []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
+			callArgs:            []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", "/path/to/privkey.pem"},
 			ExpectedArgs:        []string{"-e", "packer_build_name=\"packerparty\"", "-e", "packer_builder_type=fakebuilder", "-e", "ansible_ssh_private_key_file=/path/to/privkey.pem", "--ssh-extra-args", "'-o IdentitiesOnly=no'", "-e", "hello-world", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars:     []string{},
 		},
@@ -656,7 +656,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			TestName:        "Use SSH Agent",
 			UseProxy:        confighelper.TriTrue,
 			generatedData:   basicGenData(nil),
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
 			ExpectedArgs:    []string{"-e", "packer_builder_type=fakebuilder", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{},
 		},
@@ -664,7 +664,7 @@ func TestCreateCmdArgs(t *testing.T) {
 			// No builder name. This shouldn't cause an error, it just shouldn't be set. HCL, yo.
 			TestName:        "No builder name. This shouldn't cause an error, it just shouldn't be set. HCL, yo.",
 			generatedData:   basicGenData(nil),
-			callArgs:        []string{common.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
+			callArgs:        []string{commonsteps.HttpAddrNotImplemented, "/var/inventory", "test-playbook.yml", ""},
 			ExpectedArgs:    []string{"-e", "packer_builder_type=fakebuilder", "-i", "/var/inventory", "test-playbook.yml"},
 			ExpectedEnvVars: []string{},
 		},
diff --git a/provisioner/ansible/version/version.go b/provisioner/ansible/version/version.go
new file mode 100644
index 000000000..8009db0ca
--- /dev/null
+++ b/provisioner/ansible/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AnsiblePluginVersion *version.PluginVersion
+
+func init() {
+	AnsiblePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/azure-dtlartifact/provisioner.go b/provisioner/azure-dtlartifact/provisioner.go
index 5772b98d1..68e83ed79 100644
--- a/provisioner/azure-dtlartifact/provisioner.go
+++ b/provisioner/azure-dtlartifact/provisioner.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/hashicorp/packer/packer"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type DtlArtifact struct {
diff --git a/provisioner/azure-dtlartifact/provisioner.hcl2spec.go b/provisioner/azure-dtlartifact/provisioner.hcl2spec.go
index d41dec53e..9e89ae8ef 100644
--- a/provisioner/azure-dtlartifact/provisioner.hcl2spec.go
+++ b/provisioner/azure-dtlartifact/provisioner.hcl2spec.go
@@ -38,6 +38,7 @@ func (*FlatArtifactParameter) HCL2Spec() map[string]hcldec.Spec {
 type FlatConfig struct {
 	PackerBuildName        *string                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType      *string                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion      *string                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug            *bool                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce            *bool                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError          *string                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -51,6 +52,7 @@ type FlatConfig struct {
 	ObjectID               *string                `mapstructure:"object_id" cty:"object_id" hcl:"object_id"`
 	TenantID               *string                `mapstructure:"tenant_id" required:"false" cty:"tenant_id" hcl:"tenant_id"`
 	SubscriptionID         *string                `mapstructure:"subscription_id" cty:"subscription_id" hcl:"subscription_id"`
+	UseAzureCLIAuth        *bool                  `mapstructure:"use_azure_cli_auth" required:"false" cty:"use_azure_cli_auth" hcl:"use_azure_cli_auth"`
 	DtlArtifacts           []FlatDtlArtifact      `mapstructure:"dtl_artifacts" cty:"dtl_artifacts" hcl:"dtl_artifacts"`
 	LabName                *string                `mapstructure:"lab_name" cty:"lab_name" hcl:"lab_name"`
 	ResourceGroupName      *string                `mapstructure:"lab_resource_group_name" cty:"lab_resource_group_name" hcl:"lab_resource_group_name"`
@@ -74,6 +76,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
@@ -87,6 +90,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"object_id":                  &hcldec.AttrSpec{Name: "object_id", Type: cty.String, Required: false},
 		"tenant_id":                  &hcldec.AttrSpec{Name: "tenant_id", Type: cty.String, Required: false},
 		"subscription_id":            &hcldec.AttrSpec{Name: "subscription_id", Type: cty.String, Required: false},
+		"use_azure_cli_auth":         &hcldec.AttrSpec{Name: "use_azure_cli_auth", Type: cty.Bool, Required: false},
 		"dtl_artifacts":              &hcldec.BlockListSpec{TypeName: "dtl_artifacts", Nested: hcldec.ObjectSpec((*FlatDtlArtifact)(nil).HCL2Spec())},
 		"lab_name":                   &hcldec.AttrSpec{Name: "lab_name", Type: cty.String, Required: false},
 		"lab_resource_group_name":    &hcldec.AttrSpec{Name: "lab_resource_group_name", Type: cty.String, Required: false},
diff --git a/provisioner/azure-dtlartifact/version/version.go b/provisioner/azure-dtlartifact/version/version.go
new file mode 100644
index 000000000..89bb3ac46
--- /dev/null
+++ b/provisioner/azure-dtlartifact/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var AzureDTLPluginVersion *version.PluginVersion
+
+func init() {
+	AzureDTLPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/breakpoint/provisioner.go b/provisioner/breakpoint/provisioner.go
index d1674bf1a..b1fb64611 100644
--- a/provisioner/breakpoint/provisioner.go
+++ b/provisioner/breakpoint/provisioner.go
@@ -9,10 +9,10 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/provisioner/breakpoint/provisioner.hcl2spec.go b/provisioner/breakpoint/provisioner.hcl2spec.go
index 36947f129..080aee8f4 100644
--- a/provisioner/breakpoint/provisioner.hcl2spec.go
+++ b/provisioner/breakpoint/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -34,6 +35,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/breakpoint/version/version.go b/provisioner/breakpoint/version/version.go
new file mode 100644
index 000000000..af4037d62
--- /dev/null
+++ b/provisioner/breakpoint/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var BreakpointPluginVersion *version.PluginVersion
+
+func init() {
+	BreakpointPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/chef-client/provisioner.go b/provisioner/chef-client/provisioner.go
index 60f13fa14..feef39f9e 100644
--- a/provisioner/chef-client/provisioner.go
+++ b/provisioner/chef-client/provisioner.go
@@ -16,12 +16,12 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/provisioner"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 type guestOSTypeConfig struct {
@@ -32,13 +32,13 @@ type guestOSTypeConfig struct {
 }
 
 var guestOSTypeConfigs = map[string]guestOSTypeConfig{
-	provisioner.UnixOSType: {
+	guestexec.UnixOSType: {
 		executeCommand: "{{if .Sudo}}sudo {{end}}chef-client --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
 		installCommand: "curl -L https://omnitruck.chef.io/install.sh | {{if .Sudo}}sudo {{end}}bash -s --{{if .Version}} -v {{.Version}}{{end}}",
 		knifeCommand:   "{{if .Sudo}}sudo {{end}}knife {{.Args}} {{.Flags}}",
 		stagingDir:     "/tmp/packer-chef-client",
 	},
-	provisioner.WindowsOSType: {
+	guestexec.WindowsOSType: {
 		executeCommand: "c:/opscode/chef/bin/chef-client.bat --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
 		installCommand: "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; Install-Project{{if .Version}} -version {{.Version}}{{end}}\"",
 		knifeCommand:   "c:/opscode/chef/bin/knife.bat {{.Args}} {{.Flags}}",
@@ -86,7 +86,7 @@ type Provisioner struct {
 	config            Config
 	communicator      packer.Communicator
 	guestOSTypeConfig guestOSTypeConfig
-	guestCommands     *provisioner.GuestCommands
+	guestCommands     *guestexec.GuestCommands
 	generatedData     map[string]interface{}
 }
 
@@ -142,7 +142,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 	}
 
 	if p.config.GuestOSType == "" {
-		p.config.GuestOSType = provisioner.DefaultOSType
+		p.config.GuestOSType = guestexec.DefaultOSType
 	}
 	p.config.GuestOSType = strings.ToLower(p.config.GuestOSType)
 
@@ -152,7 +152,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
 
-	p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
+	p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
 	if err != nil {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
@@ -581,7 +581,7 @@ func (p *Provisioner) executeChef(ui packer.Ui, comm packer.Communicator, config
 	}
 
 	if p.config.ElevatedUser != "" {
-		command, err = provisioner.GenerateElevatedRunner(command, p)
+		command, err = guestexec.GenerateElevatedRunner(command, p)
 		if err != nil {
 			return err
 		}
diff --git a/provisioner/chef-client/provisioner.hcl2spec.go b/provisioner/chef-client/provisioner.hcl2spec.go
index ab4fa067f..6d961e9a9 100644
--- a/provisioner/chef-client/provisioner.hcl2spec.go
+++ b/provisioner/chef-client/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName            *string                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType          *string                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion          *string                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                *bool                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                *bool                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError              *string                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -60,6 +61,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/chef-client/version/version.go b/provisioner/chef-client/version/version.go
new file mode 100644
index 000000000..2bc78f67c
--- /dev/null
+++ b/provisioner/chef-client/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ChefClientPluginVersion *version.PluginVersion
+
+func init() {
+	ChefClientPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/chef-solo/provisioner.go b/provisioner/chef-solo/provisioner.go
index 402ff73b9..07bf75432 100644
--- a/provisioner/chef-solo/provisioner.go
+++ b/provisioner/chef-solo/provisioner.go
@@ -16,11 +16,11 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/provisioner"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type guestOSTypeConfig struct {
@@ -30,12 +30,12 @@ type guestOSTypeConfig struct {
 }
 
 var guestOSTypeConfigs = map[string]guestOSTypeConfig{
-	provisioner.UnixOSType: {
+	guestexec.UnixOSType: {
 		executeCommand: "{{if .Sudo}}sudo {{end}}chef-solo --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
 		installCommand: "curl -L https://omnitruck.chef.io/install.sh | {{if .Sudo}}sudo {{end}}bash -s --{{if .Version}} -v {{.Version}}{{end}}",
 		stagingDir:     "/tmp/packer-chef-solo",
 	},
-	provisioner.WindowsOSType: {
+	guestexec.WindowsOSType: {
 		executeCommand: "c:/opscode/chef/bin/chef-solo.bat --no-color -c {{.ConfigPath}} -j {{.JsonPath}}",
 		installCommand: "powershell.exe -Command \". { iwr -useb https://omnitruck.chef.io/install.ps1 } | iex; Install-Project{{if .Version}} -version {{.Version}}{{end}}\"",
 		stagingDir:     "C:/Windows/Temp/packer-chef-solo",
@@ -70,7 +70,7 @@ type Config struct {
 type Provisioner struct {
 	config            Config
 	guestOSTypeConfig guestOSTypeConfig
-	guestCommands     *provisioner.GuestCommands
+	guestCommands     *guestexec.GuestCommands
 }
 
 type ConfigTemplate struct {
@@ -121,7 +121,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 	}
 
 	if p.config.GuestOSType == "" {
-		p.config.GuestOSType = provisioner.DefaultOSType
+		p.config.GuestOSType = guestexec.DefaultOSType
 	}
 	p.config.GuestOSType = strings.ToLower(p.config.GuestOSType)
 
@@ -131,7 +131,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
 
-	p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
+	p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
 	if err != nil {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
diff --git a/provisioner/chef-solo/provisioner.hcl2spec.go b/provisioner/chef-solo/provisioner.hcl2spec.go
index 6ed2fc7dc..f886339a2 100644
--- a/provisioner/chef-solo/provisioner.hcl2spec.go
+++ b/provisioner/chef-solo/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName            *string                `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType          *string                `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion          *string                `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug                *bool                  `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce                *bool                  `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError              *string                `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -50,6 +51,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":              &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":            &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":            &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":                   &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":                   &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":                &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/chef-solo/version/version.go b/provisioner/chef-solo/version/version.go
new file mode 100644
index 000000000..63d20948b
--- /dev/null
+++ b/provisioner/chef-solo/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ChefSoloPluginVersion *version.PluginVersion
+
+func init() {
+	ChefSoloPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/converge/provisioner.go b/provisioner/converge/provisioner.go
index 47aa4843d..a34323cdf 100644
--- a/provisioner/converge/provisioner.go
+++ b/provisioner/converge/provisioner.go
@@ -16,10 +16,10 @@ import (
 	"encoding/json"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 // Config for Converge provisioner
diff --git a/provisioner/converge/provisioner.hcl2spec.go b/provisioner/converge/provisioner.hcl2spec.go
index 8cb578ca9..295f4616c 100644
--- a/provisioner/converge/provisioner.hcl2spec.go
+++ b/provisioner/converge/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName      *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType    *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion    *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug          *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce          *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError        *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -42,6 +43,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/converge/version/version.go b/provisioner/converge/version/version.go
new file mode 100644
index 000000000..5d0d159a1
--- /dev/null
+++ b/provisioner/converge/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ConvergePluginVersion *version.PluginVersion
+
+func init() {
+	ConvergePluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/file/provisioner.go b/provisioner/file/provisioner.go
index 3b25a1df6..abf6e0ad4 100644
--- a/provisioner/file/provisioner.go
+++ b/provisioner/file/provisioner.go
@@ -13,10 +13,10 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
diff --git a/provisioner/file/provisioner.hcl2spec.go b/provisioner/file/provisioner.hcl2spec.go
index 0d17615b3..2b0372176 100644
--- a/provisioner/file/provisioner.hcl2spec.go
+++ b/provisioner/file/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -37,6 +38,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/file/version/version.go b/provisioner/file/version/version.go
new file mode 100644
index 000000000..b9769b076
--- /dev/null
+++ b/provisioner/file/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var FileProvisionerVersion *version.PluginVersion
+
+func init() {
+	FileProvisionerVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/inspec/provisioner.go b/provisioner/inspec/provisioner.go
index 0644663ff..fdf13cc5a 100644
--- a/provisioner/inspec/provisioner.go
+++ b/provisioner/inspec/provisioner.go
@@ -28,11 +28,11 @@ import (
 	"golang.org/x/crypto/ssh"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/adapter"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/adapter"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 var SupportedBackends = map[string]bool{"docker": true, "local": true, "ssh": true, "winrm": true}
diff --git a/provisioner/inspec/provisioner.hcl2spec.go b/provisioner/inspec/provisioner.hcl2spec.go
index 179f9d37b..c7942d885 100644
--- a/provisioner/inspec/provisioner.hcl2spec.go
+++ b/provisioner/inspec/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName      *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType    *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion    *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug          *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce          *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError        *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -44,6 +45,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/inspec/version/version.go b/provisioner/inspec/version/version.go
new file mode 100644
index 000000000..80372a89c
--- /dev/null
+++ b/provisioner/inspec/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var InspecPluginVersion *version.PluginVersion
+
+func init() {
+	InspecPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/powershell/provisioner.go b/provisioner/powershell/provisioner.go
index e7524b79a..2f44644e1 100644
--- a/provisioner/powershell/provisioner.go
+++ b/provisioner/powershell/provisioner.go
@@ -17,15 +17,15 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell"
-	"github.com/hashicorp/packer/common/uuid"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/provisioner"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
+	"github.com/hashicorp/packer/packer-plugin-sdk/uuid"
 )
 
 var retryableSleep = 2 * time.Second
@@ -407,15 +407,15 @@ func (p *Provisioner) createFlattenedEnvVars(elevated bool) (flattened string) {
 
 	// expose ip address variables
 	httpAddr := p.generatedData["PackerHTTPAddr"]
-	if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented {
+	if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented {
 		envVars["PACKER_HTTP_ADDR"] = httpAddr.(string)
 	}
 	httpIP := p.generatedData["PackerHTTPIP"]
-	if httpIP != nil && httpIP != common.HttpIPNotImplemented {
+	if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented {
 		envVars["PACKER_HTTP_IP"] = httpIP.(string)
 	}
 	httpPort := p.generatedData["PackerHTTPPort"]
-	if httpPort != nil && httpPort != common.HttpPortNotImplemented {
+	if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented {
 		envVars["PACKER_HTTP_PORT"] = httpPort.(string)
 	}
 
@@ -522,7 +522,7 @@ func (p *Provisioner) createCommandTextPrivileged() (command string, err error)
 		return "", fmt.Errorf("Error processing command: %s", err)
 	}
 
-	command, err = provisioner.GenerateElevatedRunner(command, p)
+	command, err = guestexec.GenerateElevatedRunner(command, p)
 	if err != nil {
 		return "", fmt.Errorf("Error generating elevated runner: %s", err)
 	}
diff --git a/provisioner/powershell/provisioner.hcl2spec.go b/provisioner/powershell/provisioner.hcl2spec.go
index 410955b9c..3e12e7504 100644
--- a/provisioner/powershell/provisioner.hcl2spec.go
+++ b/provisioner/powershell/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName        *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType      *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion      *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug            *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce            *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError          *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -50,6 +51,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/powershell/provisioner_test.go b/provisioner/powershell/provisioner_test.go
index 4def2785c..e5611385b 100644
--- a/provisioner/powershell/provisioner_test.go
+++ b/provisioner/powershell/provisioner_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -856,8 +856,8 @@ func testConfigWithSkipClean() map[string]interface{} {
 
 func generatedData() map[string]interface{} {
 	return map[string]interface{}{
-		"PackerHTTPAddr": common.HttpAddrNotImplemented,
-		"PackerHTTPIP":   common.HttpIPNotImplemented,
-		"PackerHTTPPort": common.HttpPortNotImplemented,
+		"PackerHTTPAddr": commonsteps.HttpAddrNotImplemented,
+		"PackerHTTPIP":   commonsteps.HttpIPNotImplemented,
+		"PackerHTTPPort": commonsteps.HttpPortNotImplemented,
 	}
 }
diff --git a/provisioner/powershell/version/version.go b/provisioner/powershell/version/version.go
new file mode 100644
index 000000000..42765a845
--- /dev/null
+++ b/provisioner/powershell/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var PowershellPluginVersion *version.PluginVersion
+
+func init() {
+	PowershellPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/puppet-masterless/provisioner.go b/provisioner/puppet-masterless/provisioner.go
index 1c1307edd..a851aa7e2 100644
--- a/provisioner/puppet-masterless/provisioner.go
+++ b/provisioner/puppet-masterless/provisioner.go
@@ -13,11 +13,11 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/provisioner"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
@@ -88,7 +88,7 @@ type guestOSTypeConfig struct {
 
 // FIXME assumes both Packer host and target are same OS
 var guestOSTypeConfigs = map[string]guestOSTypeConfig{
-	provisioner.UnixOSType: {
+	guestexec.UnixOSType: {
 		tempDir:    "/tmp",
 		stagingDir: "/tmp/packer-puppet-masterless",
 		executeCommand: "cd {{.WorkingDir}} && " +
@@ -106,7 +106,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 		facterVarsJoiner: " ",
 		modulePathJoiner: ":",
 	},
-	provisioner.WindowsOSType: {
+	guestexec.WindowsOSType: {
 		tempDir:    filepath.ToSlash(os.Getenv("TEMP")),
 		stagingDir: filepath.ToSlash(os.Getenv("SYSTEMROOT")) + "/Temp/packer-puppet-masterless",
 		executeCommand: "cd {{.WorkingDir}} && " +
@@ -129,7 +129,7 @@ type Provisioner struct {
 	config            Config
 	communicator      packer.Communicator
 	guestOSTypeConfig guestOSTypeConfig
-	guestCommands     *provisioner.GuestCommands
+	guestCommands     *guestexec.GuestCommands
 	generatedData     map[string]interface{}
 }
 
@@ -171,7 +171,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 
 	// Set some defaults
 	if p.config.GuestOSType == "" {
-		p.config.GuestOSType = provisioner.DefaultOSType
+		p.config.GuestOSType = guestexec.DefaultOSType
 	}
 	p.config.GuestOSType = strings.ToLower(p.config.GuestOSType)
 
@@ -181,7 +181,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
 
-	p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
+	p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
 	if err != nil {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
@@ -338,7 +338,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
 	}
 
 	if p.config.ElevatedUser != "" {
-		command, err = provisioner.GenerateElevatedRunner(command, p)
+		command, err = guestexec.GenerateElevatedRunner(command, p)
 		if err != nil {
 			return err
 		}
diff --git a/provisioner/puppet-masterless/provisioner.hcl2spec.go b/provisioner/puppet-masterless/provisioner.hcl2spec.go
index 61fa9f693..8659f021a 100644
--- a/provisioner/puppet-masterless/provisioner.hcl2spec.go
+++ b/provisioner/puppet-masterless/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -48,6 +49,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/puppet-masterless/provisioner_test.go b/provisioner/puppet-masterless/provisioner_test.go
index 582b8d311..2a9b21e6b 100644
--- a/provisioner/puppet-masterless/provisioner_test.go
+++ b/provisioner/puppet-masterless/provisioner_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/provisioner/puppet-masterless/version/version.go b/provisioner/puppet-masterless/version/version.go
new file mode 100644
index 000000000..dde467d39
--- /dev/null
+++ b/provisioner/puppet-masterless/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var PuppetMasterlessPluginVersion *version.PluginVersion
+
+func init() {
+	PuppetMasterlessPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/puppet-server/provisioner.go b/provisioner/puppet-server/provisioner.go
index 6025e7998..e652e3c5b 100644
--- a/provisioner/puppet-server/provisioner.go
+++ b/provisioner/puppet-server/provisioner.go
@@ -12,11 +12,11 @@ import (
 	"strings"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/provisioner"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
@@ -85,7 +85,7 @@ type guestOSTypeConfig struct {
 
 // FIXME assumes both Packer host and target are same OS
 var guestOSTypeConfigs = map[string]guestOSTypeConfig{
-	provisioner.UnixOSType: {
+	guestexec.UnixOSType: {
 		tempDir:    "/tmp",
 		stagingDir: "/tmp/packer-puppet-server",
 		executeCommand: "cd {{.WorkingDir}} && " +
@@ -102,7 +102,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 		facterVarsFmt:    "FACTER_%s='%s'",
 		facterVarsJoiner: " ",
 	},
-	provisioner.WindowsOSType: {
+	guestexec.WindowsOSType: {
 		tempDir:    filepath.ToSlash(os.Getenv("TEMP")),
 		stagingDir: filepath.ToSlash(os.Getenv("SYSTEMROOT")) + "/Temp/packer-puppet-server",
 		executeCommand: "cd {{.WorkingDir}} && " +
@@ -124,7 +124,7 @@ type Provisioner struct {
 	config            Config
 	communicator      packer.Communicator
 	guestOSTypeConfig guestOSTypeConfig
-	guestCommands     *provisioner.GuestCommands
+	guestCommands     *guestexec.GuestCommands
 	generatedData     map[string]interface{}
 }
 
@@ -164,7 +164,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 	}
 
 	if p.config.GuestOSType == "" {
-		p.config.GuestOSType = provisioner.DefaultOSType
+		p.config.GuestOSType = guestexec.DefaultOSType
 	}
 	p.config.GuestOSType = strings.ToLower(p.config.GuestOSType)
 
@@ -174,7 +174,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
 
-	p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
+	p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.PreventSudo)
 	if err != nil {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
@@ -291,7 +291,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
 	}
 
 	if p.config.ElevatedUser != "" {
-		command, err = provisioner.GenerateElevatedRunner(command, p)
+		command, err = guestexec.GenerateElevatedRunner(command, p)
 		if err != nil {
 			return err
 		}
diff --git a/provisioner/puppet-server/provisioner.hcl2spec.go b/provisioner/puppet-server/provisioner.hcl2spec.go
index 3db29a7ba..18af2fc8e 100644
--- a/provisioner/puppet-server/provisioner.hcl2spec.go
+++ b/provisioner/puppet-server/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName      *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType    *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion    *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug          *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce          *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError        *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -48,6 +49,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/puppet-server/version/version.go b/provisioner/puppet-server/version/version.go
new file mode 100644
index 000000000..606af83ec
--- /dev/null
+++ b/provisioner/puppet-server/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var PuppetServerPluginVersion *version.PluginVersion
+
+func init() {
+	PuppetServerPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go
index d343e3ef5..743f1fe8f 100644
--- a/provisioner/salt-masterless/provisioner.go
+++ b/provisioner/salt-masterless/provisioner.go
@@ -16,11 +16,11 @@ import (
 
 	"github.com/hashicorp/go-getter/v2"
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/provisioner"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/guestexec"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 )
 
 type Config struct {
@@ -83,7 +83,7 @@ type Config struct {
 type Provisioner struct {
 	config            Config
 	guestOSTypeConfig guestOSTypeConfig
-	guestCommands     *provisioner.GuestCommands
+	guestCommands     *guestexec.GuestCommands
 }
 
 type guestOSTypeConfig struct {
@@ -96,7 +96,7 @@ type guestOSTypeConfig struct {
 }
 
 var guestOSTypeConfigs = map[string]guestOSTypeConfig{
-	provisioner.UnixOSType: {
+	guestexec.UnixOSType: {
 		configDir:         "/etc/salt",
 		tempDir:           "/tmp/salt",
 		stateRoot:         "/srv/salt",
@@ -104,7 +104,7 @@ var guestOSTypeConfigs = map[string]guestOSTypeConfig{
 		bootstrapFetchCmd: "curl -L https://bootstrap.saltstack.com -o /tmp/install_salt.sh || wget -O /tmp/install_salt.sh https://bootstrap.saltstack.com",
 		bootstrapRunCmd:   "sh /tmp/install_salt.sh",
 	},
-	provisioner.WindowsOSType: {
+	guestexec.WindowsOSType: {
 		configDir:         "C:/salt/conf",
 		tempDir:           "C:/Windows/Temp/salt/",
 		stateRoot:         "C:/salt/state",
@@ -130,7 +130,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 	}
 
 	if p.config.GuestOSType == "" {
-		p.config.GuestOSType = provisioner.DefaultOSType
+		p.config.GuestOSType = guestexec.DefaultOSType
 	} else {
 		p.config.GuestOSType = strings.ToLower(p.config.GuestOSType)
 	}
@@ -141,7 +141,7 @@ func (p *Provisioner) Prepare(raws ...interface{}) error {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
 
-	p.guestCommands, err = provisioner.NewGuestCommands(p.config.GuestOSType, !p.config.DisableSudo)
+	p.guestCommands, err = guestexec.NewGuestCommands(p.config.GuestOSType, !p.config.DisableSudo)
 	if err != nil {
 		return fmt.Errorf("Invalid guest_os_type: \"%s\"", p.config.GuestOSType)
 	}
@@ -413,7 +413,7 @@ func (p *Provisioner) Provision(ctx context.Context, ui packer.Ui, comm packer.C
 
 // Prepends sudo to supplied command if config says to
 func (p *Provisioner) sudo(cmd string) string {
-	if p.config.DisableSudo || (p.config.GuestOSType == provisioner.WindowsOSType) {
+	if p.config.DisableSudo || (p.config.GuestOSType == guestexec.WindowsOSType) {
 		return cmd
 	}
 
diff --git a/provisioner/salt-masterless/provisioner.hcl2spec.go b/provisioner/salt-masterless/provisioner.hcl2spec.go
index 29e9b23cb..4fe5313e8 100644
--- a/provisioner/salt-masterless/provisioner.hcl2spec.go
+++ b/provisioner/salt-masterless/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -49,6 +50,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/salt-masterless/version/version.go b/provisioner/salt-masterless/version/version.go
new file mode 100644
index 000000000..293f242af
--- /dev/null
+++ b/provisioner/salt-masterless/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var SaltPluginVersion *version.PluginVersion
+
+func init() {
+	SaltPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/shell-local/provisioner.go b/provisioner/shell-local/provisioner.go
index 991c94cea..566e4e344 100644
--- a/provisioner/shell-local/provisioner.go
+++ b/provisioner/shell-local/provisioner.go
@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	sl "github.com/hashicorp/packer/common/shell-local"
 	"github.com/hashicorp/packer/packer"
+	sl "github.com/hashicorp/packer/packer-plugin-sdk/shell-local"
 )
 
 type Provisioner struct {
diff --git a/provisioner/shell-local/version/version.go b/provisioner/shell-local/version/version.go
new file mode 100644
index 000000000..516b8705d
--- /dev/null
+++ b/provisioner/shell-local/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ShellLocalProvisionerVersion *version.PluginVersion
+
+func init() {
+	ShellLocalProvisionerVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/shell/provisioner.go b/provisioner/shell/provisioner.go
index b66a6d793..4d6cd376f 100644
--- a/provisioner/shell/provisioner.go
+++ b/provisioner/shell/provisioner.go
@@ -18,13 +18,13 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 type Config struct {
@@ -418,15 +418,15 @@ func (p *Provisioner) escapeEnvVars() ([]string, map[string]string) {
 
 	// expose ip address variables
 	httpAddr := p.generatedData["PackerHTTPAddr"]
-	if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented {
+	if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented {
 		envVars["PACKER_HTTP_ADDR"] = httpAddr.(string)
 	}
 	httpIP := p.generatedData["PackerHTTPIP"]
-	if httpIP != nil && httpIP != common.HttpIPNotImplemented {
+	if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented {
 		envVars["PACKER_HTTP_IP"] = httpIP.(string)
 	}
 	httpPort := p.generatedData["PackerHTTPPort"]
-	if httpPort != nil && httpPort != common.HttpPortNotImplemented {
+	if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented {
 		envVars["PACKER_HTTP_PORT"] = httpPort.(string)
 	}
 
diff --git a/provisioner/shell/provisioner.hcl2spec.go b/provisioner/shell/provisioner.hcl2spec.go
index 36c6175e2..1609f541c 100644
--- a/provisioner/shell/provisioner.hcl2spec.go
+++ b/provisioner/shell/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -49,6 +50,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/shell/provisioner_test.go b/provisioner/shell/provisioner_test.go
index e4e05e699..8f88bcc53 100644
--- a/provisioner/shell/provisioner_test.go
+++ b/provisioner/shell/provisioner_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 func testConfig() map[string]interface{} {
@@ -563,8 +563,8 @@ func TestProvisionerRemotePathDefaultsSuccessfully(t *testing.T) {
 
 func generatedData() map[string]interface{} {
 	return map[string]interface{}{
-		"PackerHTTPAddr": common.HttpAddrNotImplemented,
-		"PackerHTTPIP":   common.HttpIPNotImplemented,
-		"PackerHTTPPort": common.HttpPortNotImplemented,
+		"PackerHTTPAddr": commonsteps.HttpAddrNotImplemented,
+		"PackerHTTPIP":   commonsteps.HttpIPNotImplemented,
+		"PackerHTTPPort": commonsteps.HttpPortNotImplemented,
 	}
 }
diff --git a/provisioner/shell/version/version.go b/provisioner/shell/version/version.go
new file mode 100644
index 000000000..3e8d08e67
--- /dev/null
+++ b/provisioner/shell/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var ShellPluginVersion *version.PluginVersion
+
+func init() {
+	ShellPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/sleep/provisioner.go b/provisioner/sleep/provisioner.go
index f3414c961..e530e4761 100644
--- a/provisioner/sleep/provisioner.go
+++ b/provisioner/sleep/provisioner.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
 )
 
 type Provisioner struct {
diff --git a/provisioner/sleep/version/version.go b/provisioner/sleep/version/version.go
new file mode 100644
index 000000000..cf8c1640e
--- /dev/null
+++ b/provisioner/sleep/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var SleepProvisionerVersion *version.PluginVersion
+
+func init() {
+	SleepProvisionerVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/windows-restart/provisioner.go b/provisioner/windows-restart/provisioner.go
index 8fc800ed8..a14603b63 100644
--- a/provisioner/windows-restart/provisioner.go
+++ b/provisioner/windows-restart/provisioner.go
@@ -14,11 +14,11 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
 	"github.com/masterzen/winrm"
 )
 
diff --git a/provisioner/windows-restart/provisioner.hcl2spec.go b/provisioner/windows-restart/provisioner.hcl2spec.go
index 3dce6445e..ad6434b2c 100644
--- a/provisioner/windows-restart/provisioner.hcl2spec.go
+++ b/provisioner/windows-restart/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -37,6 +38,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/windows-restart/version/version.go b/provisioner/windows-restart/version/version.go
new file mode 100644
index 000000000..385f8b31d
--- /dev/null
+++ b/provisioner/windows-restart/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var WindowsRestartPluginVersion *version.PluginVersion
+
+func init() {
+	WindowsRestartPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/provisioner/windows-shell/provisioner.go b/provisioner/windows-shell/provisioner.go
index e081c7151..25db70ef2 100644
--- a/provisioner/windows-shell/provisioner.go
+++ b/provisioner/windows-shell/provisioner.go
@@ -16,13 +16,13 @@ import (
 	"time"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/retry"
-	"github.com/hashicorp/packer/common/shell"
-	"github.com/hashicorp/packer/helper/config"
 	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/packer/tmp"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer/packer-plugin-sdk/retry"
+	"github.com/hashicorp/packer/packer-plugin-sdk/shell"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer/packer-plugin-sdk/template/interpolate"
+	"github.com/hashicorp/packer/packer-plugin-sdk/tmp"
 )
 
 //FIXME query remote host or use %SYSTEMROOT%, %TEMP% and more creative filename
@@ -241,15 +241,15 @@ func (p *Provisioner) createFlattenedEnvVars() (flattened string) {
 
 	// expose ip address variables
 	httpAddr := p.generatedData["PackerHTTPAddr"]
-	if httpAddr != nil && httpAddr != common.HttpAddrNotImplemented {
+	if httpAddr != nil && httpAddr != commonsteps.HttpAddrNotImplemented {
 		envVars["PACKER_HTTP_ADDR"] = httpAddr.(string)
 	}
 	httpIP := p.generatedData["PackerHTTPIP"]
-	if httpIP != nil && httpIP != common.HttpIPNotImplemented {
+	if httpIP != nil && httpIP != commonsteps.HttpIPNotImplemented {
 		envVars["PACKER_HTTP_IP"] = httpIP.(string)
 	}
 	httpPort := p.generatedData["PackerHTTPPort"]
-	if httpPort != nil && httpPort != common.HttpPortNotImplemented {
+	if httpPort != nil && httpPort != commonsteps.HttpPortNotImplemented {
 		envVars["PACKER_HTTP_PORT"] = httpPort.(string)
 	}
 
diff --git a/provisioner/windows-shell/provisioner.hcl2spec.go b/provisioner/windows-shell/provisioner.hcl2spec.go
index 309d25a48..49510297e 100644
--- a/provisioner/windows-shell/provisioner.hcl2spec.go
+++ b/provisioner/windows-shell/provisioner.hcl2spec.go
@@ -11,6 +11,7 @@ import (
 type FlatConfig struct {
 	PackerBuildName     *string           `mapstructure:"packer_build_name" cty:"packer_build_name" hcl:"packer_build_name"`
 	PackerBuilderType   *string           `mapstructure:"packer_builder_type" cty:"packer_builder_type" hcl:"packer_builder_type"`
+	PackerCoreVersion   *string           `mapstructure:"packer_core_version" cty:"packer_core_version" hcl:"packer_core_version"`
 	PackerDebug         *bool             `mapstructure:"packer_debug" cty:"packer_debug" hcl:"packer_debug"`
 	PackerForce         *bool             `mapstructure:"packer_force" cty:"packer_force" hcl:"packer_force"`
 	PackerOnError       *string           `mapstructure:"packer_on_error" cty:"packer_on_error" hcl:"packer_on_error"`
@@ -42,6 +43,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 	s := map[string]hcldec.Spec{
 		"packer_build_name":          &hcldec.AttrSpec{Name: "packer_build_name", Type: cty.String, Required: false},
 		"packer_builder_type":        &hcldec.AttrSpec{Name: "packer_builder_type", Type: cty.String, Required: false},
+		"packer_core_version":        &hcldec.AttrSpec{Name: "packer_core_version", Type: cty.String, Required: false},
 		"packer_debug":               &hcldec.AttrSpec{Name: "packer_debug", Type: cty.Bool, Required: false},
 		"packer_force":               &hcldec.AttrSpec{Name: "packer_force", Type: cty.Bool, Required: false},
 		"packer_on_error":            &hcldec.AttrSpec{Name: "packer_on_error", Type: cty.String, Required: false},
diff --git a/provisioner/windows-shell/provisioner_test.go b/provisioner/windows-shell/provisioner_test.go
index 4fb65ac3f..1e33eb639 100644
--- a/provisioner/windows-shell/provisioner_test.go
+++ b/provisioner/windows-shell/provisioner_test.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/hashicorp/packer/common"
 	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer/packer-plugin-sdk/multistep/commonsteps"
 )
 
 func testConfig() map[string]interface{} {
@@ -433,8 +433,8 @@ func TestCancel(t *testing.T) {
 }
 func generatedData() map[string]interface{} {
 	return map[string]interface{}{
-		"PackerHTTPAddr": common.HttpAddrNotImplemented,
-		"PackerHTTPIP":   common.HttpIPNotImplemented,
-		"PackerHTTPPort": common.HttpPortNotImplemented,
+		"PackerHTTPAddr": commonsteps.HttpAddrNotImplemented,
+		"PackerHTTPIP":   commonsteps.HttpIPNotImplemented,
+		"PackerHTTPPort": commonsteps.HttpPortNotImplemented,
 	}
 }
diff --git a/provisioner/windows-shell/version/version.go b/provisioner/windows-shell/version/version.go
new file mode 100644
index 000000000..8b41e03ad
--- /dev/null
+++ b/provisioner/windows-shell/version/version.go
@@ -0,0 +1,13 @@
+package version
+
+import (
+	"github.com/hashicorp/packer/packer-plugin-sdk/version"
+	packerVersion "github.com/hashicorp/packer/version"
+)
+
+var WindowsShellPluginVersion *version.PluginVersion
+
+func init() {
+	WindowsShellPluginVersion = version.InitializePluginVersion(
+		packerVersion.Version, packerVersion.VersionPrerelease)
+}
diff --git a/vendor/golang.org/x/net/html/const.go b/vendor/golang.org/x/net/html/const.go
index 73804d347..ff7acf2d5 100644
--- a/vendor/golang.org/x/net/html/const.go
+++ b/vendor/golang.org/x/net/html/const.go
@@ -52,7 +52,7 @@ var isSpecialElementMap = map[string]bool{
 	"iframe":     true,
 	"img":        true,
 	"input":      true,
-	"keygen":     true,
+	"keygen":     true, // "keygen" has been removed from the spec, but are kept here for backwards compatibility.
 	"li":         true,
 	"link":       true,
 	"listing":    true,
diff --git a/vendor/golang.org/x/net/html/foreign.go b/vendor/golang.org/x/net/html/foreign.go
index 74774c458..9da9e9dc4 100644
--- a/vendor/golang.org/x/net/html/foreign.go
+++ b/vendor/golang.org/x/net/html/foreign.go
@@ -161,65 +161,62 @@ var mathMLAttributeAdjustments = map[string]string{
 }
 
 var svgAttributeAdjustments = map[string]string{
-	"attributename":             "attributeName",
-	"attributetype":             "attributeType",
-	"basefrequency":             "baseFrequency",
-	"baseprofile":               "baseProfile",
-	"calcmode":                  "calcMode",
-	"clippathunits":             "clipPathUnits",
-	"contentscripttype":         "contentScriptType",
-	"contentstyletype":          "contentStyleType",
-	"diffuseconstant":           "diffuseConstant",
-	"edgemode":                  "edgeMode",
-	"externalresourcesrequired": "externalResourcesRequired",
-	"filterunits":               "filterUnits",
-	"glyphref":                  "glyphRef",
-	"gradienttransform":         "gradientTransform",
-	"gradientunits":             "gradientUnits",
-	"kernelmatrix":              "kernelMatrix",
-	"kernelunitlength":          "kernelUnitLength",
-	"keypoints":                 "keyPoints",
-	"keysplines":                "keySplines",
-	"keytimes":                  "keyTimes",
-	"lengthadjust":              "lengthAdjust",
-	"limitingconeangle":         "limitingConeAngle",
-	"markerheight":              "markerHeight",
-	"markerunits":               "markerUnits",
-	"markerwidth":               "markerWidth",
-	"maskcontentunits":          "maskContentUnits",
-	"maskunits":                 "maskUnits",
-	"numoctaves":                "numOctaves",
-	"pathlength":                "pathLength",
-	"patterncontentunits":       "patternContentUnits",
-	"patterntransform":          "patternTransform",
-	"patternunits":              "patternUnits",
-	"pointsatx":                 "pointsAtX",
-	"pointsaty":                 "pointsAtY",
-	"pointsatz":                 "pointsAtZ",
-	"preservealpha":             "preserveAlpha",
-	"preserveaspectratio":       "preserveAspectRatio",
-	"primitiveunits":            "primitiveUnits",
-	"refx":                      "refX",
-	"refy":                      "refY",
-	"repeatcount":               "repeatCount",
-	"repeatdur":                 "repeatDur",
-	"requiredextensions":        "requiredExtensions",
-	"requiredfeatures":          "requiredFeatures",
-	"specularconstant":          "specularConstant",
-	"specularexponent":          "specularExponent",
-	"spreadmethod":              "spreadMethod",
-	"startoffset":               "startOffset",
-	"stddeviation":              "stdDeviation",
-	"stitchtiles":               "stitchTiles",
-	"surfacescale":              "surfaceScale",
-	"systemlanguage":            "systemLanguage",
-	"tablevalues":               "tableValues",
-	"targetx":                   "targetX",
-	"targety":                   "targetY",
-	"textlength":                "textLength",
-	"viewbox":                   "viewBox",
-	"viewtarget":                "viewTarget",
-	"xchannelselector":          "xChannelSelector",
-	"ychannelselector":          "yChannelSelector",
-	"zoomandpan":                "zoomAndPan",
+	"attributename":       "attributeName",
+	"attributetype":       "attributeType",
+	"basefrequency":       "baseFrequency",
+	"baseprofile":         "baseProfile",
+	"calcmode":            "calcMode",
+	"clippathunits":       "clipPathUnits",
+	"diffuseconstant":     "diffuseConstant",
+	"edgemode":            "edgeMode",
+	"filterunits":         "filterUnits",
+	"glyphref":            "glyphRef",
+	"gradienttransform":   "gradientTransform",
+	"gradientunits":       "gradientUnits",
+	"kernelmatrix":        "kernelMatrix",
+	"kernelunitlength":    "kernelUnitLength",
+	"keypoints":           "keyPoints",
+	"keysplines":          "keySplines",
+	"keytimes":            "keyTimes",
+	"lengthadjust":        "lengthAdjust",
+	"limitingconeangle":   "limitingConeAngle",
+	"markerheight":        "markerHeight",
+	"markerunits":         "markerUnits",
+	"markerwidth":         "markerWidth",
+	"maskcontentunits":    "maskContentUnits",
+	"maskunits":           "maskUnits",
+	"numoctaves":          "numOctaves",
+	"pathlength":          "pathLength",
+	"patterncontentunits": "patternContentUnits",
+	"patterntransform":    "patternTransform",
+	"patternunits":        "patternUnits",
+	"pointsatx":           "pointsAtX",
+	"pointsaty":           "pointsAtY",
+	"pointsatz":           "pointsAtZ",
+	"preservealpha":       "preserveAlpha",
+	"preserveaspectratio": "preserveAspectRatio",
+	"primitiveunits":      "primitiveUnits",
+	"refx":                "refX",
+	"refy":                "refY",
+	"repeatcount":         "repeatCount",
+	"repeatdur":           "repeatDur",
+	"requiredextensions":  "requiredExtensions",
+	"requiredfeatures":    "requiredFeatures",
+	"specularconstant":    "specularConstant",
+	"specularexponent":    "specularExponent",
+	"spreadmethod":        "spreadMethod",
+	"startoffset":         "startOffset",
+	"stddeviation":        "stdDeviation",
+	"stitchtiles":         "stitchTiles",
+	"surfacescale":        "surfaceScale",
+	"systemlanguage":      "systemLanguage",
+	"tablevalues":         "tableValues",
+	"targetx":             "targetX",
+	"targety":             "targetY",
+	"textlength":          "textLength",
+	"viewbox":             "viewBox",
+	"viewtarget":          "viewTarget",
+	"xchannelselector":    "xChannelSelector",
+	"ychannelselector":    "yChannelSelector",
+	"zoomandpan":          "zoomAndPan",
 }
diff --git a/vendor/golang.org/x/net/html/render.go b/vendor/golang.org/x/net/html/render.go
index 46879c083..b46d81ca6 100644
--- a/vendor/golang.org/x/net/html/render.go
+++ b/vendor/golang.org/x/net/html/render.go
@@ -263,7 +263,7 @@ var voidElements = map[string]bool{
 	"hr":     true,
 	"img":    true,
 	"input":  true,
-	"keygen": true,
+	"keygen": true, // "keygen" has been removed from the spec, but are kept here for backwards compatibility.
 	"link":   true,
 	"meta":   true,
 	"param":  true,
diff --git a/vendor/golang.org/x/net/http/httpproxy/proxy.go b/vendor/golang.org/x/net/http/httpproxy/proxy.go
index 163645b86..1415b0779 100644
--- a/vendor/golang.org/x/net/http/httpproxy/proxy.go
+++ b/vendor/golang.org/x/net/http/httpproxy/proxy.go
@@ -27,8 +27,7 @@ import (
 type Config struct {
 	// HTTPProxy represents the value of the HTTP_PROXY or
 	// http_proxy environment variable. It will be used as the proxy
-	// URL for HTTP requests and HTTPS requests unless overridden by
-	// HTTPSProxy or NoProxy.
+	// URL for HTTP requests unless overridden by NoProxy.
 	HTTPProxy string
 
 	// HTTPSProxy represents the HTTPS_PROXY or https_proxy
@@ -129,8 +128,7 @@ func (cfg *config) proxyForURL(reqURL *url.URL) (*url.URL, error) {
 	var proxy *url.URL
 	if reqURL.Scheme == "https" {
 		proxy = cfg.httpsProxy
-	}
-	if proxy == nil {
+	} else if reqURL.Scheme == "http" {
 		proxy = cfg.httpProxy
 		if proxy != nil && cfg.CGI {
 			return nil, errors.New("refusing to use HTTP_PROXY value in CGI environment; see golang.org/s/cgihttpproxy")
diff --git a/vendor/golang.org/x/net/http2/server.go b/vendor/golang.org/x/net/http2/server.go
index 02714ade6..2aa859f76 100644
--- a/vendor/golang.org/x/net/http2/server.go
+++ b/vendor/golang.org/x/net/http2/server.go
@@ -1694,6 +1694,7 @@ func (sc *serverConn) processData(f *DataFrame) error {
 		if len(data) > 0 {
 			wrote, err := st.body.Write(data)
 			if err != nil {
+				sc.sendWindowUpdate(nil, int(f.Length)-wrote)
 				return streamError(id, ErrCodeStreamClosed)
 			}
 			if wrote != len(data) {
diff --git a/vendor/golang.org/x/net/http2/transport.go b/vendor/golang.org/x/net/http2/transport.go
index 4ec326699..4182f52b4 100644
--- a/vendor/golang.org/x/net/http2/transport.go
+++ b/vendor/golang.org/x/net/http2/transport.go
@@ -689,6 +689,7 @@ func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, erro
 	cc.inflow.add(transportDefaultConnFlow + initialWindowSize)
 	cc.bw.Flush()
 	if cc.werr != nil {
+		cc.Close()
 		return nil, cc.werr
 	}
 
@@ -1080,6 +1081,15 @@ func (cc *ClientConn) roundTrip(req *http.Request) (res *http.Response, gotErrAf
 	bodyWriter := cc.t.getBodyWriterState(cs, body)
 	cs.on100 = bodyWriter.on100
 
+	defer func() {
+		cc.wmu.Lock()
+		werr := cc.werr
+		cc.wmu.Unlock()
+		if werr != nil {
+			cc.Close()
+		}
+	}()
+
 	cc.wmu.Lock()
 	endStream := !hasBody && !hasTrailers
 	werr := cc.writeHeaders(cs.ID, endStream, int(cc.maxFrameSize), hdrs)
diff --git a/vendor/golang.org/x/sys/cpu/cpu.go b/vendor/golang.org/x/sys/cpu/cpu.go
index 5cce25ed9..f77701fe8 100644
--- a/vendor/golang.org/x/sys/cpu/cpu.go
+++ b/vendor/golang.org/x/sys/cpu/cpu.go
@@ -29,26 +29,46 @@ type CacheLinePad struct{ _ [cacheLineSize]byte }
 // and HasAVX2 are only set if the OS supports XMM and YMM
 // registers in addition to the CPUID feature bit being set.
 var X86 struct {
-	_            CacheLinePad
-	HasAES       bool // AES hardware implementation (AES NI)
-	HasADX       bool // Multi-precision add-carry instruction extensions
-	HasAVX       bool // Advanced vector extension
-	HasAVX2      bool // Advanced vector extension 2
-	HasBMI1      bool // Bit manipulation instruction set 1
-	HasBMI2      bool // Bit manipulation instruction set 2
-	HasERMS      bool // Enhanced REP for MOVSB and STOSB
-	HasFMA       bool // Fused-multiply-add instructions
-	HasOSXSAVE   bool // OS supports XSAVE/XRESTOR for saving/restoring XMM registers.
-	HasPCLMULQDQ bool // PCLMULQDQ instruction - most often used for AES-GCM
-	HasPOPCNT    bool // Hamming weight instruction POPCNT.
-	HasRDRAND    bool // RDRAND instruction (on-chip random number generator)
-	HasRDSEED    bool // RDSEED instruction (on-chip random number generator)
-	HasSSE2      bool // Streaming SIMD extension 2 (always available on amd64)
-	HasSSE3      bool // Streaming SIMD extension 3
-	HasSSSE3     bool // Supplemental streaming SIMD extension 3
-	HasSSE41     bool // Streaming SIMD extension 4 and 4.1
-	HasSSE42     bool // Streaming SIMD extension 4 and 4.2
-	_            CacheLinePad
+	_                   CacheLinePad
+	HasAES              bool // AES hardware implementation (AES NI)
+	HasADX              bool // Multi-precision add-carry instruction extensions
+	HasAVX              bool // Advanced vector extension
+	HasAVX2             bool // Advanced vector extension 2
+	HasAVX512           bool // Advanced vector extension 512
+	HasAVX512F          bool // Advanced vector extension 512 Foundation Instructions
+	HasAVX512CD         bool // Advanced vector extension 512 Conflict Detection Instructions
+	HasAVX512ER         bool // Advanced vector extension 512 Exponential and Reciprocal Instructions
+	HasAVX512PF         bool // Advanced vector extension 512 Prefetch Instructions Instructions
+	HasAVX512VL         bool // Advanced vector extension 512 Vector Length Extensions
+	HasAVX512BW         bool // Advanced vector extension 512 Byte and Word Instructions
+	HasAVX512DQ         bool // Advanced vector extension 512 Doubleword and Quadword Instructions
+	HasAVX512IFMA       bool // Advanced vector extension 512 Integer Fused Multiply Add
+	HasAVX512VBMI       bool // Advanced vector extension 512 Vector Byte Manipulation Instructions
+	HasAVX5124VNNIW     bool // Advanced vector extension 512 Vector Neural Network Instructions Word variable precision
+	HasAVX5124FMAPS     bool // Advanced vector extension 512 Fused Multiply Accumulation Packed Single precision
+	HasAVX512VPOPCNTDQ  bool // Advanced vector extension 512 Double and quad word population count instructions
+	HasAVX512VPCLMULQDQ bool // Advanced vector extension 512 Vector carry-less multiply operations
+	HasAVX512VNNI       bool // Advanced vector extension 512 Vector Neural Network Instructions
+	HasAVX512GFNI       bool // Advanced vector extension 512 Galois field New Instructions
+	HasAVX512VAES       bool // Advanced vector extension 512 Vector AES instructions
+	HasAVX512VBMI2      bool // Advanced vector extension 512 Vector Byte Manipulation Instructions 2
+	HasAVX512BITALG     bool // Advanced vector extension 512 Bit Algorithms
+	HasAVX512BF16       bool // Advanced vector extension 512 BFloat16 Instructions
+	HasBMI1             bool // Bit manipulation instruction set 1
+	HasBMI2             bool // Bit manipulation instruction set 2
+	HasERMS             bool // Enhanced REP for MOVSB and STOSB
+	HasFMA              bool // Fused-multiply-add instructions
+	HasOSXSAVE          bool // OS supports XSAVE/XRESTOR for saving/restoring XMM registers.
+	HasPCLMULQDQ        bool // PCLMULQDQ instruction - most often used for AES-GCM
+	HasPOPCNT           bool // Hamming weight instruction POPCNT.
+	HasRDRAND           bool // RDRAND instruction (on-chip random number generator)
+	HasRDSEED           bool // RDSEED instruction (on-chip random number generator)
+	HasSSE2             bool // Streaming SIMD extension 2 (always available on amd64)
+	HasSSE3             bool // Streaming SIMD extension 3
+	HasSSSE3            bool // Supplemental streaming SIMD extension 3
+	HasSSE41            bool // Streaming SIMD extension 4 and 4.1
+	HasSSE42            bool // Streaming SIMD extension 4 and 4.2
+	_                   CacheLinePad
 }
 
 // ARM64 contains the supported CPU features of the
diff --git a/vendor/golang.org/x/sys/cpu/cpu_arm64.go b/vendor/golang.org/x/sys/cpu/cpu_arm64.go
index 2d9002438..951078f2e 100644
--- a/vendor/golang.org/x/sys/cpu/cpu_arm64.go
+++ b/vendor/golang.org/x/sys/cpu/cpu_arm64.go
@@ -39,7 +39,7 @@ func initOptions() {
 
 func archInit() {
 	switch runtime.GOOS {
-	case "android", "darwin", "netbsd":
+	case "android", "darwin", "ios", "netbsd":
 		// Android and iOS don't seem to allow reading these registers.
 		//
 		// NetBSD:
diff --git a/vendor/golang.org/x/sys/cpu/cpu_x86.go b/vendor/golang.org/x/sys/cpu/cpu_x86.go
index 2ad039d40..48d429331 100644
--- a/vendor/golang.org/x/sys/cpu/cpu_x86.go
+++ b/vendor/golang.org/x/sys/cpu/cpu_x86.go
@@ -16,6 +16,26 @@ func initOptions() {
 		{Name: "aes", Feature: &X86.HasAES},
 		{Name: "avx", Feature: &X86.HasAVX},
 		{Name: "avx2", Feature: &X86.HasAVX2},
+		{Name: "avx512", Feature: &X86.HasAVX512},
+		{Name: "avx512f", Feature: &X86.HasAVX512F},
+		{Name: "avx512cd", Feature: &X86.HasAVX512CD},
+		{Name: "avx512er", Feature: &X86.HasAVX512ER},
+		{Name: "avx512pf", Feature: &X86.HasAVX512PF},
+		{Name: "avx512vl", Feature: &X86.HasAVX512VL},
+		{Name: "avx512bw", Feature: &X86.HasAVX512BW},
+		{Name: "avx512dq", Feature: &X86.HasAVX512DQ},
+		{Name: "avx512ifma", Feature: &X86.HasAVX512IFMA},
+		{Name: "avx512vbmi", Feature: &X86.HasAVX512VBMI},
+		{Name: "avx512vnniw", Feature: &X86.HasAVX5124VNNIW},
+		{Name: "avx5124fmaps", Feature: &X86.HasAVX5124FMAPS},
+		{Name: "avx512vpopcntdq", Feature: &X86.HasAVX512VPOPCNTDQ},
+		{Name: "avx512vpclmulqdq", Feature: &X86.HasAVX512VPCLMULQDQ},
+		{Name: "avx512vnni", Feature: &X86.HasAVX512VNNI},
+		{Name: "avx512gfni", Feature: &X86.HasAVX512GFNI},
+		{Name: "avx512vaes", Feature: &X86.HasAVX512VAES},
+		{Name: "avx512vbmi2", Feature: &X86.HasAVX512VBMI2},
+		{Name: "avx512bitalg", Feature: &X86.HasAVX512BITALG},
+		{Name: "avx512bf16", Feature: &X86.HasAVX512BF16},
 		{Name: "bmi1", Feature: &X86.HasBMI1},
 		{Name: "bmi2", Feature: &X86.HasBMI2},
 		{Name: "erms", Feature: &X86.HasERMS},
@@ -59,12 +79,15 @@ func archInit() {
 	X86.HasOSXSAVE = isSet(27, ecx1)
 	X86.HasRDRAND = isSet(30, ecx1)
 
-	osSupportsAVX := false
+	var osSupportsAVX, osSupportsAVX512 bool
 	// For XGETBV, OSXSAVE bit is required and sufficient.
 	if X86.HasOSXSAVE {
 		eax, _ := xgetbv()
 		// Check if XMM and YMM registers have OS support.
 		osSupportsAVX = isSet(1, eax) && isSet(2, eax)
+
+		// Check if OPMASK and ZMM registers have OS support.
+		osSupportsAVX512 = osSupportsAVX && isSet(5, eax) && isSet(6, eax) && isSet(7, eax)
 	}
 
 	X86.HasAVX = isSet(28, ecx1) && osSupportsAVX
@@ -73,7 +96,7 @@ func archInit() {
 		return
 	}
 
-	_, ebx7, _, _ := cpuid(7, 0)
+	_, ebx7, ecx7, edx7 := cpuid(7, 0)
 	X86.HasBMI1 = isSet(3, ebx7)
 	X86.HasAVX2 = isSet(5, ebx7) && osSupportsAVX
 	X86.HasBMI2 = isSet(8, ebx7)
@@ -81,6 +104,30 @@ func archInit() {
 	X86.HasRDSEED = isSet(18, ebx7)
 	X86.HasADX = isSet(19, ebx7)
 
+	X86.HasAVX512 = isSet(16, ebx7) && osSupportsAVX512 // Because avx-512 foundation is the core required extension
+	if X86.HasAVX512 {
+		X86.HasAVX512F = true
+		X86.HasAVX512CD = isSet(28, ebx7)
+		X86.HasAVX512ER = isSet(27, ebx7)
+		X86.HasAVX512PF = isSet(26, ebx7)
+		X86.HasAVX512VL = isSet(31, ebx7)
+		X86.HasAVX512BW = isSet(30, ebx7)
+		X86.HasAVX512DQ = isSet(17, ebx7)
+		X86.HasAVX512IFMA = isSet(21, ebx7)
+		X86.HasAVX512VBMI = isSet(1, ecx7)
+		X86.HasAVX5124VNNIW = isSet(2, edx7)
+		X86.HasAVX5124FMAPS = isSet(3, edx7)
+		X86.HasAVX512VPOPCNTDQ = isSet(14, ecx7)
+		X86.HasAVX512VPCLMULQDQ = isSet(10, ecx7)
+		X86.HasAVX512VNNI = isSet(11, ecx7)
+		X86.HasAVX512GFNI = isSet(8, ecx7)
+		X86.HasAVX512VAES = isSet(9, ecx7)
+		X86.HasAVX512VBMI2 = isSet(6, ecx7)
+		X86.HasAVX512BITALG = isSet(12, ecx7)
+
+		eax71, _, _, _ := cpuid(7, 1)
+		X86.HasAVX512BF16 = isSet(5, eax71)
+	}
 }
 
 func isSet(bitpos uint, value uint32) bool {
diff --git a/vendor/golang.org/x/sys/unix/gccgo.go b/vendor/golang.org/x/sys/unix/gccgo.go
index cd6f5a613..86032c11e 100644
--- a/vendor/golang.org/x/sys/unix/gccgo.go
+++ b/vendor/golang.org/x/sys/unix/gccgo.go
@@ -12,10 +12,8 @@ import "syscall"
 // We can't use the gc-syntax .s files for gccgo. On the plus side
 // much of the functionality can be written directly in Go.
 
-//extern gccgoRealSyscallNoError
 func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr)
 
-//extern gccgoRealSyscall
 func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
 
 func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
diff --git a/vendor/golang.org/x/sys/unix/gccgo_c.c b/vendor/golang.org/x/sys/unix/gccgo_c.c
index c44730c5e..2cb1fefac 100644
--- a/vendor/golang.org/x/sys/unix/gccgo_c.c
+++ b/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -21,6 +21,9 @@ struct ret {
 	uintptr_t err;
 };
 
+struct ret gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+  __asm__(GOSYM_PREFIX GOPKGPATH ".realSyscall");
+
 struct ret
 gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
 {
@@ -32,6 +35,9 @@ gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintp
 	return r;
 }
 
+uintptr_t gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+  __asm__(GOSYM_PREFIX GOPKGPATH ".realSyscallNoError");
+
 uintptr_t
 gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
 {
diff --git a/vendor/golang.org/x/sys/unix/mkerrors.sh b/vendor/golang.org/x/sys/unix/mkerrors.sh
index e7c51aa40..1bef7148d 100644
--- a/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ b/vendor/golang.org/x/sys/unix/mkerrors.sh
@@ -517,6 +517,7 @@ ccflags="$@"
 		$2 ~ /^CP_/ ||
 		$2 ~ /^CPUSTATES$/ ||
 		$2 ~ /^ALG_/ ||
+		$2 ~ /^FI(CLONE|DEDUPERANGE)/ ||
 		$2 ~ /^FS_(POLICY_FLAGS|KEY_DESC|ENCRYPTION_MODE|[A-Z0-9_]+_KEY_SIZE)/ ||
 		$2 ~ /^FS_IOC_.*(ENCRYPTION|VERITY|[GS]ETFLAGS)/ ||
 		$2 ~ /^FS_VERITY_/ ||
diff --git a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
index 7d08dae5b..57a0021da 100644
--- a/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
+++ b/vendor/golang.org/x/sys/unix/sockcmsg_unix_other.go
@@ -20,7 +20,7 @@ func cmsgAlignOf(salen int) int {
 	case "aix":
 		// There is no alignment on AIX.
 		salign = 1
-	case "darwin", "illumos", "solaris":
+	case "darwin", "ios", "illumos", "solaris":
 		// NOTE: It seems like 64-bit Darwin, Illumos and Solaris
 		// kernels still require 32-bit aligned access to network
 		// subsystem.
@@ -32,6 +32,10 @@ func cmsgAlignOf(salen int) int {
 		if runtime.GOARCH == "arm" {
 			salign = 8
 		}
+		// NetBSD aarch64 requires 128-bit alignment.
+		if runtime.GOOS == "netbsd" && runtime.GOARCH == "arm64" {
+			salign = 16
+		}
 	}
 
 	return (salen + salign - 1) & ^(salign - 1)
diff --git a/vendor/golang.org/x/sys/unix/syscall_bsd.go b/vendor/golang.org/x/sys/unix/syscall_bsd.go
index 60bbe10ad..123536a02 100644
--- a/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -18,6 +18,21 @@ import (
 	"unsafe"
 )
 
+const ImplementsGetwd = true
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
 /*
  * Wrapped
  */
@@ -272,7 +287,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	if err != nil {
 		return
 	}
-	if runtime.GOOS == "darwin" && len == 0 {
+	if (runtime.GOOS == "darwin" || runtime.GOOS == "ios") && len == 0 {
 		// Accepted socket has no address.
 		// This is likely due to a bug in xnu kernels,
 		// where instead of ECONNABORTED error socket
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.go b/vendor/golang.org/x/sys/unix/syscall_darwin.go
index eddcf3a91..21b8092cd 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -13,29 +13,10 @@
 package unix
 
 import (
-	"errors"
 	"syscall"
 	"unsafe"
 )
 
-const ImplementsGetwd = true
-
-func Getwd() (string, error) {
-	buf := make([]byte, 2048)
-	attrs, err := getAttrList(".", attrList{CommonAttr: attrCmnFullpath}, buf, 0)
-	if err == nil && len(attrs) == 1 && len(attrs[0]) >= 2 {
-		wd := string(attrs[0])
-		// Sanity check that it's an absolute path and ends
-		// in a null byte, which we then strip.
-		if wd[0] == '/' && wd[len(wd)-1] == 0 {
-			return wd[:len(wd)-1], nil
-		}
-	}
-	// If pkg/os/getwd.go gets ENOTSUP, it will fall back to the
-	// slow algorithm.
-	return "", ENOTSUP
-}
-
 // SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
@@ -97,11 +78,6 @@ func direntNamlen(buf []byte) (uint64, bool) {
 func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
 func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
 
-const (
-	attrBitMapCount = 5
-	attrCmnFullpath = 0x08000000
-)
-
 type attrList struct {
 	bitmapCount uint16
 	_           uint16
@@ -112,54 +88,6 @@ type attrList struct {
 	Forkattr    uint32
 }
 
-func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) {
-	if len(attrBuf) < 4 {
-		return nil, errors.New("attrBuf too small")
-	}
-	attrList.bitmapCount = attrBitMapCount
-
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := getattrlist(_p0, unsafe.Pointer(&attrList), unsafe.Pointer(&attrBuf[0]), uintptr(len(attrBuf)), int(options)); err != nil {
-		return nil, err
-	}
-	size := *(*uint32)(unsafe.Pointer(&attrBuf[0]))
-
-	// dat is the section of attrBuf that contains valid data,
-	// without the 4 byte length header. All attribute offsets
-	// are relative to dat.
-	dat := attrBuf
-	if int(size) < len(attrBuf) {
-		dat = dat[:size]
-	}
-	dat = dat[4:] // remove length prefix
-
-	for i := uint32(0); int(i) < len(dat); {
-		header := dat[i:]
-		if len(header) < 8 {
-			return attrs, errors.New("truncated attribute header")
-		}
-		datOff := *(*int32)(unsafe.Pointer(&header[0]))
-		attrLen := *(*uint32)(unsafe.Pointer(&header[4]))
-		if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) {
-			return attrs, errors.New("truncated results; attrBuf too small")
-		}
-		end := uint32(datOff) + attrLen
-		attrs = append(attrs, dat[datOff:end])
-		i = end
-		if r := i % 4; r != 0 {
-			i += (4 - r)
-		}
-	}
-	return
-}
-
-//sys getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error)
-
 //sysnb pipe() (r int, w int, err error)
 
 func Pipe(p []int) (err error) {
@@ -419,6 +347,7 @@ func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getcwd(buf []byte) (n int, err error)
 //sys	Getdtablesize() (size int)
 //sysnb	Getegid() (egid int)
 //sysnb	Geteuid() (uid int)
diff --git a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index 8a195ae58..bed7dcfec 100644
--- a/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -129,23 +129,8 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
-const ImplementsGetwd = true
-
 //sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
 
-func Getwd() (string, error) {
-	var buf [PathMax]byte
-	_, err := Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	n := clen(buf[:])
-	if n < 1 {
-		return "", EINVAL
-	}
-	return string(buf[:n]), nil
-}
-
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	var bufsize uintptr
diff --git a/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index 6932e7c2c..f6db02aff 100644
--- a/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -140,23 +140,8 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
-const ImplementsGetwd = true
-
 //sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
 
-func Getwd() (string, error) {
-	var buf [PathMax]byte
-	_, err := Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	n := clen(buf[:])
-	if n < 1 {
-		return "", EINVAL
-	}
-	return string(buf[:n]), nil
-}
-
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	var (
 		_p0          unsafe.Pointer
diff --git a/vendor/golang.org/x/sys/unix/syscall_illumos.go b/vendor/golang.org/x/sys/unix/syscall_illumos.go
index 16e40091c..bbc4f3ea5 100644
--- a/vendor/golang.org/x/sys/unix/syscall_illumos.go
+++ b/vendor/golang.org/x/sys/unix/syscall_illumos.go
@@ -56,7 +56,7 @@ func Pwritev(fd int, iovs [][]byte, off int64) (n int, err error) {
 	return n, err
 }
 
-//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error)
+//sys	accept4(s int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (fd int, err error) = libsocket.accept4
 
 func Accept4(fd int, flags int) (nfd int, sa Sockaddr, err error) {
 	var rsa RawSockaddrAny
diff --git a/vendor/golang.org/x/sys/unix/syscall_linux.go b/vendor/golang.org/x/sys/unix/syscall_linux.go
index ec7e4c4d3..94dafa4e5 100644
--- a/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -112,6 +112,31 @@ func IoctlGetRTCWkAlrm(fd int) (*RTCWkAlrm, error) {
 	return &value, err
 }
 
+// IoctlFileClone performs an FICLONERANGE ioctl operation to clone the range of
+// data conveyed in value to the file associated with the file descriptor
+// destFd. See the ioctl_ficlonerange(2) man page for details.
+func IoctlFileCloneRange(destFd int, value *FileCloneRange) error {
+	err := ioctl(destFd, FICLONERANGE, uintptr(unsafe.Pointer(value)))
+	runtime.KeepAlive(value)
+	return err
+}
+
+// IoctlFileClone performs an FICLONE ioctl operation to clone the entire file
+// associated with the file description srcFd to the file associated with the
+// file descriptor destFd. See the ioctl_ficlone(2) man page for details.
+func IoctlFileClone(destFd, srcFd int) error {
+	return ioctl(destFd, FICLONE, uintptr(srcFd))
+}
+
+// IoctlFileClone performs an FIDEDUPERANGE ioctl operation to share the range of
+// data conveyed in value with the file associated with the file descriptor
+// destFd. See the ioctl_fideduperange(2) man page for details.
+func IoctlFileDedupeRange(destFd int, value *FileDedupeRange) error {
+	err := ioctl(destFd, FIDEDUPERANGE, uintptr(unsafe.Pointer(value)))
+	runtime.KeepAlive(value)
+	return err
+}
+
 //sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
 
 func Link(oldpath string, newpath string) (err error) {
diff --git a/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index 45b50a610..dbd5e03b6 100644
--- a/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -141,23 +141,8 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	return
 }
 
-const ImplementsGetwd = true
-
 //sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
 
-func Getwd() (string, error) {
-	var buf [PathMax]byte
-	_, err := Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	n := clen(buf[:])
-	if n < 1 {
-		return "", EINVAL
-	}
-	return string(buf[:n]), nil
-}
-
 // TODO
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	return -1, ENOSYS
diff --git a/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index a266e92a9..2c1f46ea1 100644
--- a/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -114,23 +114,8 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	return
 }
 
-const ImplementsGetwd = true
-
 //sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
 
-func Getwd() (string, error) {
-	var buf [PathMax]byte
-	_, err := Getcwd(buf[0:])
-	if err != nil {
-		return "", err
-	}
-	n := clen(buf[:])
-	if n < 1 {
-		return "", EINVAL
-	}
-	return string(buf[:n]), nil
-}
-
 func Sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	if raceenabled {
 		raceReleaseMerge(unsafe.Pointer(&ioSync))
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux.go b/vendor/golang.org/x/sys/unix/zerrors_linux.go
index 388050a0f..79e032f4f 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux.go
@@ -686,6 +686,7 @@ const (
 	FD_CLOEXEC                                  = 0x1
 	FD_SETSIZE                                  = 0x400
 	FF0                                         = 0x0
+	FIDEDUPERANGE                               = 0xc0189436
 	FSCRYPT_KEY_DESCRIPTOR_SIZE                 = 0x8
 	FSCRYPT_KEY_DESC_PREFIX                     = "fscrypt:"
 	FSCRYPT_KEY_DESC_PREFIX_SIZE                = 0x8
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 11b25f68c..dd282c08b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x40049409
+	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
 	FP_XSTATE_MAGIC2                 = 0x46505845
 	FS_IOC_ENABLE_VERITY             = 0x40806685
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index f92cff6ea..82fc93c7b 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x40049409
+	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
 	FP_XSTATE_MAGIC2                 = 0x46505845
 	FS_IOC_ENABLE_VERITY             = 0x40806685
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index 12bcbf88d..fe7094f27 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x40049409
+	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
 	FS_IOC_ENABLE_VERITY             = 0x40806685
 	FS_IOC_GETFLAGS                  = 0x80046601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 84f71e99f..3b6cc5880 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -73,6 +73,8 @@ const (
 	EXTRA_MAGIC                      = 0x45585401
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x40049409
+	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
 	FPSIMD_MAGIC                     = 0x46508001
 	FS_IOC_ENABLE_VERITY             = 0x40806685
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index eeadea943..ce3d9ae15 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x2000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40046601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index 0be6c4ccc..7a85215ce 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x2000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40086601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index 0880b745c..07d4cc1bd 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x2000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40086601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index c8a66627a..d4842ba1c 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x2000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40046601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 97aae63f1..941e20dac 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000000
 	FF1                              = 0x4000
 	FFDLY                            = 0x4000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x800000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40086601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index b0c3b0664..63d3bc566 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000000
 	FF1                              = 0x4000
 	FFDLY                            = 0x4000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x800000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40086601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
index 0c0518193..490bee1ab 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x40049409
+	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
 	FS_IOC_ENABLE_VERITY             = 0x40806685
 	FS_IOC_GETFLAGS                  = 0x80086601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 0b96bd462..467b8218e 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -71,6 +71,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x40049409
+	FICLONERANGE                     = 0x4020940d
 	FLUSHO                           = 0x1000
 	FS_IOC_ENABLE_VERITY             = 0x40806685
 	FS_IOC_GETFLAGS                  = 0x80086601
diff --git a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
index bd5c30577..79fbafbcf 100644
--- a/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
+++ b/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
@@ -75,6 +75,8 @@ const (
 	EXTPROC                          = 0x10000
 	FF1                              = 0x8000
 	FFDLY                            = 0x8000
+	FICLONE                          = 0x80049409
+	FICLONERANGE                     = 0x8020940d
 	FLUSHO                           = 0x1000
 	FS_IOC_ENABLE_VERITY             = 0x80806685
 	FS_IOC_GETFLAGS                  = 0x40086601
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
index 397614720..bd13b3856 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -490,21 +490,6 @@ func libc_munlockall_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) {
-	_, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func libc_getattrlist_trampoline()
-
-//go:linkname libc_getattrlist libc_getattrlist
-//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0)
 	r = int(r0)
@@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func libc_getcwd_trampoline()
+
+//go:linkname libc_getcwd libc_getcwd
+//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0)
 	size = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s
index 961058db8..d5fb53fd1 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.s
@@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlock(SB)
 TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlockall(SB)
-TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
-	JMP	libc_getattrlist(SB)
 TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_pipe(SB)
 TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0
@@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_fsync(SB)
 TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_ftruncate(SB)
+TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_getcwd(SB)
 TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_getdtablesize(SB)
 TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index e253f4387..d81696f9e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -490,21 +490,6 @@ func libc_munlockall_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) {
-	_, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func libc_getattrlist_trampoline()
-
-//go:linkname libc_getattrlist libc_getattrlist
-//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0)
 	r = int(r0)
@@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func libc_getcwd_trampoline()
+
+//go:linkname libc_getcwd libc_getcwd
+//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0)
 	size = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
index b8be24c6b..887fd5f4e 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.s
@@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlock(SB)
 TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlockall(SB)
-TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
-	JMP	libc_getattrlist(SB)
 TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_pipe(SB)
 TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0
@@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_fsync(SB)
 TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_ftruncate(SB)
+TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_getcwd(SB)
 TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_getdtablesize(SB)
 TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
index be2e28311..d6b5249c2 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -490,21 +490,6 @@ func libc_munlockall_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) {
-	_, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func libc_getattrlist_trampoline()
-
-//go:linkname libc_getattrlist libc_getattrlist
-//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0)
 	r = int(r0)
@@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func libc_getcwd_trampoline()
+
+//go:linkname libc_getcwd libc_getcwd
+//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0)
 	size = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s
index 403c21f06..5eec5f1d9 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.s
@@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlock(SB)
 TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlockall(SB)
-TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
-	JMP	libc_getattrlist(SB)
 TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_pipe(SB)
 TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0
@@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_fsync(SB)
 TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_ftruncate(SB)
+TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_getcwd(SB)
 TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_getdtablesize(SB)
 TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
index 34976a4c2..08638436c 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -490,21 +490,6 @@ func libc_munlockall_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func getattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error) {
-	_, _, e1 := syscall_syscall6(funcPC(libc_getattrlist_trampoline), uintptr(unsafe.Pointer(path)), uintptr(list), uintptr(buf), uintptr(size), uintptr(options), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-func libc_getattrlist_trampoline()
-
-//go:linkname libc_getattrlist libc_getattrlist
-//go:cgo_import_dynamic libc_getattrlist getattrlist "/usr/lib/libSystem.B.dylib"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := syscall_rawSyscall(funcPC(libc_pipe_trampoline), 0, 0, 0)
 	r = int(r0)
@@ -1277,6 +1262,28 @@ func libc_ftruncate_trampoline()
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := syscall_syscall(funcPC(libc_getcwd_trampoline), uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+func libc_getcwd_trampoline()
+
+//go:linkname libc_getcwd libc_getcwd
+//go:cgo_import_dynamic libc_getcwd getcwd "/usr/lib/libSystem.B.dylib"
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdtablesize() (size int) {
 	r0, _, _ := syscall_syscall(funcPC(libc_getdtablesize_trampoline), 0, 0, 0)
 	size = int(r0)
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
index abe7b6edf..16aebee23 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
+++ b/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.s
@@ -60,8 +60,6 @@ TEXT ·libc_munlock_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlock(SB)
 TEXT ·libc_munlockall_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_munlockall(SB)
-TEXT ·libc_getattrlist_trampoline(SB),NOSPLIT,$0-0
-	JMP	libc_getattrlist(SB)
 TEXT ·libc_pipe_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_pipe(SB)
 TEXT ·libc_getxattr_trampoline(SB),NOSPLIT,$0-0
@@ -146,6 +144,8 @@ TEXT ·libc_fsync_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_fsync(SB)
 TEXT ·libc_ftruncate_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_ftruncate(SB)
+TEXT ·libc_getcwd_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_getcwd(SB)
 TEXT ·libc_getdtablesize_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_getdtablesize(SB)
 TEXT ·libc_getegid_trampoline(SB),NOSPLIT,$0-0
diff --git a/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go b/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
index 8b329c458..d3af083f4 100644
--- a/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
+++ b/vendor/golang.org/x/sys/unix/zsyscall_illumos_amd64.go
@@ -13,7 +13,7 @@ import (
 //go:cgo_import_dynamic libc_preadv preadv "libc.so"
 //go:cgo_import_dynamic libc_writev writev "libc.so"
 //go:cgo_import_dynamic libc_pwritev pwritev "libc.so"
-//go:cgo_import_dynamic libc_accept4 accept4 "libc.so"
+//go:cgo_import_dynamic libc_accept4 accept4 "libsocket.so"
 //go:cgo_import_dynamic libc_pipe2 pipe2 "libc.so"
 
 //go:linkname procreadv libc_readv
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
index 9f47b87c5..6103f2150 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
@@ -145,6 +145,10 @@ type Dirent struct {
 	_       [3]byte
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
index 966798a87..e6576d1c4 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -151,6 +151,10 @@ type Dirent struct {
 	_       [3]byte
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
index 4fe4c9cd7..af9560fa1 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
@@ -146,6 +146,10 @@ type Dirent struct {
 	_       [3]byte
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
diff --git a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
index 21999e4b0..a09c0f942 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -151,6 +151,10 @@ type Dirent struct {
 	_       [3]byte
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
diff --git a/vendor/golang.org/x/sys/unix/ztypes_linux.go b/vendor/golang.org/x/sys/unix/ztypes_linux.go
index 68e4974a9..a92a5019a 100644
--- a/vendor/golang.org/x/sys/unix/ztypes_linux.go
+++ b/vendor/golang.org/x/sys/unix/ztypes_linux.go
@@ -76,6 +76,21 @@ type Fsid struct {
 	Val [2]int32
 }
 
+type FileCloneRange struct {
+	Src_fd      int64
+	Src_offset  uint64
+	Src_length  uint64
+	Dest_offset uint64
+}
+
+type FileDedupeRange struct {
+	Src_offset uint64
+	Src_length uint64
+	Dest_count uint16
+	Reserved1  uint16
+	Reserved2  uint32
+}
+
 type FscryptPolicy struct {
 	Version                   uint8
 	Contents_encryption_mode  uint8
diff --git a/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go b/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
index 8dcd8bbb7..e8cba6b23 100644
--- a/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
+++ b/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
@@ -491,7 +491,7 @@ func (p *parser) parseMapType(parent *types.Package) types.Type {
 //
 // For unqualified and anonymous names, the returned package is the parent
 // package unless parent == nil, in which case the returned package is the
-// package being imported. (The parent package is not nil if the the name
+// package being imported. (The parent package is not nil if the name
 // is an unqualified struct field or interface method name belonging to a
 // type declared in another package.)
 //
diff --git a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
index dc6177c12..35bc6a412 100644
--- a/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
+++ b/vendor/golang.org/x/tools/go/internal/packagesdriver/sizes.go
@@ -39,7 +39,12 @@ func GetSizes(ctx context.Context, buildFlags, env []string, gocmdRunner *gocomm
 	}
 
 	if tool == "off" {
-		return GetSizesGolist(ctx, buildFlags, env, gocmdRunner, dir)
+		inv := gocommand.Invocation{
+			BuildFlags: buildFlags,
+			Env:        env,
+			WorkingDir: dir,
+		}
+		return GetSizesGolist(ctx, inv, gocmdRunner)
 	}
 
 	req, err := json.Marshal(struct {
@@ -75,26 +80,17 @@ func GetSizes(ctx context.Context, buildFlags, env []string, gocmdRunner *gocomm
 	return response.Sizes, nil
 }
 
-func GetSizesGolist(ctx context.Context, buildFlags, env []string, gocmdRunner *gocommand.Runner, dir string) (types.Sizes, error) {
-	inv := gocommand.Invocation{
-		Verb:       "list",
-		Args:       []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"},
-		Env:        env,
-		BuildFlags: buildFlags,
-		WorkingDir: dir,
-	}
+func GetSizesGolist(ctx context.Context, inv gocommand.Invocation, gocmdRunner *gocommand.Runner) (types.Sizes, error) {
+	inv.Verb = "list"
+	inv.Args = []string{"-f", "{{context.GOARCH}} {{context.Compiler}}", "--", "unsafe"}
 	stdout, stderr, friendlyErr, rawErr := gocmdRunner.RunRaw(ctx, inv)
 	var goarch, compiler string
 	if rawErr != nil {
 		if strings.Contains(rawErr.Error(), "cannot find main module") {
 			// User's running outside of a module. All bets are off. Get GOARCH and guess compiler is gc.
 			// TODO(matloob): Is this a problem in practice?
-			inv := gocommand.Invocation{
-				Verb:       "env",
-				Args:       []string{"GOARCH"},
-				Env:        env,
-				WorkingDir: dir,
-			}
+			inv.Verb = "env"
+			inv.Args = []string{"GOARCH"}
 			envout, enverr := gocmdRunner.Run(ctx, inv)
 			if enverr != nil {
 				return nil, enverr
diff --git a/vendor/golang.org/x/tools/go/packages/golist.go b/vendor/golang.org/x/tools/go/packages/golist.go
index bc04503c1..81381fa1c 100644
--- a/vendor/golang.org/x/tools/go/packages/golist.go
+++ b/vendor/golang.org/x/tools/go/packages/golist.go
@@ -10,6 +10,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"go/types"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -91,7 +92,7 @@ type golistState struct {
 
 	goVersionOnce  sync.Once
 	goVersionError error
-	goVersion      string // third field of 'go version'
+	goVersion      int // The X in Go 1.X.
 
 	// vendorDirs caches the (non)existence of vendor directories.
 	vendorDirs map[string]bool
@@ -139,6 +140,12 @@ func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) {
 
 	response := newDeduper()
 
+	state := &golistState{
+		cfg:        cfg,
+		ctx:        ctx,
+		vendorDirs: map[string]bool{},
+	}
+
 	// Fill in response.Sizes asynchronously if necessary.
 	var sizeserr error
 	var sizeswg sync.WaitGroup
@@ -146,19 +153,13 @@ func goListDriver(cfg *Config, patterns ...string) (*driverResponse, error) {
 		sizeswg.Add(1)
 		go func() {
 			var sizes types.Sizes
-			sizes, sizeserr = packagesdriver.GetSizesGolist(ctx, cfg.BuildFlags, cfg.Env, cfg.gocmdRunner, cfg.Dir)
+			sizes, sizeserr = packagesdriver.GetSizesGolist(ctx, state.cfgInvocation(), cfg.gocmdRunner)
 			// types.SizesFor always returns nil or a *types.StdSizes.
 			response.dr.Sizes, _ = sizes.(*types.StdSizes)
 			sizeswg.Done()
 		}()
 	}
 
-	state := &golistState{
-		cfg:        cfg,
-		ctx:        ctx,
-		vendorDirs: map[string]bool{},
-	}
-
 	// Determine files requested in contains patterns
 	var containFiles []string
 	restPatterns := make([]string, 0, len(patterns))
@@ -208,56 +209,58 @@ extractQueries:
 		}
 	}
 
-	modifiedPkgs, needPkgs, err := state.processGolistOverlay(response)
-	if err != nil {
-		return nil, err
-	}
+	// Only use go/packages' overlay processing if we're using a Go version
+	// below 1.16. Otherwise, go list handles it.
+	if goVersion, err := state.getGoVersion(); err == nil && goVersion < 16 {
+		modifiedPkgs, needPkgs, err := state.processGolistOverlay(response)
+		if err != nil {
+			return nil, err
+		}
 
-	var containsCandidates []string
-	if len(containFiles) > 0 {
-		containsCandidates = append(containsCandidates, modifiedPkgs...)
-		containsCandidates = append(containsCandidates, needPkgs...)
-	}
-	if err := state.addNeededOverlayPackages(response, needPkgs); err != nil {
-		return nil, err
-	}
-	// Check candidate packages for containFiles.
-	if len(containFiles) > 0 {
-		for _, id := range containsCandidates {
-			pkg, ok := response.seenPackages[id]
-			if !ok {
-				response.addPackage(&Package{
-					ID: id,
-					Errors: []Error{
-						{
+		var containsCandidates []string
+		if len(containFiles) > 0 {
+			containsCandidates = append(containsCandidates, modifiedPkgs...)
+			containsCandidates = append(containsCandidates, needPkgs...)
+		}
+		if err := state.addNeededOverlayPackages(response, needPkgs); err != nil {
+			return nil, err
+		}
+		// Check candidate packages for containFiles.
+		if len(containFiles) > 0 {
+			for _, id := range containsCandidates {
+				pkg, ok := response.seenPackages[id]
+				if !ok {
+					response.addPackage(&Package{
+						ID: id,
+						Errors: []Error{{
 							Kind: ListError,
 							Msg:  fmt.Sprintf("package %s expected but not seen", id),
-						},
-					},
-				})
-				continue
-			}
-			for _, f := range containFiles {
-				for _, g := range pkg.GoFiles {
-					if sameFile(f, g) {
-						response.addRoot(id)
+						}},
+					})
+					continue
+				}
+				for _, f := range containFiles {
+					for _, g := range pkg.GoFiles {
+						if sameFile(f, g) {
+							response.addRoot(id)
+						}
 					}
 				}
 			}
 		}
-	}
-	// Add root for any package that matches a pattern. This applies only to
-	// packages that are modified by overlays, since they are not added as
-	// roots automatically.
-	for _, pattern := range restPatterns {
-		match := matchPattern(pattern)
-		for _, pkgID := range modifiedPkgs {
-			pkg, ok := response.seenPackages[pkgID]
-			if !ok {
-				continue
-			}
-			if match(pkg.PkgPath) {
-				response.addRoot(pkg.ID)
+		// Add root for any package that matches a pattern. This applies only to
+		// packages that are modified by overlays, since they are not added as
+		// roots automatically.
+		for _, pattern := range restPatterns {
+			match := matchPattern(pattern)
+			for _, pkgID := range modifiedPkgs {
+				pkg, ok := response.seenPackages[pkgID]
+				if !ok {
+					continue
+				}
+				if match(pkg.PkgPath) {
+					response.addRoot(pkg.ID)
+				}
 			}
 		}
 	}
@@ -381,32 +384,34 @@ func (state *golistState) adhocPackage(pattern, query string) (*driverResponse,
 // Fields must match go list;
 // see $GOROOT/src/cmd/go/internal/load/pkg.go.
 type jsonPackage struct {
-	ImportPath      string
-	Dir             string
-	Name            string
-	Export          string
-	GoFiles         []string
-	CompiledGoFiles []string
-	CFiles          []string
-	CgoFiles        []string
-	CXXFiles        []string
-	MFiles          []string
-	HFiles          []string
-	FFiles          []string
-	SFiles          []string
-	SwigFiles       []string
-	SwigCXXFiles    []string
-	SysoFiles       []string
-	Imports         []string
-	ImportMap       map[string]string
-	Deps            []string
-	Module          *Module
-	TestGoFiles     []string
-	TestImports     []string
-	XTestGoFiles    []string
-	XTestImports    []string
-	ForTest         string // q in a "p [q.test]" package, else ""
-	DepOnly         bool
+	ImportPath        string
+	Dir               string
+	Name              string
+	Export            string
+	GoFiles           []string
+	CompiledGoFiles   []string
+	IgnoredGoFiles    []string
+	IgnoredOtherFiles []string
+	CFiles            []string
+	CgoFiles          []string
+	CXXFiles          []string
+	MFiles            []string
+	HFiles            []string
+	FFiles            []string
+	SFiles            []string
+	SwigFiles         []string
+	SwigCXXFiles      []string
+	SysoFiles         []string
+	Imports           []string
+	ImportMap         map[string]string
+	Deps              []string
+	Module            *Module
+	TestGoFiles       []string
+	TestImports       []string
+	XTestGoFiles      []string
+	XTestImports      []string
+	ForTest           string // q in a "p [q.test]" package, else ""
+	DepOnly           bool
 
 	Error *jsonPackageError
 }
@@ -558,6 +563,7 @@ func (state *golistState) createDriverResponse(words ...string) (*driverResponse
 			GoFiles:         absJoin(p.Dir, p.GoFiles, p.CgoFiles),
 			CompiledGoFiles: absJoin(p.Dir, p.CompiledGoFiles),
 			OtherFiles:      absJoin(p.Dir, otherFiles(p)...),
+			IgnoredFiles:    absJoin(p.Dir, p.IgnoredGoFiles, p.IgnoredOtherFiles),
 			forTest:         p.ForTest,
 			Module:          p.Module,
 		}
@@ -728,7 +734,7 @@ func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool {
 
 	// On Go 1.14 and earlier, only add filenames from errors if the import stack is empty.
 	// The import stack behaves differently for these versions than newer Go versions.
-	if strings.HasPrefix(goV, "go1.13") || strings.HasPrefix(goV, "go1.14") {
+	if goV < 15 {
 		return len(p.Error.ImportStack) == 0
 	}
 
@@ -739,31 +745,9 @@ func (state *golistState) shouldAddFilenameFromError(p *jsonPackage) bool {
 	return len(p.Error.ImportStack) == 0 || p.Error.ImportStack[len(p.Error.ImportStack)-1] == p.ImportPath
 }
 
-func (state *golistState) getGoVersion() (string, error) {
+func (state *golistState) getGoVersion() (int, error) {
 	state.goVersionOnce.Do(func() {
-		var b *bytes.Buffer
-		// Invoke go version. Don't use invokeGo because it will supply build flags, and
-		// go version doesn't expect build flags.
-		inv := gocommand.Invocation{
-			Verb: "version",
-			Env:  state.cfg.Env,
-			Logf: state.cfg.Logf,
-		}
-		gocmdRunner := state.cfg.gocmdRunner
-		if gocmdRunner == nil {
-			gocmdRunner = &gocommand.Runner{}
-		}
-		b, _, _, state.goVersionError = gocmdRunner.RunRaw(state.cfg.Context, inv)
-		if state.goVersionError != nil {
-			return
-		}
-
-		sp := strings.Split(b.String(), " ")
-		if len(sp) < 3 {
-			state.goVersionError = fmt.Errorf("go version output: expected 'go version <version>', got '%s'", b.String())
-			return
-		}
-		state.goVersion = sp[2]
+		state.goVersion, state.goVersionError = gocommand.GoVersion(state.ctx, state.cfgInvocation(), state.cfg.gocmdRunner)
 	})
 	return state.goVersion, state.goVersionError
 }
@@ -836,18 +820,46 @@ func golistargs(cfg *Config, words []string) []string {
 	return fullargs
 }
 
-// invokeGo returns the stdout of a go command invocation.
-func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, error) {
+// cfgInvocation returns an Invocation that reflects cfg's settings.
+func (state *golistState) cfgInvocation() gocommand.Invocation {
 	cfg := state.cfg
-
-	inv := gocommand.Invocation{
-		Verb:       verb,
-		Args:       args,
+	return gocommand.Invocation{
 		BuildFlags: cfg.BuildFlags,
+		ModFile:    cfg.modFile,
+		ModFlag:    cfg.modFlag,
 		Env:        cfg.Env,
 		Logf:       cfg.Logf,
 		WorkingDir: cfg.Dir,
 	}
+}
+
+// invokeGo returns the stdout of a go command invocation.
+func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer, error) {
+	cfg := state.cfg
+
+	inv := state.cfgInvocation()
+
+	// For Go versions 1.16 and above, `go list` accepts overlays directly via
+	// the -overlay flag. Set it, if it's available.
+	//
+	// The check for "list" is not necessarily required, but we should avoid
+	// getting the go version if possible.
+	if verb == "list" {
+		goVersion, err := state.getGoVersion()
+		if err != nil {
+			return nil, err
+		}
+		if goVersion >= 16 {
+			filename, cleanup, err := state.writeOverlays()
+			if err != nil {
+				return nil, err
+			}
+			defer cleanup()
+			inv.Overlay = filename
+		}
+	}
+	inv.Verb = verb
+	inv.Args = args
 	gocmdRunner := cfg.gocmdRunner
 	if gocmdRunner == nil {
 		gocmdRunner = &gocommand.Runner{}
@@ -987,6 +999,67 @@ func (state *golistState) invokeGo(verb string, args ...string) (*bytes.Buffer,
 	return stdout, nil
 }
 
+// OverlayJSON is the format overlay files are expected to be in.
+// The Replace map maps from overlaid paths to replacement paths:
+// the Go command will forward all reads trying to open
+// each overlaid path to its replacement path, or consider the overlaid
+// path not to exist if the replacement path is empty.
+//
+// From golang/go#39958.
+type OverlayJSON struct {
+	Replace map[string]string `json:"replace,omitempty"`
+}
+
+// writeOverlays writes out files for go list's -overlay flag, as described
+// above.
+func (state *golistState) writeOverlays() (filename string, cleanup func(), err error) {
+	// Do nothing if there are no overlays in the config.
+	if len(state.cfg.Overlay) == 0 {
+		return "", func() {}, nil
+	}
+	dir, err := ioutil.TempDir("", "gopackages-*")
+	if err != nil {
+		return "", nil, err
+	}
+	// The caller must clean up this directory, unless this function returns an
+	// error.
+	cleanup = func() {
+		os.RemoveAll(dir)
+	}
+	defer func() {
+		if err != nil {
+			cleanup()
+		}
+	}()
+	overlays := map[string]string{}
+	for k, v := range state.cfg.Overlay {
+		// Create a unique filename for the overlaid files, to avoid
+		// creating nested directories.
+		noSeparator := strings.Join(strings.Split(filepath.ToSlash(k), "/"), "")
+		f, err := ioutil.TempFile(dir, fmt.Sprintf("*-%s", noSeparator))
+		if err != nil {
+			return "", func() {}, err
+		}
+		if _, err := f.Write(v); err != nil {
+			return "", func() {}, err
+		}
+		if err := f.Close(); err != nil {
+			return "", func() {}, err
+		}
+		overlays[k] = f.Name()
+	}
+	b, err := json.Marshal(OverlayJSON{Replace: overlays})
+	if err != nil {
+		return "", func() {}, err
+	}
+	// Write out the overlay file that contains the filepath mappings.
+	filename = filepath.Join(dir, "overlay.json")
+	if err := ioutil.WriteFile(filename, b, 0665); err != nil {
+		return "", func() {}, err
+	}
+	return filename, cleanup, nil
+}
+
 func containsGoFile(s []string) bool {
 	for _, f := range s {
 		if strings.HasSuffix(f, ".go") {
diff --git a/vendor/golang.org/x/tools/go/packages/golist_overlay.go b/vendor/golang.org/x/tools/go/packages/golist_overlay.go
index 874f90134..de2c1dc57 100644
--- a/vendor/golang.org/x/tools/go/packages/golist_overlay.go
+++ b/vendor/golang.org/x/tools/go/packages/golist_overlay.go
@@ -1,3 +1,7 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 package packages
 
 import (
@@ -253,7 +257,7 @@ func (state *golistState) processGolistOverlay(response *responseDeduper) (modif
 	return modifiedPkgs, needPkgs, err
 }
 
-// resolveImport finds the the ID of a package given its import path.
+// resolveImport finds the ID of a package given its import path.
 // In particular, it will find the right vendored copy when in GOPATH mode.
 func (state *golistState) resolveImport(sourceDir, importPath string) (string, error) {
 	env, err := state.getEnv()
diff --git a/vendor/golang.org/x/tools/go/packages/packages.go b/vendor/golang.org/x/tools/go/packages/packages.go
index 04053f1e7..38475e871 100644
--- a/vendor/golang.org/x/tools/go/packages/packages.go
+++ b/vendor/golang.org/x/tools/go/packages/packages.go
@@ -144,6 +144,12 @@ type Config struct {
 	// the build system's query tool.
 	BuildFlags []string
 
+	// modFile will be used for -modfile in go command invocations.
+	modFile string
+
+	// modFlag will be used for -modfile in go command invocations.
+	modFlag string
+
 	// Fset provides source position information for syntax trees and types.
 	// If Fset is nil, Load will use a new fileset, but preserve Fset's value.
 	Fset *token.FileSet
@@ -289,6 +295,11 @@ type Package struct {
 	// including assembly, C, C++, Fortran, Objective-C, SWIG, and so on.
 	OtherFiles []string
 
+	// IgnoredFiles lists source files that are not part of the package
+	// using the current build configuration but that might be part of
+	// the package using other build configurations.
+	IgnoredFiles []string
+
 	// ExportFile is the absolute path to a file containing type
 	// information for the package as provided by the build system.
 	ExportFile string
@@ -361,6 +372,12 @@ func init() {
 	packagesinternal.SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) {
 		config.(*Config).gocmdRunner = runner
 	}
+	packagesinternal.SetModFile = func(config interface{}, value string) {
+		config.(*Config).modFile = value
+	}
+	packagesinternal.SetModFlag = func(config interface{}, value string) {
+		config.(*Config).modFlag = value
+	}
 	packagesinternal.TypecheckCgo = int(typecheckCgo)
 }
 
@@ -404,6 +421,7 @@ type flatPackage struct {
 	GoFiles         []string          `json:",omitempty"`
 	CompiledGoFiles []string          `json:",omitempty"`
 	OtherFiles      []string          `json:",omitempty"`
+	IgnoredFiles    []string          `json:",omitempty"`
 	ExportFile      string            `json:",omitempty"`
 	Imports         map[string]string `json:",omitempty"`
 }
@@ -426,6 +444,7 @@ func (p *Package) MarshalJSON() ([]byte, error) {
 		GoFiles:         p.GoFiles,
 		CompiledGoFiles: p.CompiledGoFiles,
 		OtherFiles:      p.OtherFiles,
+		IgnoredFiles:    p.IgnoredFiles,
 		ExportFile:      p.ExportFile,
 	}
 	if len(p.Imports) > 0 {
@@ -712,7 +731,8 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) {
 		result[i] = lpkg.Package
 	}
 	for i := range ld.pkgs {
-		// Clear all unrequested fields, for extra de-Hyrum-ization.
+		// Clear all unrequested fields,
+		// to catch programs that use more than they request.
 		if ld.requestedMode&NeedName == 0 {
 			ld.pkgs[i].Name = ""
 			ld.pkgs[i].PkgPath = ""
@@ -720,6 +740,7 @@ func (ld *loader) refine(roots []string, list ...*Package) ([]*Package, error) {
 		if ld.requestedMode&NeedFiles == 0 {
 			ld.pkgs[i].GoFiles = nil
 			ld.pkgs[i].OtherFiles = nil
+			ld.pkgs[i].IgnoredFiles = nil
 		}
 		if ld.requestedMode&NeedCompiledGoFiles == 0 {
 			ld.pkgs[i].CompiledGoFiles = nil
diff --git a/vendor/golang.org/x/tools/internal/gocommand/invoke.go b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
index f516e1762..8ba225383 100644
--- a/vendor/golang.org/x/tools/internal/gocommand/invoke.go
+++ b/vendor/golang.org/x/tools/internal/gocommand/invoke.go
@@ -130,6 +130,9 @@ type Invocation struct {
 	Verb       string
 	Args       []string
 	BuildFlags []string
+	ModFlag    string
+	ModFile    string
+	Overlay    string
 	Env        []string
 	WorkingDir string
 	Logf       func(format string, args ...interface{})
@@ -158,17 +161,41 @@ func (i *Invocation) run(ctx context.Context, stdout, stderr io.Writer) error {
 	}
 
 	goArgs := []string{i.Verb}
+
+	appendModFile := func() {
+		if i.ModFile != "" {
+			goArgs = append(goArgs, "-modfile="+i.ModFile)
+		}
+	}
+	appendModFlag := func() {
+		if i.ModFlag != "" {
+			goArgs = append(goArgs, "-mod="+i.ModFlag)
+		}
+	}
+	appendOverlayFlag := func() {
+		if i.Overlay != "" {
+			goArgs = append(goArgs, "-overlay="+i.Overlay)
+		}
+	}
+
 	switch i.Verb {
-	case "mod":
-		// mod needs the sub-verb before build flags.
-		goArgs = append(goArgs, i.Args[0])
-		goArgs = append(goArgs, i.BuildFlags...)
-		goArgs = append(goArgs, i.Args[1:]...)
-	case "env":
-		// env doesn't take build flags.
+	case "env", "version":
 		goArgs = append(goArgs, i.Args...)
-	default:
+	case "mod":
+		// mod needs the sub-verb before flags.
+		goArgs = append(goArgs, i.Args[0])
+		appendModFile()
+		goArgs = append(goArgs, i.Args[1:]...)
+	case "get":
 		goArgs = append(goArgs, i.BuildFlags...)
+		appendModFile()
+		goArgs = append(goArgs, i.Args...)
+
+	default: // notably list and build.
+		goArgs = append(goArgs, i.BuildFlags...)
+		appendModFile()
+		appendModFlag()
+		appendOverlayFlag()
 		goArgs = append(goArgs, i.Args...)
 	}
 	cmd := exec.Command("go", goArgs...)
diff --git a/vendor/golang.org/x/tools/internal/gocommand/version.go b/vendor/golang.org/x/tools/internal/gocommand/version.go
new file mode 100644
index 000000000..60d45ac0e
--- /dev/null
+++ b/vendor/golang.org/x/tools/internal/gocommand/version.go
@@ -0,0 +1,40 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package gocommand
+
+import (
+	"context"
+	"fmt"
+	"strings"
+)
+
+// GoVersion checks the go version by running "go list" with modules off.
+// It returns the X in Go 1.X.
+func GoVersion(ctx context.Context, inv Invocation, r *Runner) (int, error) {
+	inv.Verb = "list"
+	inv.Args = []string{"-e", "-f", `{{context.ReleaseTags}}`}
+	inv.Env = append(append([]string{}, inv.Env...), "GO111MODULE=off")
+	// Unset any unneeded flags.
+	inv.ModFile = ""
+	inv.ModFlag = ""
+	stdoutBytes, err := r.Run(ctx, inv)
+	if err != nil {
+		return 0, err
+	}
+	stdout := stdoutBytes.String()
+	if len(stdout) < 3 {
+		return 0, fmt.Errorf("bad ReleaseTags output: %q", stdout)
+	}
+	// Split up "[go1.1 go1.15]"
+	tags := strings.Fields(stdout[1 : len(stdout)-2])
+	for i := len(tags) - 1; i >= 0; i-- {
+		var version int
+		if _, err := fmt.Sscanf(tags[i], "go1.%d", &version); err != nil {
+			continue
+		}
+		return version, nil
+	}
+	return 0, fmt.Errorf("no parseable ReleaseTags in %v", tags)
+}
diff --git a/vendor/golang.org/x/tools/internal/imports/fix.go b/vendor/golang.org/x/tools/internal/imports/fix.go
index 675d16c87..d859617b7 100644
--- a/vendor/golang.org/x/tools/internal/imports/fix.go
+++ b/vendor/golang.org/x/tools/internal/imports/fix.go
@@ -83,7 +83,7 @@ type ImportFix struct {
 	IdentName string
 	// FixType is the type of fix this is (AddImport, DeleteImport, SetImportName).
 	FixType   ImportFixType
-	Relevance int // see pkg
+	Relevance float64 // see pkg
 }
 
 // An ImportInfo represents a single import statement.
@@ -592,9 +592,9 @@ func getFixes(fset *token.FileSet, f *ast.File, filename string, env *ProcessEnv
 	return fixes, nil
 }
 
-// Highest relevance, used for the standard library. Chosen arbitrarily to
-// match pre-existing gopls code.
-const MaxRelevance = 7
+// MaxRelevance is the highest relevance, used for the standard library.
+// Chosen arbitrarily to match pre-existing gopls code.
+const MaxRelevance = 7.0
 
 // getCandidatePkgs works with the passed callback to find all acceptable packages.
 // It deduplicates by import path, and uses a cached stdlib rather than reading
@@ -607,6 +607,10 @@ func getCandidatePkgs(ctx context.Context, wrappedCallback *scanCallback, filena
 	if err != nil {
 		return err
 	}
+
+	var mu sync.Mutex // to guard asynchronous access to dupCheck
+	dupCheck := map[string]struct{}{}
+
 	// Start off with the standard library.
 	for importPath, exports := range stdlib {
 		p := &pkg{
@@ -615,14 +619,12 @@ func getCandidatePkgs(ctx context.Context, wrappedCallback *scanCallback, filena
 			packageName:     path.Base(importPath),
 			relevance:       MaxRelevance,
 		}
+		dupCheck[importPath] = struct{}{}
 		if notSelf(p) && wrappedCallback.dirFound(p) && wrappedCallback.packageNameLoaded(p) {
 			wrappedCallback.exportsLoaded(p, exports)
 		}
 	}
 
-	var mu sync.Mutex
-	dupCheck := map[string]struct{}{}
-
 	scanFilter := &scanCallback{
 		rootFound: func(root gopathwalk.Root) bool {
 			// Exclude goroot results -- getting them is relatively expensive, not cached,
@@ -658,8 +660,8 @@ func getCandidatePkgs(ctx context.Context, wrappedCallback *scanCallback, filena
 	return resolver.scan(ctx, scanFilter)
 }
 
-func ScoreImportPaths(ctx context.Context, env *ProcessEnv, paths []string) (map[string]int, error) {
-	result := make(map[string]int)
+func ScoreImportPaths(ctx context.Context, env *ProcessEnv, paths []string) (map[string]float64, error) {
+	result := make(map[string]float64)
 	resolver, err := env.GetResolver()
 	if err != nil {
 		return nil, err
@@ -802,6 +804,8 @@ type ProcessEnv struct {
 	GocmdRunner *gocommand.Runner
 
 	BuildFlags []string
+	ModFlag    string
+	ModFile    string
 
 	// Env overrides the OS environment, and can be used to specify
 	// GOPROXY, GO111MODULE, etc. PATH cannot be set here, because
@@ -995,7 +999,7 @@ type Resolver interface {
 	// loadExports may be called concurrently.
 	loadExports(ctx context.Context, pkg *pkg, includeTest bool) (string, []string, error)
 	// scoreImportPath returns the relevance for an import path.
-	scoreImportPath(ctx context.Context, path string) int
+	scoreImportPath(ctx context.Context, path string) float64
 
 	ClearForNewScan()
 }
@@ -1260,10 +1264,10 @@ func packageDirToName(dir string) (packageName string, err error) {
 }
 
 type pkg struct {
-	dir             string // absolute file path to pkg directory ("/usr/lib/go/src/net/http")
-	importPathShort string // vendorless import path ("net/http", "a/b")
-	packageName     string // package name loaded from source if requested
-	relevance       int    // a weakly-defined score of how relevant a package is. 0 is most relevant.
+	dir             string  // absolute file path to pkg directory ("/usr/lib/go/src/net/http")
+	importPathShort string  // vendorless import path ("net/http", "a/b")
+	packageName     string  // package name loaded from source if requested
+	relevance       float64 // a weakly-defined score of how relevant a package is. 0 is most relevant.
 }
 
 type pkgDistance struct {
@@ -1389,7 +1393,7 @@ func (r *gopathResolver) scan(ctx context.Context, callback *scanCallback) error
 	return nil
 }
 
-func (r *gopathResolver) scoreImportPath(ctx context.Context, path string) int {
+func (r *gopathResolver) scoreImportPath(ctx context.Context, path string) float64 {
 	if _, ok := stdlib[path]; ok {
 		return MaxRelevance
 	}
diff --git a/vendor/golang.org/x/tools/internal/imports/mod.go b/vendor/golang.org/x/tools/internal/imports/mod.go
index 94880d616..73f7a4958 100644
--- a/vendor/golang.org/x/tools/internal/imports/mod.go
+++ b/vendor/golang.org/x/tools/internal/imports/mod.go
@@ -59,6 +59,8 @@ func (r *ModuleResolver) init() error {
 	}
 	inv := gocommand.Invocation{
 		BuildFlags: r.env.BuildFlags,
+		ModFlag:    r.env.ModFlag,
+		ModFile:    r.env.ModFile,
 		Env:        r.env.env(),
 		Logf:       r.env.Logf,
 		WorkingDir: r.env.WorkingDir,
@@ -345,10 +347,11 @@ func (r *ModuleResolver) modInfo(dir string) (modDir string, modName string) {
 	}
 
 	if r.dirInModuleCache(dir) {
-		matches := modCacheRegexp.FindStringSubmatch(dir)
-		index := strings.Index(dir, matches[1]+"@"+matches[2])
-		modDir := filepath.Join(dir[:index], matches[1]+"@"+matches[2])
-		return modDir, readModName(filepath.Join(modDir, "go.mod"))
+		if matches := modCacheRegexp.FindStringSubmatch(dir); len(matches) == 3 {
+			index := strings.Index(dir, matches[1]+"@"+matches[2])
+			modDir := filepath.Join(dir[:index], matches[1]+"@"+matches[2])
+			return modDir, readModName(filepath.Join(modDir, "go.mod"))
+		}
 	}
 	for {
 		if info, ok := r.cacheLoad(dir); ok {
@@ -487,7 +490,7 @@ func (r *ModuleResolver) scan(ctx context.Context, callback *scanCallback) error
 	return nil
 }
 
-func (r *ModuleResolver) scoreImportPath(ctx context.Context, path string) int {
+func (r *ModuleResolver) scoreImportPath(ctx context.Context, path string) float64 {
 	if _, ok := stdlib[path]; ok {
 		return MaxRelevance
 	}
@@ -495,17 +498,31 @@ func (r *ModuleResolver) scoreImportPath(ctx context.Context, path string) int {
 	return modRelevance(mod)
 }
 
-func modRelevance(mod *gocommand.ModuleJSON) int {
+func modRelevance(mod *gocommand.ModuleJSON) float64 {
+	var relevance float64
 	switch {
 	case mod == nil: // out of scope
 		return MaxRelevance - 4
 	case mod.Indirect:
-		return MaxRelevance - 3
+		relevance = MaxRelevance - 3
 	case !mod.Main:
-		return MaxRelevance - 2
+		relevance = MaxRelevance - 2
 	default:
-		return MaxRelevance - 1 // main module ties with stdlib
+		relevance = MaxRelevance - 1 // main module ties with stdlib
 	}
+
+	_, versionString, ok := module.SplitPathVersion(mod.Path)
+	if ok {
+		index := strings.Index(versionString, "v")
+		if index == -1 {
+			return relevance
+		}
+		if versionNumber, err := strconv.ParseFloat(versionString[index+1:], 64); err == nil {
+			relevance += versionNumber / 1000
+		}
+	}
+
+	return relevance
 }
 
 // canonicalize gets the result of canonicalizing the packages using the results
diff --git a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
index 2c4527f24..1335a5eed 100644
--- a/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
+++ b/vendor/golang.org/x/tools/internal/packagesinternal/packages.go
@@ -12,3 +12,6 @@ var GetGoCmdRunner = func(config interface{}) *gocommand.Runner { return nil }
 var SetGoCmdRunner = func(config interface{}, runner *gocommand.Runner) {}
 
 var TypecheckCgo int
+
+var SetModFlag = func(config interface{}, value string) {}
+var SetModFile = func(config interface{}, value string) {}
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
new file mode 100644
index 000000000..65473eb22
--- /dev/null
+++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode.go
@@ -0,0 +1,1358 @@
+// Copyright 2020 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package typesinternal
+
+//go:generate stringer -type=ErrorCode
+
+type ErrorCode int
+
+// This file defines the error codes that can be produced during type-checking.
+// Collectively, these codes provide an identifier that may be used to
+// implement special handling for certain types of errors.
+//
+// Error codes should be fine-grained enough that the exact nature of the error
+// can be easily determined, but coarse enough that they are not an
+// implementation detail of the type checking algorithm. As a rule-of-thumb,
+// errors should be considered equivalent if there is a theoretical refactoring
+// of the type checker in which they are emitted in exactly one place. For
+// example, the type checker emits different error messages for "too many
+// arguments" and "too few arguments", but one can imagine an alternative type
+// checker where this check instead just emits a single "wrong number of
+// arguments", so these errors should have the same code.
+//
+// Error code names should be as brief as possible while retaining accuracy and
+// distinctiveness. In most cases names should start with an adjective
+// describing the nature of the error (e.g. "invalid", "unused", "misplaced"),
+// and end with a noun identifying the relevant language object. For example,
+// "DuplicateDecl" or "InvalidSliceExpr". For brevity, naming follows the
+// convention that "bad" implies a problem with syntax, and "invalid" implies a
+// problem with types.
+
+const (
+	_ ErrorCode = iota
+
+	// Test is reserved for errors that only apply while in self-test mode.
+	Test
+
+	/* package names */
+
+	// BlankPkgName occurs when a package name is the blank identifier "_".
+	//
+	// Per the spec:
+	//  "The PackageName must not be the blank identifier."
+	BlankPkgName
+
+	// MismatchedPkgName occurs when a file's package name doesn't match the
+	// package name already established by other files.
+	MismatchedPkgName
+
+	// InvalidPkgUse occurs when a package identifier is used outside of a
+	// selector expression.
+	//
+	// Example:
+	//  import "fmt"
+	//
+	//  var _ = fmt
+	InvalidPkgUse
+
+	/* imports */
+
+	// BadImportPath occurs when an import path is not valid.
+	BadImportPath
+
+	// BrokenImport occurs when importing a package fails.
+	//
+	// Example:
+	//  import "amissingpackage"
+	BrokenImport
+
+	// ImportCRenamed occurs when the special import "C" is renamed. "C" is a
+	// pseudo-package, and must not be renamed.
+	//
+	// Example:
+	//  import _ "C"
+	ImportCRenamed
+
+	// UnusedImport occurs when an import is unused.
+	//
+	// Example:
+	//  import "fmt"
+	//
+	//  func main() {}
+	UnusedImport
+
+	/* initialization */
+
+	// InvalidInitCycle occurs when an invalid cycle is detected within the
+	// initialization graph.
+	//
+	// Example:
+	//  var x int = f()
+	//
+	//  func f() int { return x }
+	InvalidInitCycle
+
+	/* decls */
+
+	// DuplicateDecl occurs when an identifier is declared multiple times.
+	//
+	// Example:
+	//  var x = 1
+	//  var x = 2
+	DuplicateDecl
+
+	// InvalidDeclCycle occurs when a declaration cycle is not valid.
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  type T struct {
+	//  	a [n]int
+	//  }
+	//
+	//  var n = unsafe.Sizeof(T{})
+	InvalidDeclCycle
+
+	// InvalidTypeCycle occurs when a cycle in type definitions results in a
+	// type that is not well-defined.
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  type T [unsafe.Sizeof(T{})]int
+	InvalidTypeCycle
+
+	/* decls > const */
+
+	// InvalidConstInit occurs when a const declaration has a non-constant
+	// initializer.
+	//
+	// Example:
+	//  var x int
+	//  const _ = x
+	InvalidConstInit
+
+	// InvalidConstVal occurs when a const value cannot be converted to its
+	// target type.
+	//
+	// TODO(findleyr): this error code and example are not very clear. Consider
+	// removing it.
+	//
+	// Example:
+	//  const _ = 1 << "hello"
+	InvalidConstVal
+
+	// InvalidConstType occurs when the underlying type in a const declaration
+	// is not a valid constant type.
+	//
+	// Example:
+	//  const c *int = 4
+	InvalidConstType
+
+	/* decls > var (+ other variable assignment codes) */
+
+	// UntypedNil occurs when the predeclared (untyped) value nil is used to
+	// initialize a variable declared without an explicit type.
+	//
+	// Example:
+	//  var x = nil
+	UntypedNil
+
+	// WrongAssignCount occurs when the number of values on the right-hand side
+	// of an assignment or or initialization expression does not match the number
+	// of variables on the left-hand side.
+	//
+	// Example:
+	//  var x = 1, 2
+	WrongAssignCount
+
+	// UnassignableOperand occurs when the left-hand side of an assignment is
+	// not assignable.
+	//
+	// Example:
+	//  func f() {
+	//  	const c = 1
+	//  	c = 2
+	//  }
+	UnassignableOperand
+
+	// NoNewVar occurs when a short variable declaration (':=') does not declare
+	// new variables.
+	//
+	// Example:
+	//  func f() {
+	//  	x := 1
+	//  	x := 2
+	//  }
+	NoNewVar
+
+	// MultiValAssignOp occurs when an assignment operation (+=, *=, etc) does
+	// not have single-valued left-hand or right-hand side.
+	//
+	// Per the spec:
+	//  "In assignment operations, both the left- and right-hand expression lists
+	//  must contain exactly one single-valued expression"
+	//
+	// Example:
+	//  func f() int {
+	//  	x, y := 1, 2
+	//  	x, y += 1
+	//  	return x + y
+	//  }
+	MultiValAssignOp
+
+	// InvalidIfaceAssign occurs when a value of type T is used as an
+	// interface, but T does not implement a method of the expected interface.
+	//
+	// Example:
+	//  type I interface {
+	//  	f()
+	//  }
+	//
+	//  type T int
+	//
+	//  var x I = T(1)
+	InvalidIfaceAssign
+
+	// InvalidChanAssign occurs when a chan assignment is invalid.
+	//
+	// Per the spec, a value x is assignable to a channel type T if:
+	//  "x is a bidirectional channel value, T is a channel type, x's type V and
+	//  T have identical element types, and at least one of V or T is not a
+	//  defined type."
+	//
+	// Example:
+	//  type T1 chan int
+	//  type T2 chan int
+	//
+	//  var x T1
+	//  // Invalid assignment because both types are named
+	//  var _ T2 = x
+	InvalidChanAssign
+
+	// IncompatibleAssign occurs when the type of the right-hand side expression
+	// in an assignment cannot be assigned to the type of the variable being
+	// assigned.
+	//
+	// Example:
+	//  var x []int
+	//  var _ int = x
+	IncompatibleAssign
+
+	// UnaddressableFieldAssign occurs when trying to assign to a struct field
+	// in a map value.
+	//
+	// Example:
+	//  func f() {
+	//  	m := make(map[string]struct{i int})
+	//  	m["foo"].i = 42
+	//  }
+	UnaddressableFieldAssign
+
+	/* decls > type (+ other type expression codes) */
+
+	// NotAType occurs when the identifier used as the underlying type in a type
+	// declaration or the right-hand side of a type alias does not denote a type.
+	//
+	// Example:
+	//  var S = 2
+	//
+	//  type T S
+	NotAType
+
+	// InvalidArrayLen occurs when an array length is not a constant value.
+	//
+	// Example:
+	//  var n = 3
+	//  var _ = [n]int{}
+	InvalidArrayLen
+
+	// BlankIfaceMethod occurs when a method name is '_'.
+	//
+	// Per the spec:
+	//  "The name of each explicitly specified method must be unique and not
+	//  blank."
+	//
+	// Example:
+	//  type T interface {
+	//  	_(int)
+	//  }
+	BlankIfaceMethod
+
+	// IncomparableMapKey occurs when a map key type does not support the == and
+	// != operators.
+	//
+	// Per the spec:
+	//  "The comparison operators == and != must be fully defined for operands of
+	//  the key type; thus the key type must not be a function, map, or slice."
+	//
+	// Example:
+	//  var x map[T]int
+	//
+	//  type T []int
+	IncomparableMapKey
+
+	// InvalidIfaceEmbed occurs when a non-interface type is embedded in an
+	// interface.
+	//
+	// Example:
+	//  type T struct {}
+	//
+	//  func (T) m()
+	//
+	//  type I interface {
+	//  	T
+	//  }
+	InvalidIfaceEmbed
+
+	// InvalidPtrEmbed occurs when an embedded field is of the pointer form *T,
+	// and T itself is itself a pointer, an unsafe.Pointer, or an interface.
+	//
+	// Per the spec:
+	//  "An embedded field must be specified as a type name T or as a pointer to
+	//  a non-interface type name *T, and T itself may not be a pointer type."
+	//
+	// Example:
+	//  type T *int
+	//
+	//  type S struct {
+	//  	*T
+	//  }
+	InvalidPtrEmbed
+
+	/* decls > func and method */
+
+	// BadRecv occurs when a method declaration does not have exactly one
+	// receiver parameter.
+	//
+	// Example:
+	//  func () _() {}
+	BadRecv
+
+	// InvalidRecv occurs when a receiver type expression is not of the form T
+	// or *T, or T is a pointer type.
+	//
+	// Example:
+	//  type T struct {}
+	//
+	//  func (**T) m() {}
+	InvalidRecv
+
+	// DuplicateFieldAndMethod occurs when an identifier appears as both a field
+	// and method name.
+	//
+	// Example:
+	//  type T struct {
+	//  	m int
+	//  }
+	//
+	//  func (T) m() {}
+	DuplicateFieldAndMethod
+
+	// DuplicateMethod occurs when two methods on the same receiver type have
+	// the same name.
+	//
+	// Example:
+	//  type T struct {}
+	//  func (T) m() {}
+	//  func (T) m(i int) int { return i }
+	DuplicateMethod
+
+	/* decls > special */
+
+	// InvalidBlank occurs when a blank identifier is used as a value or type.
+	//
+	// Per the spec:
+	//  "The blank identifier may appear as an operand only on the left-hand side
+	//  of an assignment."
+	//
+	// Example:
+	//  var x = _
+	InvalidBlank
+
+	// InvalidIota occurs when the predeclared identifier iota is used outside
+	// of a constant declaration.
+	//
+	// Example:
+	//  var x = iota
+	InvalidIota
+
+	// MissingInitBody occurs when an init function is missing its body.
+	//
+	// Example:
+	//  func init()
+	MissingInitBody
+
+	// InvalidInitSig occurs when an init function declares parameters or
+	// results.
+	//
+	// Example:
+	//  func init() int { return 1 }
+	InvalidInitSig
+
+	// InvalidInitDecl occurs when init is declared as anything other than a
+	// function.
+	//
+	// Example:
+	//  var init = 1
+	InvalidInitDecl
+
+	// InvalidMainDecl occurs when main is declared as anything other than a
+	// function, in a main package.
+	InvalidMainDecl
+
+	/* exprs */
+
+	// TooManyValues occurs when a function returns too many values for the
+	// expression context in which it is used.
+	//
+	// Example:
+	//  func ReturnTwo() (int, int) {
+	//  	return 1, 2
+	//  }
+	//
+	//  var x = ReturnTwo()
+	TooManyValues
+
+	// NotAnExpr occurs when a type expression is used where a value expression
+	// is expected.
+	//
+	// Example:
+	//  type T struct {}
+	//
+	//  func f() {
+	//  	T
+	//  }
+	NotAnExpr
+
+	/* exprs > const */
+
+	// TruncatedFloat occurs when a float constant is truncated to an integer
+	// value.
+	//
+	// Example:
+	//  var _ int = 98.6
+	TruncatedFloat
+
+	// NumericOverflow occurs when a numeric constant overflows its target type.
+	//
+	// Example:
+	//  var x int8 = 1000
+	NumericOverflow
+
+	/* exprs > operation */
+
+	// UndefinedOp occurs when an operator is not defined for the type(s) used
+	// in an operation.
+	//
+	// Example:
+	//  var c = "a" - "b"
+	UndefinedOp
+
+	// MismatchedTypes occurs when operand types are incompatible in a binary
+	// operation.
+	//
+	// Example:
+	//  var a = "hello"
+	//  var b = 1
+	//  var c = a - b
+	MismatchedTypes
+
+	// DivByZero occurs when a division operation is provable at compile
+	// time to be a division by zero.
+	//
+	// Example:
+	//  const divisor = 0
+	//  var x int = 1/divisor
+	DivByZero
+
+	// NonNumericIncDec occurs when an increment or decrement operator is
+	// applied to a non-numeric value.
+	//
+	// Example:
+	//  func f() {
+	//  	var c = "c"
+	//  	c++
+	//  }
+	NonNumericIncDec
+
+	/* exprs > ptr */
+
+	// UnaddressableOperand occurs when the & operator is applied to an
+	// unaddressable expression.
+	//
+	// Example:
+	//  var x = &1
+	UnaddressableOperand
+
+	// InvalidIndirection occurs when a non-pointer value is indirected via the
+	// '*' operator.
+	//
+	// Example:
+	//  var x int
+	//  var y = *x
+	InvalidIndirection
+
+	/* exprs > [] */
+
+	// NonIndexableOperand occurs when an index operation is applied to a value
+	// that cannot be indexed.
+	//
+	// Example:
+	//  var x = 1
+	//  var y = x[1]
+	NonIndexableOperand
+
+	// InvalidIndex occurs when an index argument is not of integer type,
+	// negative, or out-of-bounds.
+	//
+	// Example:
+	//  var s = [...]int{1,2,3}
+	//  var x = s[5]
+	//
+	// Example:
+	//  var s = []int{1,2,3}
+	//  var _ = s[-1]
+	//
+	// Example:
+	//  var s = []int{1,2,3}
+	//  var i string
+	//  var _ = s[i]
+	InvalidIndex
+
+	// SwappedSliceIndices occurs when constant indices in a slice expression
+	// are decreasing in value.
+	//
+	// Example:
+	//  var _ = []int{1,2,3}[2:1]
+	SwappedSliceIndices
+
+	/* operators > slice */
+
+	// NonSliceableOperand occurs when a slice operation is applied to a value
+	// whose type is not sliceable, or is unaddressable.
+	//
+	// Example:
+	//  var x = [...]int{1, 2, 3}[:1]
+	//
+	// Example:
+	//  var x = 1
+	//  var y = 1[:1]
+	NonSliceableOperand
+
+	// InvalidSliceExpr occurs when a three-index slice expression (a[x:y:z]) is
+	// applied to a string.
+	//
+	// Example:
+	//  var s = "hello"
+	//  var x = s[1:2:3]
+	InvalidSliceExpr
+
+	/* exprs > shift */
+
+	// InvalidShiftCount occurs when the right-hand side of a shift operation is
+	// either non-integer, negative, or too large.
+	//
+	// Example:
+	//  var (
+	//  	x string
+	//  	y int = 1 << x
+	//  )
+	InvalidShiftCount
+
+	// InvalidShiftOperand occurs when the shifted operand is not an integer.
+	//
+	// Example:
+	//  var s = "hello"
+	//  var x = s << 2
+	InvalidShiftOperand
+
+	/* exprs > chan */
+
+	// InvalidReceive occurs when there is a channel receive from a value that
+	// is either not a channel, or is a send-only channel.
+	//
+	// Example:
+	//  func f() {
+	//  	var x = 1
+	//  	<-x
+	//  }
+	InvalidReceive
+
+	// InvalidSend occurs when there is a channel send to a value that is not a
+	// channel, or is a receive-only channel.
+	//
+	// Example:
+	//  func f() {
+	//  	var x = 1
+	//  	x <- "hello!"
+	//  }
+	InvalidSend
+
+	/* exprs > literal */
+
+	// DuplicateLitKey occurs when an index is duplicated in a slice, array, or
+	// map literal.
+	//
+	// Example:
+	//  var _ = []int{0:1, 0:2}
+	//
+	// Example:
+	//  var _ = map[string]int{"a": 1, "a": 2}
+	DuplicateLitKey
+
+	// MissingLitKey occurs when a map literal is missing a key expression.
+	//
+	// Example:
+	//  var _ = map[string]int{1}
+	MissingLitKey
+
+	// InvalidLitIndex occurs when the key in a key-value element of a slice or
+	// array literal is not an integer constant.
+	//
+	// Example:
+	//  var i = 0
+	//  var x = []string{i: "world"}
+	InvalidLitIndex
+
+	// OversizeArrayLit occurs when an array literal exceeds its length.
+	//
+	// Example:
+	//  var _ = [2]int{1,2,3}
+	OversizeArrayLit
+
+	// MixedStructLit occurs when a struct literal contains a mix of positional
+	// and named elements.
+	//
+	// Example:
+	//  var _ = struct{i, j int}{i: 1, 2}
+	MixedStructLit
+
+	// InvalidStructLit occurs when a positional struct literal has an incorrect
+	// number of values.
+	//
+	// Example:
+	//  var _ = struct{i, j int}{1,2,3}
+	InvalidStructLit
+
+	// MissingLitField occurs when a struct literal refers to a field that does
+	// not exist on the struct type.
+	//
+	// Example:
+	//  var _ = struct{i int}{j: 2}
+	MissingLitField
+
+	// DuplicateLitField occurs when a struct literal contains duplicated
+	// fields.
+	//
+	// Example:
+	//  var _ = struct{i int}{i: 1, i: 2}
+	DuplicateLitField
+
+	// UnexportedLitField occurs when a positional struct literal implicitly
+	// assigns an unexported field of an imported type.
+	UnexportedLitField
+
+	// InvalidLitField occurs when a field name is not a valid identifier.
+	//
+	// Example:
+	//  var _ = struct{i int}{1: 1}
+	InvalidLitField
+
+	// UntypedLit occurs when a composite literal omits a required type
+	// identifier.
+	//
+	// Example:
+	//  type outer struct{
+	//  	inner struct { i int }
+	//  }
+	//
+	//  var _ = outer{inner: {1}}
+	UntypedLit
+
+	// InvalidLit occurs when a composite literal expression does not match its
+	// type.
+	//
+	// Example:
+	//  type P *struct{
+	//  	x int
+	//  }
+	//  var _ = P {}
+	InvalidLit
+
+	/* exprs > selector */
+
+	// AmbiguousSelector occurs when a selector is ambiguous.
+	//
+	// Example:
+	//  type E1 struct { i int }
+	//  type E2 struct { i int }
+	//  type T struct { E1; E2 }
+	//
+	//  var x T
+	//  var _ = x.i
+	AmbiguousSelector
+
+	// UndeclaredImportedName occurs when a package-qualified identifier is
+	// undeclared by the imported package.
+	//
+	// Example:
+	//  import "go/types"
+	//
+	//  var _ = types.NotAnActualIdentifier
+	UndeclaredImportedName
+
+	// UnexportedName occurs when a selector refers to an unexported identifier
+	// of an imported package.
+	//
+	// Example:
+	//  import "reflect"
+	//
+	//  type _ reflect.flag
+	UnexportedName
+
+	// UndeclaredName occurs when an identifier is not declared in the current
+	// scope.
+	//
+	// Example:
+	//  var x T
+	UndeclaredName
+
+	// MissingFieldOrMethod occurs when a selector references a field or method
+	// that does not exist.
+	//
+	// Example:
+	//  type T struct {}
+	//
+	//  var x = T{}.f
+	MissingFieldOrMethod
+
+	/* exprs > ... */
+
+	// BadDotDotDotSyntax occurs when a "..." occurs in a context where it is
+	// not valid.
+	//
+	// Example:
+	//  var _ = map[int][...]int{0: {}}
+	BadDotDotDotSyntax
+
+	// NonVariadicDotDotDot occurs when a "..." is used on the final argument to
+	// a non-variadic function.
+	//
+	// Example:
+	//  func printArgs(s []string) {
+	//  	for _, a := range s {
+	//  		println(a)
+	//  	}
+	//  }
+	//
+	//  func f() {
+	//  	s := []string{"a", "b", "c"}
+	//  	printArgs(s...)
+	//  }
+	NonVariadicDotDotDot
+
+	// MisplacedDotDotDot occurs when a "..." is used somewhere other than the
+	// final argument to a function call.
+	//
+	// Example:
+	//  func printArgs(args ...int) {
+	//  	for _, a := range args {
+	//  		println(a)
+	//  	}
+	//  }
+	//
+	//  func f() {
+	//  	a := []int{1,2,3}
+	//  	printArgs(0, a...)
+	//  }
+	MisplacedDotDotDot
+
+	// InvalidDotDotDotOperand occurs when a "..." operator is applied to a
+	// single-valued operand.
+	//
+	// Example:
+	//  func printArgs(args ...int) {
+	//  	for _, a := range args {
+	//  		println(a)
+	//  	}
+	//  }
+	//
+	//  func f() {
+	//  	a := 1
+	//  	printArgs(a...)
+	//  }
+	//
+	// Example:
+	//  func args() (int, int) {
+	//  	return 1, 2
+	//  }
+	//
+	//  func printArgs(args ...int) {
+	//  	for _, a := range args {
+	//  		println(a)
+	//  	}
+	//  }
+	//
+	//  func g() {
+	//  	printArgs(args()...)
+	//  }
+	InvalidDotDotDotOperand
+
+	// InvalidDotDotDot occurs when a "..." is used in a non-variadic built-in
+	// function.
+	//
+	// Example:
+	//  var s = []int{1, 2, 3}
+	//  var l = len(s...)
+	InvalidDotDotDot
+
+	/* exprs > built-in */
+
+	// UncalledBuiltin occurs when a built-in function is used as a
+	// function-valued expression, instead of being called.
+	//
+	// Per the spec:
+	//  "The built-in functions do not have standard Go types, so they can only
+	//  appear in call expressions; they cannot be used as function values."
+	//
+	// Example:
+	//  var _ = copy
+	UncalledBuiltin
+
+	// InvalidAppend occurs when append is called with a first argument that is
+	// not a slice.
+	//
+	// Example:
+	//  var _ = append(1, 2)
+	InvalidAppend
+
+	// InvalidCap occurs when an argument to the cap built-in function is not of
+	// supported type.
+	//
+	// See https://golang.org/ref/spec#Lengthand_capacity for information on
+	// which underlying types are supported as arguments to cap and len.
+	//
+	// Example:
+	//  var s = 2
+	//  var x = cap(s)
+	InvalidCap
+
+	// InvalidClose occurs when close(...) is called with an argument that is
+	// not of channel type, or that is a receive-only channel.
+	//
+	// Example:
+	//  func f() {
+	//  	var x int
+	//  	close(x)
+	//  }
+	InvalidClose
+
+	// InvalidCopy occurs when the arguments are not of slice type or do not
+	// have compatible type.
+	//
+	// See https://golang.org/ref/spec#Appendingand_copying_slices for more
+	// information on the type requirements for the copy built-in.
+	//
+	// Example:
+	//  func f() {
+	//  	var x []int
+	//  	y := []int64{1,2,3}
+	//  	copy(x, y)
+	//  }
+	InvalidCopy
+
+	// InvalidComplex occurs when the complex built-in function is called with
+	// arguments with incompatible types.
+	//
+	// Example:
+	//  var _ = complex(float32(1), float64(2))
+	InvalidComplex
+
+	// InvalidDelete occurs when the delete built-in function is called with a
+	// first argument that is not a map.
+	//
+	// Example:
+	//  func f() {
+	//  	m := "hello"
+	//  	delete(m, "e")
+	//  }
+	InvalidDelete
+
+	// InvalidImag occurs when the imag built-in function is called with an
+	// argument that does not have complex type.
+	//
+	// Example:
+	//  var _ = imag(int(1))
+	InvalidImag
+
+	// InvalidLen occurs when an argument to the len built-in function is not of
+	// supported type.
+	//
+	// See https://golang.org/ref/spec#Lengthand_capacity for information on
+	// which underlying types are supported as arguments to cap and len.
+	//
+	// Example:
+	//  var s = 2
+	//  var x = len(s)
+	InvalidLen
+
+	// SwappedMakeArgs occurs when make is called with three arguments, and its
+	// length argument is larger than its capacity argument.
+	//
+	// Example:
+	//  var x = make([]int, 3, 2)
+	SwappedMakeArgs
+
+	// InvalidMake occurs when make is called with an unsupported type argument.
+	//
+	// See https://golang.org/ref/spec#Makingslices_maps_and_channels for
+	// information on the types that may be created using make.
+	//
+	// Example:
+	//  var x = make(int)
+	InvalidMake
+
+	// InvalidReal occurs when the real built-in function is called with an
+	// argument that does not have complex type.
+	//
+	// Example:
+	//  var _ = real(int(1))
+	InvalidReal
+
+	/* exprs > assertion */
+
+	// InvalidAssert occurs when a type assertion is applied to a
+	// value that is not of interface type.
+	//
+	// Example:
+	//  var x = 1
+	//  var _ = x.(float64)
+	InvalidAssert
+
+	// ImpossibleAssert occurs for a type assertion x.(T) when the value x of
+	// interface cannot have dynamic type T, due to a missing or mismatching
+	// method on T.
+	//
+	// Example:
+	//  type T int
+	//
+	//  func (t *T) m() int { return int(*t) }
+	//
+	//  type I interface { m() int }
+	//
+	//  var x I
+	//  var _ = x.(T)
+	ImpossibleAssert
+
+	/* exprs > conversion */
+
+	// InvalidConversion occurs when the argument type cannot be converted to the
+	// target.
+	//
+	// See https://golang.org/ref/spec#Conversions for the rules of
+	// convertibility.
+	//
+	// Example:
+	//  var x float64
+	//  var _ = string(x)
+	InvalidConversion
+
+	// InvalidUntypedConversion occurs when an there is no valid implicit
+	// conversion from an untyped value satisfying the type constraints of the
+	// context in which it is used.
+	//
+	// Example:
+	//  var _ = 1 + ""
+	InvalidUntypedConversion
+
+	/* offsetof */
+
+	// BadOffsetofSyntax occurs when unsafe.Offsetof is called with an argument
+	// that is not a selector expression.
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  var x int
+	//  var _ = unsafe.Offsetof(x)
+	BadOffsetofSyntax
+
+	// InvalidOffsetof occurs when unsafe.Offsetof is called with a method
+	// selector, rather than a field selector, or when the field is embedded via
+	// a pointer.
+	//
+	// Per the spec:
+	//
+	//  "If f is an embedded field, it must be reachable without pointer
+	//  indirections through fields of the struct. "
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  type T struct { f int }
+	//  type S struct { *T }
+	//  var s S
+	//  var _ = unsafe.Offsetof(s.f)
+	//
+	// Example:
+	//  import "unsafe"
+	//
+	//  type S struct{}
+	//
+	//  func (S) m() {}
+	//
+	//  var s S
+	//  var _ = unsafe.Offsetof(s.m)
+	InvalidOffsetof
+
+	/* control flow > scope */
+
+	// UnusedExpr occurs when a side-effect free expression is used as a
+	// statement. Such a statement has no effect.
+	//
+	// Example:
+	//  func f(i int) {
+	//  	i*i
+	//  }
+	UnusedExpr
+
+	// UnusedVar occurs when a variable is declared but unused.
+	//
+	// Example:
+	//  func f() {
+	//  	x := 1
+	//  }
+	UnusedVar
+
+	// MissingReturn occurs when a function with results is missing a return
+	// statement.
+	//
+	// Example:
+	//  func f() int {}
+	MissingReturn
+
+	// WrongResultCount occurs when a return statement returns an incorrect
+	// number of values.
+	//
+	// Example:
+	//  func ReturnOne() int {
+	//  	return 1, 2
+	//  }
+	WrongResultCount
+
+	// OutOfScopeResult occurs when the name of a value implicitly returned by
+	// an empty return statement is shadowed in a nested scope.
+	//
+	// Example:
+	//  func factor(n int) (i int) {
+	//  	for i := 2; i < n; i++ {
+	//  		if n%i == 0 {
+	//  			return
+	//  		}
+	//  	}
+	//  	return 0
+	//  }
+	OutOfScopeResult
+
+	/* control flow > if */
+
+	// InvalidCond occurs when an if condition is not a boolean expression.
+	//
+	// Example:
+	//  func checkReturn(i int) {
+	//  	if i {
+	//  		panic("non-zero return")
+	//  	}
+	//  }
+	InvalidCond
+
+	/* control flow > for */
+
+	// InvalidPostDecl occurs when there is a declaration in a for-loop post
+	// statement.
+	//
+	// Example:
+	//  func f() {
+	//  	for i := 0; i < 10; j := 0 {}
+	//  }
+	InvalidPostDecl
+
+	// InvalidChanRange occurs when a send-only channel used in a range
+	// expression.
+	//
+	// Example:
+	//  func sum(c chan<- int) {
+	//  	s := 0
+	//  	for i := range c {
+	//  		s += i
+	//  	}
+	//  }
+	InvalidChanRange
+
+	// InvalidIterVar occurs when two iteration variables are used while ranging
+	// over a channel.
+	//
+	// Example:
+	//  func f(c chan int) {
+	//  	for k, v := range c {
+	//  		println(k, v)
+	//  	}
+	//  }
+	InvalidIterVar
+
+	// InvalidRangeExpr occurs when the type of a range expression is not array,
+	// slice, string, map, or channel.
+	//
+	// Example:
+	//  func f(i int) {
+	//  	for j := range i {
+	//  		println(j)
+	//  	}
+	//  }
+	InvalidRangeExpr
+
+	/* control flow > switch */
+
+	// MisplacedBreak occurs when a break statement is not within a for, switch,
+	// or select statement of the innermost function definition.
+	//
+	// Example:
+	//  func f() {
+	//  	break
+	//  }
+	MisplacedBreak
+
+	// MisplacedContinue occurs when a continue statement is not within a for
+	// loop of the innermost function definition.
+	//
+	// Example:
+	//  func sumeven(n int) int {
+	//  	proceed := func() {
+	//  		continue
+	//  	}
+	//  	sum := 0
+	//  	for i := 1; i <= n; i++ {
+	//  		if i % 2 != 0 {
+	//  			proceed()
+	//  		}
+	//  		sum += i
+	//  	}
+	//  	return sum
+	//  }
+	MisplacedContinue
+
+	// MisplacedFallthrough occurs when a fallthrough statement is not within an
+	// expression switch.
+	//
+	// Example:
+	//  func typename(i interface{}) string {
+	//  	switch i.(type) {
+	//  	case int64:
+	//  		fallthrough
+	//  	case int:
+	//  		return "int"
+	//  	}
+	//  	return "unsupported"
+	//  }
+	MisplacedFallthrough
+
+	// DuplicateCase occurs when a type or expression switch has duplicate
+	// cases.
+	//
+	// Example:
+	//  func printInt(i int) {
+	//  	switch i {
+	//  	case 1:
+	//  		println("one")
+	//  	case 1:
+	//  		println("One")
+	//  	}
+	//  }
+	DuplicateCase
+
+	// DuplicateDefault occurs when a type or expression switch has multiple
+	// default clauses.
+	//
+	// Example:
+	//  func printInt(i int) {
+	//  	switch i {
+	//  	case 1:
+	//  		println("one")
+	//  	default:
+	//  		println("One")
+	//  	default:
+	//  		println("1")
+	//  	}
+	//  }
+	DuplicateDefault
+
+	// BadTypeKeyword occurs when a .(type) expression is used anywhere other
+	// than a type switch.
+	//
+	// Example:
+	//  type I interface {
+	//  	m()
+	//  }
+	//  var t I
+	//  var _ = t.(type)
+	BadTypeKeyword
+
+	// InvalidTypeSwitch occurs when .(type) is used on an expression that is
+	// not of interface type.
+	//
+	// Example:
+	//  func f(i int) {
+	//  	switch x := i.(type) {}
+	//  }
+	InvalidTypeSwitch
+
+	/* control flow > select */
+
+	// InvalidSelectCase occurs when a select case is not a channel send or
+	// receive.
+	//
+	// Example:
+	//  func checkChan(c <-chan int) bool {
+	//  	select {
+	//  	case c:
+	//  		return true
+	//  	default:
+	//  		return false
+	//  	}
+	//  }
+	InvalidSelectCase
+
+	/* control flow > labels and jumps */
+
+	// UndeclaredLabel occurs when an undeclared label is jumped to.
+	//
+	// Example:
+	//  func f() {
+	//  	goto L
+	//  }
+	UndeclaredLabel
+
+	// DuplicateLabel occurs when a label is declared more than once.
+	//
+	// Example:
+	//  func f() int {
+	//  L:
+	//  L:
+	//  	return 1
+	//  }
+	DuplicateLabel
+
+	// MisplacedLabel occurs when a break or continue label is not on a for,
+	// switch, or select statement.
+	//
+	// Example:
+	//  func f() {
+	//  L:
+	//  	a := []int{1,2,3}
+	//  	for _, e := range a {
+	//  		if e > 10 {
+	//  			break L
+	//  		}
+	//  		println(a)
+	//  	}
+	//  }
+	MisplacedLabel
+
+	// UnusedLabel occurs when a label is declared but not used.
+	//
+	// Example:
+	//  func f() {
+	//  L:
+	//  }
+	UnusedLabel
+
+	// JumpOverDecl occurs when a label jumps over a variable declaration.
+	//
+	// Example:
+	//  func f() int {
+	//  	goto L
+	//  	x := 2
+	//  L:
+	//  	x++
+	//  	return x
+	//  }
+	JumpOverDecl
+
+	// JumpIntoBlock occurs when a forward jump goes to a label inside a nested
+	// block.
+	//
+	// Example:
+	//  func f(x int) {
+	//  	goto L
+	//  	if x > 0 {
+	//  	L:
+	//  		print("inside block")
+	//  	}
+	// }
+	JumpIntoBlock
+
+	/* control flow > calls */
+
+	// InvalidMethodExpr occurs when a pointer method is called but the argument
+	// is not addressable.
+	//
+	// Example:
+	//  type T struct {}
+	//
+	//  func (*T) m() int { return 1 }
+	//
+	//  var _ = T.m(T{})
+	InvalidMethodExpr
+
+	// WrongArgCount occurs when too few or too many arguments are passed by a
+	// function call.
+	//
+	// Example:
+	//  func f(i int) {}
+	//  var x = f()
+	WrongArgCount
+
+	// InvalidCall occurs when an expression is called that is not of function
+	// type.
+	//
+	// Example:
+	//  var x = "x"
+	//  var y = x()
+	InvalidCall
+
+	/* control flow > suspended */
+
+	// UnusedResults occurs when a restricted expression-only built-in function
+	// is suspended via go or defer. Such a suspension discards the results of
+	// these side-effect free built-in functions, and therefore is ineffectual.
+	//
+	// Example:
+	//  func f(a []int) int {
+	//  	defer len(a)
+	//  	return i
+	//  }
+	UnusedResults
+
+	// InvalidDefer occurs when a deferred expression is not a function call,
+	// for example if the expression is a type conversion.
+	//
+	// Example:
+	//  func f(i int) int {
+	//  	defer int32(i)
+	//  	return i
+	//  }
+	InvalidDefer
+
+	// InvalidGo occurs when a go expression is not a function call, for example
+	// if the expression is a type conversion.
+	//
+	// Example:
+	//  func f(i int) int {
+	//  	go int32(i)
+	//  	return i
+	//  }
+	InvalidGo
+)
diff --git a/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
new file mode 100644
index 000000000..97f3ec891
--- /dev/null
+++ b/vendor/golang.org/x/tools/internal/typesinternal/errorcode_string.go
@@ -0,0 +1,152 @@
+// Code generated by "stringer -type=ErrorCode"; DO NOT EDIT.
+
+package typesinternal
+
+import "strconv"
+
+func _() {
+	// An "invalid array index" compiler error signifies that the constant values have changed.
+	// Re-run the stringer command to generate them again.
+	var x [1]struct{}
+	_ = x[Test-1]
+	_ = x[BlankPkgName-2]
+	_ = x[MismatchedPkgName-3]
+	_ = x[InvalidPkgUse-4]
+	_ = x[BadImportPath-5]
+	_ = x[BrokenImport-6]
+	_ = x[ImportCRenamed-7]
+	_ = x[UnusedImport-8]
+	_ = x[InvalidInitCycle-9]
+	_ = x[DuplicateDecl-10]
+	_ = x[InvalidDeclCycle-11]
+	_ = x[InvalidTypeCycle-12]
+	_ = x[InvalidConstInit-13]
+	_ = x[InvalidConstVal-14]
+	_ = x[InvalidConstType-15]
+	_ = x[UntypedNil-16]
+	_ = x[WrongAssignCount-17]
+	_ = x[UnassignableOperand-18]
+	_ = x[NoNewVar-19]
+	_ = x[MultiValAssignOp-20]
+	_ = x[InvalidIfaceAssign-21]
+	_ = x[InvalidChanAssign-22]
+	_ = x[IncompatibleAssign-23]
+	_ = x[UnaddressableFieldAssign-24]
+	_ = x[NotAType-25]
+	_ = x[InvalidArrayLen-26]
+	_ = x[BlankIfaceMethod-27]
+	_ = x[IncomparableMapKey-28]
+	_ = x[InvalidIfaceEmbed-29]
+	_ = x[InvalidPtrEmbed-30]
+	_ = x[BadRecv-31]
+	_ = x[InvalidRecv-32]
+	_ = x[DuplicateFieldAndMethod-33]
+	_ = x[DuplicateMethod-34]
+	_ = x[InvalidBlank-35]
+	_ = x[InvalidIota-36]
+	_ = x[MissingInitBody-37]
+	_ = x[InvalidInitSig-38]
+	_ = x[InvalidInitDecl-39]
+	_ = x[InvalidMainDecl-40]
+	_ = x[TooManyValues-41]
+	_ = x[NotAnExpr-42]
+	_ = x[TruncatedFloat-43]
+	_ = x[NumericOverflow-44]
+	_ = x[UndefinedOp-45]
+	_ = x[MismatchedTypes-46]
+	_ = x[DivByZero-47]
+	_ = x[NonNumericIncDec-48]
+	_ = x[UnaddressableOperand-49]
+	_ = x[InvalidIndirection-50]
+	_ = x[NonIndexableOperand-51]
+	_ = x[InvalidIndex-52]
+	_ = x[SwappedSliceIndices-53]
+	_ = x[NonSliceableOperand-54]
+	_ = x[InvalidSliceExpr-55]
+	_ = x[InvalidShiftCount-56]
+	_ = x[InvalidShiftOperand-57]
+	_ = x[InvalidReceive-58]
+	_ = x[InvalidSend-59]
+	_ = x[DuplicateLitKey-60]
+	_ = x[MissingLitKey-61]
+	_ = x[InvalidLitIndex-62]
+	_ = x[OversizeArrayLit-63]
+	_ = x[MixedStructLit-64]
+	_ = x[InvalidStructLit-65]
+	_ = x[MissingLitField-66]
+	_ = x[DuplicateLitField-67]
+	_ = x[UnexportedLitField-68]
+	_ = x[InvalidLitField-69]
+	_ = x[UntypedLit-70]
+	_ = x[InvalidLit-71]
+	_ = x[AmbiguousSelector-72]
+	_ = x[UndeclaredImportedName-73]
+	_ = x[UnexportedName-74]
+	_ = x[UndeclaredName-75]
+	_ = x[MissingFieldOrMethod-76]
+	_ = x[BadDotDotDotSyntax-77]
+	_ = x[NonVariadicDotDotDot-78]
+	_ = x[MisplacedDotDotDot-79]
+	_ = x[InvalidDotDotDotOperand-80]
+	_ = x[InvalidDotDotDot-81]
+	_ = x[UncalledBuiltin-82]
+	_ = x[InvalidAppend-83]
+	_ = x[InvalidCap-84]
+	_ = x[InvalidClose-85]
+	_ = x[InvalidCopy-86]
+	_ = x[InvalidComplex-87]
+	_ = x[InvalidDelete-88]
+	_ = x[InvalidImag-89]
+	_ = x[InvalidLen-90]
+	_ = x[SwappedMakeArgs-91]
+	_ = x[InvalidMake-92]
+	_ = x[InvalidReal-93]
+	_ = x[InvalidAssert-94]
+	_ = x[ImpossibleAssert-95]
+	_ = x[InvalidConversion-96]
+	_ = x[InvalidUntypedConversion-97]
+	_ = x[BadOffsetofSyntax-98]
+	_ = x[InvalidOffsetof-99]
+	_ = x[UnusedExpr-100]
+	_ = x[UnusedVar-101]
+	_ = x[MissingReturn-102]
+	_ = x[WrongResultCount-103]
+	_ = x[OutOfScopeResult-104]
+	_ = x[InvalidCond-105]
+	_ = x[InvalidPostDecl-106]
+	_ = x[InvalidChanRange-107]
+	_ = x[InvalidIterVar-108]
+	_ = x[InvalidRangeExpr-109]
+	_ = x[MisplacedBreak-110]
+	_ = x[MisplacedContinue-111]
+	_ = x[MisplacedFallthrough-112]
+	_ = x[DuplicateCase-113]
+	_ = x[DuplicateDefault-114]
+	_ = x[BadTypeKeyword-115]
+	_ = x[InvalidTypeSwitch-116]
+	_ = x[InvalidSelectCase-117]
+	_ = x[UndeclaredLabel-118]
+	_ = x[DuplicateLabel-119]
+	_ = x[MisplacedLabel-120]
+	_ = x[UnusedLabel-121]
+	_ = x[JumpOverDecl-122]
+	_ = x[JumpIntoBlock-123]
+	_ = x[InvalidMethodExpr-124]
+	_ = x[WrongArgCount-125]
+	_ = x[InvalidCall-126]
+	_ = x[UnusedResults-127]
+	_ = x[InvalidDefer-128]
+	_ = x[InvalidGo-129]
+}
+
+const _ErrorCode_name = "TestBlankPkgNameMismatchedPkgNameInvalidPkgUseBadImportPathBrokenImportImportCRenamedUnusedImportInvalidInitCycleDuplicateDeclInvalidDeclCycleInvalidTypeCycleInvalidConstInitInvalidConstValInvalidConstTypeUntypedNilWrongAssignCountUnassignableOperandNoNewVarMultiValAssignOpInvalidIfaceAssignInvalidChanAssignIncompatibleAssignUnaddressableFieldAssignNotATypeInvalidArrayLenBlankIfaceMethodIncomparableMapKeyInvalidIfaceEmbedInvalidPtrEmbedBadRecvInvalidRecvDuplicateFieldAndMethodDuplicateMethodInvalidBlankInvalidIotaMissingInitBodyInvalidInitSigInvalidInitDeclInvalidMainDeclTooManyValuesNotAnExprTruncatedFloatNumericOverflowUndefinedOpMismatchedTypesDivByZeroNonNumericIncDecUnaddressableOperandInvalidIndirectionNonIndexableOperandInvalidIndexSwappedSliceIndicesNonSliceableOperandInvalidSliceExprInvalidShiftCountInvalidShiftOperandInvalidReceiveInvalidSendDuplicateLitKeyMissingLitKeyInvalidLitIndexOversizeArrayLitMixedStructLitInvalidStructLitMissingLitFieldDuplicateLitFieldUnexportedLitFieldInvalidLitFieldUntypedLitInvalidLitAmbiguousSelectorUndeclaredImportedNameUnexportedNameUndeclaredNameMissingFieldOrMethodBadDotDotDotSyntaxNonVariadicDotDotDotMisplacedDotDotDotInvalidDotDotDotOperandInvalidDotDotDotUncalledBuiltinInvalidAppendInvalidCapInvalidCloseInvalidCopyInvalidComplexInvalidDeleteInvalidImagInvalidLenSwappedMakeArgsInvalidMakeInvalidRealInvalidAssertImpossibleAssertInvalidConversionInvalidUntypedConversionBadOffsetofSyntaxInvalidOffsetofUnusedExprUnusedVarMissingReturnWrongResultCountOutOfScopeResultInvalidCondInvalidPostDeclInvalidChanRangeInvalidIterVarInvalidRangeExprMisplacedBreakMisplacedContinueMisplacedFallthroughDuplicateCaseDuplicateDefaultBadTypeKeywordInvalidTypeSwitchInvalidSelectCaseUndeclaredLabelDuplicateLabelMisplacedLabelUnusedLabelJumpOverDeclJumpIntoBlockInvalidMethodExprWrongArgCountInvalidCallUnusedResultsInvalidDeferInvalidGo"
+
+var _ErrorCode_index = [...]uint16{0, 4, 16, 33, 46, 59, 71, 85, 97, 113, 126, 142, 158, 174, 189, 205, 215, 231, 250, 258, 274, 292, 309, 327, 351, 359, 374, 390, 408, 425, 440, 447, 458, 481, 496, 508, 519, 534, 548, 563, 578, 591, 600, 614, 629, 640, 655, 664, 680, 700, 718, 737, 749, 768, 787, 803, 820, 839, 853, 864, 879, 892, 907, 923, 937, 953, 968, 985, 1003, 1018, 1028, 1038, 1055, 1077, 1091, 1105, 1125, 1143, 1163, 1181, 1204, 1220, 1235, 1248, 1258, 1270, 1281, 1295, 1308, 1319, 1329, 1344, 1355, 1366, 1379, 1395, 1412, 1436, 1453, 1468, 1478, 1487, 1500, 1516, 1532, 1543, 1558, 1574, 1588, 1604, 1618, 1635, 1655, 1668, 1684, 1698, 1715, 1732, 1747, 1761, 1775, 1786, 1798, 1811, 1828, 1841, 1852, 1865, 1877, 1886}
+
+func (i ErrorCode) String() string {
+	i -= 1
+	if i < 0 || i >= ErrorCode(len(_ErrorCode_index)-1) {
+		return "ErrorCode(" + strconv.FormatInt(int64(i+1), 10) + ")"
+	}
+	return _ErrorCode_name[_ErrorCode_index[i]:_ErrorCode_index[i+1]]
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 5483adef6..425e03269 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -708,7 +708,7 @@ golang.org/x/mobile/event/key
 # golang.org/x/mod v0.3.0
 golang.org/x/mod/module
 golang.org/x/mod/semver
-# golang.org/x/net v0.0.0-20200904194848-62affa334b73
+# golang.org/x/net v0.0.0-20201021035429-f5854403a974
 golang.org/x/net/context
 golang.org/x/net/context/ctxhttp
 golang.org/x/net/html
@@ -731,10 +731,10 @@ golang.org/x/oauth2/google
 golang.org/x/oauth2/internal
 golang.org/x/oauth2/jws
 golang.org/x/oauth2/jwt
-# golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
+# golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
 golang.org/x/sync/errgroup
 golang.org/x/sync/semaphore
-# golang.org/x/sys v0.0.0-20200918174421-af09f7315aff
+# golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
 golang.org/x/sys/cpu
 golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/unix
@@ -762,7 +762,7 @@ golang.org/x/text/unicode/bidi
 golang.org/x/text/unicode/norm
 # golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 golang.org/x/time/rate
-# golang.org/x/tools v0.0.0-20200918232735-d647fc253266
+# golang.org/x/tools v0.0.0-20201111133315-69daaf961d65
 golang.org/x/tools/cmd/goimports
 golang.org/x/tools/go/ast/astutil
 golang.org/x/tools/go/gcexportdata
diff --git a/version/version.go b/version/version.go
index b0f5dcafc..12de8c891 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,10 +1,8 @@
 package version
 
 import (
-	"bytes"
-	"fmt"
-
 	"github.com/hashicorp/go-version"
+	pluginVersion "github.com/hashicorp/packer/packer-plugin-sdk/version"
 )
 
 // The git commit that was compiled. This will be filled in by the compiler.
@@ -18,18 +16,10 @@ const Version = "1.6.6"
 // such as "dev" (in development), "beta", "rc1", etc.
 const VersionPrerelease = "dev"
 
+var PackerVersion *pluginVersion.PluginVersion
+
 func FormattedVersion() string {
-	var versionString bytes.Buffer
-	fmt.Fprintf(&versionString, "%s", Version)
-	if VersionPrerelease != "" {
-		fmt.Fprintf(&versionString, "-%s", VersionPrerelease)
-
-		if GitCommit != "" {
-			fmt.Fprintf(&versionString, " (%s)", GitCommit)
-		}
-	}
-
-	return versionString.String()
+	return PackerVersion.FormattedVersion()
 }
 
 // SemVer is an instance of version.Version. This has the secondary
@@ -38,13 +28,11 @@ func FormattedVersion() string {
 var SemVer *version.Version
 
 func init() {
-	SemVer = version.Must(version.NewVersion(Version))
+	PackerVersion = pluginVersion.InitializePluginVersion(Version, VersionPrerelease)
+	SemVer = PackerVersion.SemVer()
 }
 
 // String returns the complete version string, including prerelease
 func String() string {
-	if VersionPrerelease != "" {
-		return fmt.Sprintf("%s-%s", Version, VersionPrerelease)
-	}
-	return Version
+	return PackerVersion.String()
 }
diff --git a/website/data/docs-navigation.js b/website/data/docs-navigation.js
index 8400ff6ed..bfc385afe 100644
--- a/website/data/docs-navigation.js
+++ b/website/data/docs-navigation.js
@@ -35,6 +35,7 @@ export default [
             content: [
               'aws_secretsmanager',
               'consul',
+              'env',
               'vault',
             ],
           },
@@ -169,7 +170,7 @@ export default [
   'terminology',
   {
     category: 'commands',
-    content: ['build', 'console', 'fix', 'inspect', 'validate', 'hcl2_upgrade'],
+    content: ['build', 'console', 'fix', 'fmt', 'inspect', 'validate', 'hcl2_upgrade'],
   },
   {
     category: 'templates',
diff --git a/website/package-lock.json b/website/package-lock.json
index 9bee26d7a..d48c503f9 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -1667,9 +1667,9 @@
       "integrity": "sha512-lv6XR2plm2m3+qO6VE+RYquTzOODIt3mQ/1fBT1bn7wsR0qxFiuryW4JfsF94oCGk++LkDkRt/8V742HiT+fHw=="
     },
     "@hashicorp/react-hashi-stack-menu": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-1.0.7.tgz",
-      "integrity": "sha512-WcPD9T2WjjuAlUmCNG3ed6zmroKC0T9LDf5ocL/IWTI5TSnqtjmlC63066v1YCPytG1B/QMkarFP9SYZUrIJrQ==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@hashicorp/react-hashi-stack-menu/-/react-hashi-stack-menu-1.0.8.tgz",
+      "integrity": "sha512-qKNkYguud3rmZQczIaPLYzhuaOahyRulV0KIxKo4TCjfHEzXJfbXaKi8uq1GJw2wAMOl0tV3brMTC0z1S3uTEw==",
       "requires": {
         "@hashicorp/react-inline-svg": "^1.0.2",
         "slugify": "1.3.4"
diff --git a/website/package.json b/website/package.json
index aa88d9bf4..e0ffb6e64 100644
--- a/website/package.json
+++ b/website/package.json
@@ -10,7 +10,7 @@
     "@hashicorp/react-docs-page": "4.0.0",
     "@hashicorp/react-docs-sidenav": "3.2.5",
     "@hashicorp/react-global-styles": "4.4.0",
-    "@hashicorp/react-hashi-stack-menu": "^1.0.7",
+    "@hashicorp/react-hashi-stack-menu": "^1.0.8",
     "@hashicorp/react-head": "1.1.1",
     "@hashicorp/react-product-downloader": "4.0.2",
     "@hashicorp/react-search": "^2.1.0",
diff --git a/website/pages/docs/builders/azure/index.mdx b/website/pages/docs/builders/azure/index.mdx
index fc76e1b89..50b62be43 100644
--- a/website/pages/docs/builders/azure/index.mdx
+++ b/website/pages/docs/builders/azure/index.mdx
@@ -40,6 +40,7 @@ following methods are available and are explained below:
   for the Public and US Gov clouds only.
 - Azure Managed Identity
 - Azure Active Directory Service Principal
+- Azure CLI
 
 -> **Don't know which authentication method to use?** Go with interactive
 login to try out the builders. If you need packer to run automatically,
@@ -103,3 +104,13 @@ way to authenticate the SP to AAD:
 
 To create a service principal, you can follow [the Azure documentation on this
 subject](https://docs.microsoft.com/en-us/cli/azure/create-an-azure-service-principal-azure-cli?view=azure-cli-latest).
+
+## Azure CLI
+
+This method will skip all other options provided and only use the credentials that the az cli is authenticated with.
+Works with both normal user (`az login`) as well as service principal (`az login --service-principal --username APP_ID --password PASSWORD --tenant TENANT_ID`).
+
+To enable az cli authentication, use the following:
+- `"use_azure_cli_auth": true`
+
+This mode will use the `tenant_id` and `subscription_id` from the current active az session which can be found by running: `az account show`
diff --git a/website/pages/docs/builders/cloudstack.mdx b/website/pages/docs/builders/cloudstack.mdx
index 0557dedde..3cffc4440 100644
--- a/website/pages/docs/builders/cloudstack.mdx
+++ b/website/pages/docs/builders/cloudstack.mdx
@@ -215,11 +215,11 @@ The available variables are:
 
 ## Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Basic Example
 
diff --git a/website/pages/docs/builders/hyperv/iso.mdx b/website/pages/docs/builders/hyperv/iso.mdx
index af78850d4..856bab291 100644
--- a/website/pages/docs/builders/hyperv/iso.mdx
+++ b/website/pages/docs/builders/hyperv/iso.mdx
@@ -49,15 +49,15 @@ power off the VM.
 
 ## ISO Configuration Reference
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ## Configuration Reference
 
@@ -85,29 +85,29 @@ builder.
 
 ## Http directory configuration reference
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Shutdown configuration reference
 
 ### Optional:
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ## Floppy configuration reference
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 ### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration reference
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ## Communicator configuration reference
 
@@ -127,11 +127,11 @@ builder.
 
 ## Boot Configuration Reference
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 ### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 ## Integration Services
 
diff --git a/website/pages/docs/builders/hyperv/vmcx.mdx b/website/pages/docs/builders/hyperv/vmcx.mdx
index 6ee142587..7769d660e 100644
--- a/website/pages/docs/builders/hyperv/vmcx.mdx
+++ b/website/pages/docs/builders/hyperv/vmcx.mdx
@@ -72,15 +72,15 @@ builder.
 
 ## ISO Configuration Reference
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ### Required for virtual machine import:
 
@@ -121,11 +121,11 @@ builder.
 
 ### CD configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ## Boot Command
 
@@ -165,11 +165,11 @@ For more examples of various boot commands, see the sample projects from our
 
 ## Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Integration Services
 
diff --git a/website/pages/docs/builders/lxd.mdx b/website/pages/docs/builders/lxd.mdx
index 427dd5a87..1ddfe5b8e 100644
--- a/website/pages/docs/builders/lxd.mdx
+++ b/website/pages/docs/builders/lxd.mdx
@@ -59,8 +59,13 @@ Below is a fully functioning example.
 - `init_sleep` (string) - The number of seconds to sleep between launching
   the LXD instance and provisioning it; defaults to 3 seconds.
 
-- `name` (string) - The name of the started container. Defaults to
-  `packer-$PACKER_BUILD_NAME`.
+- `name` (string) - Name of the builder. Defaults to `lxd`.
+
+- `container_name` (string) - Name of the build container.
+  Defaults to `packer-$name`.
+
+- `profile` - Name of the LXD profile used for the build container.
+  Defaults to `default`.
 
 - `output_image` (string) - The name of the output artifact. Defaults to
   `name`.
diff --git a/website/pages/docs/builders/parallels/iso.mdx b/website/pages/docs/builders/parallels/iso.mdx
index ed5d0e519..ecb4db4ca 100644
--- a/website/pages/docs/builders/parallels/iso.mdx
+++ b/website/pages/docs/builders/parallels/iso.mdx
@@ -62,15 +62,15 @@ can also be supplied to override the typical auto-generated key:
 
 ## ISO Configuration Reference
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ### Required:
 
diff --git a/website/pages/docs/builders/proxmox/clone.mdx b/website/pages/docs/builders/proxmox/clone.mdx
index df5b3fc14..892c5e739 100644
--- a/website/pages/docs/builders/proxmox/clone.mdx
+++ b/website/pages/docs/builders/proxmox/clone.mdx
@@ -190,6 +190,9 @@ in the image's Cloud-Init settings for provisioning.
 
 - `full_clone` (bool) - Whether to run a full or shallow clone from the base clone_vm. Defaults to `true`.
 
+- `boot` - (string) - Override default boot order. Format example `order=virtio0;ide2;net0`.
+ Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network)
+
 ## Example: Cloud-Init enabled Debian
 
 Here is a basic example creating a Debian 10 server image. This assumes
diff --git a/website/pages/docs/builders/proxmox/index.mdx b/website/pages/docs/builders/proxmox/index.mdx
index c5d1731ac..3c907b1f9 100644
--- a/website/pages/docs/builders/proxmox/index.mdx
+++ b/website/pages/docs/builders/proxmox/index.mdx
@@ -16,13 +16,13 @@ machines and store them as new Proxmox Virutal Machine images.
 
 Packer is able to target both ISO and existing Cloud-Init images:
 
-- [proxmox-clone](/docs/builders/proxmox-clone) - The proxmox image
+- [proxmox-clone](/docs/builders/proxmox/clone) - The proxmox image
   Packer builder is able to create new images for use with
   Proxmox VE. The builder takes a cloud-init enabled virtual machine
   template name, runs any provisioning necessary on the image after
   launching it, then creates a virtual machine template.
 
-- [proxmox-iso](/docs/builders/proxmox-iso) - The proxmox Packer
+- [proxmox-iso](/docs/builders/proxmox/iso) - The proxmox Packer
   builder is able to create new images for use with
   Proxmox VE. The builder takes an ISO source, runs any provisioning
   necessary on the image after launching it, then creates a virtual machine
diff --git a/website/pages/docs/builders/proxmox/iso.mdx b/website/pages/docs/builders/proxmox/iso.mdx
index b290b5937..1f261f62c 100644
--- a/website/pages/docs/builders/proxmox/iso.mdx
+++ b/website/pages/docs/builders/proxmox/iso.mdx
@@ -256,6 +256,9 @@ builder.
 - `vm_interface` - (string) - Name of the network interface that Packer gets
   the VMs IP from. Defaults to the first non loopback interface.
 
+- `boot` - (string) - Override default boot order. Format example `order=virtio0;ide2;net0`.
+ Prior to Proxmox 6.2-15 the format was `cdn` (c:CDROM -> d:Disk -> n:Network)
+
 ## Boot Command
 
 The `boot_command` configuration is very important: it specifies the keys to
@@ -294,11 +297,11 @@ For more examples of various boot commands, see the sample projects from our
 
 ## Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Example: Fedora with kickstart
 
diff --git a/website/pages/docs/builders/qemu.mdx b/website/pages/docs/builders/qemu.mdx
index d81fb3e50..56b276b09 100644
--- a/website/pages/docs/builders/qemu.mdx
+++ b/website/pages/docs/builders/qemu.mdx
@@ -118,45 +118,45 @@ necessary for this build to succeed and can be found further down the page.
 
 ## ISO Configuration
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 ### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 ### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ## Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 ### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ## Floppy configuration
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 ### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ## Shutdown configuration
 
 ### Optional:
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ## Communicator configuration
 
@@ -178,15 +178,15 @@ necessary for this build to succeed and can be found further down the page.
 
 ## Boot Configuration
 
-@include 'common/bootcommand/VNCConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig.mdx'
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 ### Optional:
 
-@include 'common/bootcommand/VNCConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx'
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 ### Communicator Configuration
 
diff --git a/website/pages/docs/builders/virtualbox/iso.mdx b/website/pages/docs/builders/virtualbox/iso.mdx
index 0aac5181e..cc42397db 100644
--- a/website/pages/docs/builders/virtualbox/iso.mdx
+++ b/website/pages/docs/builders/virtualbox/iso.mdx
@@ -95,39 +95,39 @@ necessary for this build to succeed and can be found further down the page.
 
 ### ISO Configuration
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 #### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 #### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -189,7 +189,7 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 Please note that for the Virtuabox builder, the IP address of the HTTP server
 Packer launches for you to access files like the preseed file in the example
@@ -233,7 +233,7 @@ source "virtualbox-iso" "basic-example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builders/virtualbox-ssh-key-pair.mdx'
 
diff --git a/website/pages/docs/builders/virtualbox/ovf.mdx b/website/pages/docs/builders/virtualbox/ovf.mdx
index 21eade0e9..379ba8b6f 100644
--- a/website/pages/docs/builders/virtualbox/ovf.mdx
+++ b/website/pages/docs/builders/virtualbox/ovf.mdx
@@ -109,27 +109,27 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -181,7 +181,7 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 Please note that for the Virtuabox builder, the IP address of the HTTP server
 Packer launches for you to access files like the preseed file in the example
@@ -224,7 +224,7 @@ source "virtualbox-ovf" "basic-example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builders/virtualbox-ssh-key-pair.mdx'
 
diff --git a/website/pages/docs/builders/virtualbox/vm.mdx b/website/pages/docs/builders/virtualbox/vm.mdx
index f189e0a68..c62894b77 100644
--- a/website/pages/docs/builders/virtualbox/vm.mdx
+++ b/website/pages/docs/builders/virtualbox/vm.mdx
@@ -120,27 +120,27 @@ builder.
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -196,7 +196,7 @@ builder.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 Please note that for the Virtuabox builder, the IP address of the HTTP server
 Packer launches for you to access files like the preseed file in the example
@@ -239,7 +239,7 @@ source "virtualbox-vm" "basic-example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builders/virtualbox-ssh-key-pair.mdx'
 
diff --git a/website/pages/docs/builders/vmware/iso.mdx b/website/pages/docs/builders/vmware/iso.mdx
index ea21ed1bb..842437f64 100644
--- a/website/pages/docs/builders/vmware/iso.mdx
+++ b/website/pages/docs/builders/vmware/iso.mdx
@@ -104,40 +104,40 @@ necessary for this build to succeed and can be found further down the page.
 
 ### ISO Configuration
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 #### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 #### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ### Shutdown configuration
 
 #### Optional:
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ### Driver configuration
 
@@ -199,9 +199,9 @@ necessary for this build to succeed and can be found further down the page.
 
 ## Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
-@include 'common/bootcommand/VNCConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig.mdx'
 
 -> **Note**: for the `HTTPIP` to be resolved correctly, your VM's network
 configuration has to include a `hostonly` or `nat` type network interface.
@@ -211,9 +211,9 @@ to modify the network configuration after the VM is done building.
 
 #### Optional:
 
-@include 'common/bootcommand/VNCConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx'
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 For more examples of various boot commands, see the sample projects from our
 [community templates page](/community-tools#templates).
diff --git a/website/pages/docs/builders/vmware/vmx.mdx b/website/pages/docs/builders/vmware/vmx.mdx
index f7efbc017..80b24ca72 100644
--- a/website/pages/docs/builders/vmware/vmx.mdx
+++ b/website/pages/docs/builders/vmware/vmx.mdx
@@ -105,27 +105,27 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
-@include 'common/FloppyConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx'
 
 #### Optional:
 
-@include 'common/FloppyConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx'
 
 ### CD configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ### Export configuration
 
@@ -181,13 +181,13 @@ necessary for this build to succeed and can be found further down the page.
 
 ## Shutdown Configuration
 
-@include 'common/shutdowncommand/ShutdownConfig-not-required.mdx'
+@include 'packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx'
 
 ## Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
-@include 'common/bootcommand/VNCConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig.mdx'
 
 -> **Note**: for the `HTTPIP` to be resolved correctly, your VM's network
 configuration has to include a `hostonly` or `nat` type network interface.
@@ -197,9 +197,9 @@ to modify the network configuration after the VM is done building.
 
 #### Optional:
 
-@include 'common/bootcommand/VNCConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx'
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 For more examples of various boot commands, see the sample projects from our
 [community templates page](/community-tools#templates).
diff --git a/website/pages/docs/builders/vmware/vsphere-clone.mdx b/website/pages/docs/builders/vmware/vsphere-clone.mdx
index ba7d26ba0..a9b68e4be 100644
--- a/website/pages/docs/builders/vmware/vsphere-clone.mdx
+++ b/website/pages/docs/builders/vmware/vsphere-clone.mdx
@@ -45,6 +45,21 @@ necessary for this build to succeed and can be found further down the page.
 
 @include 'builder/vsphere/clone/CloneConfig-not-required.mdx'
 
+@include 'builder/vsphere/common/StorageConfig-not-required.mdx'
+
+### Storage Configuration
+
+When cloning a VM, the storage configuration can be used to add additional storage and disk controllers. The resulting VM
+will contain the origin VM storage and disk controller plus the new configured ones.
+
+@include 'builder/vsphere/common/DiskConfig.mdx'
+
+@include 'builder/vsphere/common/DiskConfig-required.mdx'
+
+#### Optional
+
+@include 'builder/vsphere/common/DiskConfig-not-required.mdx'
+
 ### vApp Options Configuration
 
 @include 'builder/vsphere/clone/vAppConfig-not-required.mdx'
@@ -152,21 +167,21 @@ can be done via environment variable:
 
 ### Boot configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builder/vsphere/common/BootConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
@@ -198,11 +213,11 @@ can be done via environment variable:
 
 ### CDRom Configuration
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 @include 'builder/vsphere/common/CDRomConfig-not-required.mdx'
 
diff --git a/website/pages/docs/builders/vmware/vsphere-iso.mdx b/website/pages/docs/builders/vmware/vsphere-iso.mdx
index 92b0287c4..a6b06b6ec 100644
--- a/website/pages/docs/builders/vmware/vsphere-iso.mdx
+++ b/website/pages/docs/builders/vmware/vsphere-iso.mdx
@@ -46,7 +46,7 @@ necessary for this build to succeed and can be found further down the page.
 
 ### Boot Configuration
 
-@include 'common/bootcommand/BootConfig.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig.mdx'
 
 We send each character to the VM with a default delay of 100ms between groups.
 The delay alleviates possible issues with latency and CPU
@@ -83,17 +83,17 @@ source "vsphere-iso" "example" {
 
 #### Optional:
 
-@include 'common/bootcommand/BootConfig-not-required.mdx'
+@include 'packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx'
 
 @include 'builder/vsphere/common/BootConfig-not-required.mdx'
 
 ### Http directory configuration
 
-@include 'common/HTTPConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx'
 
 #### Optional:
 
-@include 'common/HTTPConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx'
 
 ### Floppy configuration
 
@@ -125,15 +125,15 @@ source "vsphere-iso" "example" {
 
 ### ISO Configuration
 
-@include 'common/ISOConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx'
 
 #### Required:
 
-@include 'common/ISOConfig-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx'
 
 #### Optional:
 
-@include 'common/ISOConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx'
 
 ### CDRom Configuration
 
@@ -176,16 +176,18 @@ iso_paths = [
 
 @include 'builder/vsphere/common/RemoveCDRomConfig-not-required.mdx'
 
-@include 'common/CDConfig.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx'
 
 #### Optional:
 
-@include 'common/CDConfig-not-required.mdx'
+@include 'packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx'
 
 ### Create Configuration
 
 @include 'builder/vsphere/iso/CreateConfig-not-required.mdx'
 
+@include 'builder/vsphere/common/StorageConfig-not-required.mdx'
+
 ### Network Adapter Configuration
 
 @include 'builder/vsphere/iso/NIC.mdx'
@@ -198,13 +200,13 @@ iso_paths = [
 
 ### Storage Configuration
 
-@include 'builder/vsphere/iso/DiskConfig.mdx'
+@include 'builder/vsphere/common/DiskConfig.mdx'
 
-@include 'builder/vsphere/iso/DiskConfig-required.mdx'
+@include 'builder/vsphere/common/DiskConfig-required.mdx'
 
 #### Optional
 
-@include 'builder/vsphere/iso/DiskConfig-not-required.mdx'
+@include 'builder/vsphere/common/DiskConfig-not-required.mdx'
 
 ### Export Configuration
 
diff --git a/website/pages/docs/commands/fmt.mdx b/website/pages/docs/commands/fmt.mdx
new file mode 100644
index 000000000..b277dbc76
--- /dev/null
+++ b/website/pages/docs/commands/fmt.mdx
@@ -0,0 +1,46 @@
+---
+description: |
+  The `packer fmt` Packer command is used to format HCL2
+  configuration files to a canonical format and style.
+layout: docs
+page_title: packer fmt - Commands
+sidebar_title: <tt>fmt</tt>
+---
+
+# `fmt` Command
+
+The `packer fmt` Packer command is used to format HCL2 configuration files to
+a canonical format and style. JSON files (.json) are not modified. This command
+applies a subset of HCL language style conventions, along with other minor
+adjustments for readability.
+
+`packer fmt` will display the name of the configuration file(s) that need formatting,
+and write any formatted changes back to the original configuration file(s).
+
+Example usage:
+
+Check if configuration file(s) need to be formatted, but don't write the changes.
+
+```shell-session
+$ packer fmt -check .
+my-template.json
+
+```
+
+Format a configuration file, writing the changes back to the original file.
+
+```shell-session
+$ packer fmt my-template.json
+my-template.json
+
+```
+
+## Options
+
+- `-check` - Checks if the input is formatted. Exit status will be 0 if all
+input is properly formatted and non-zero otherwise.
+
+- `-diff` - Display diffs of any formatting change
+
+- `-write=false` - Don't write formatting changes to source files
+(always disabled if using -check)
diff --git a/website/pages/docs/from-1.5/blocks/variable.mdx b/website/pages/docs/from-1.5/blocks/variable.mdx
index e7af7093a..1b423ca6f 100644
--- a/website/pages/docs/from-1.5/blocks/variable.mdx
+++ b/website/pages/docs/from-1.5/blocks/variable.mdx
@@ -24,6 +24,8 @@ If a default value is set, the variable is optional. Otherwise, the variable
 
 `@include 'from-1.5/variables/assignment.mdx'`
 
+`@include 'from-1.5/variables/custom-validation.mdx'`
+
 Example of a variable assignment from a file:
 
 `@include 'from-1.5/variables/foo-pkrvar.mdx'`
diff --git a/website/pages/docs/from-1.5/functions/contextual/env.mdx b/website/pages/docs/from-1.5/functions/contextual/env.mdx
new file mode 100644
index 000000000..347ea3374
--- /dev/null
+++ b/website/pages/docs/from-1.5/functions/contextual/env.mdx
@@ -0,0 +1,52 @@
+---
+layout: docs
+page_title: env - Functions - Configuration Language
+sidebar_title: env
+description: The env function retrieves environment values for input variables.
+---
+
+# `env` Function
+
+```hcl
+variable "aws_region" {
+  default = env("AWS_DEFAULT_REGION")
+}
+```
+
+`env` allows you to get the value for an environment variable inside input
+variables _only_. This is the only function that is callable from a variable
+block and it can only be used in the default input. `env` cannot be called from
+other places.
+
+In the previous example, the value of `aws_region` will be what's stored in the
+`AWS_DEFAULT_REGION` env var, unless aws_region is also set in a [manner that takes
+precedence](/docs/from-1.5/variables#variable-definition-precedence).
+
+
+-> **Why can't I use environment variables elsewhere?** User variables are the
+single source of configurable input. We felt that having environment variables
+used _anywhere_ in a configuration would confuse the user about the possible inputs
+to a template. By allowing environment variables only within default values for
+input variables, input variables remain as the single source of input to a
+template that a user can easily discover using `packer inspect`.
+
+When the environment variable is not set at all -- not even with the empty
+string -- the value returned by `env` will be an an empty string. It will still
+be possible to set it using other means but you could use [custom validation
+rules](/docs/from-1.5/variables#custom-validation-rules) to error in that case
+to make sure it is set, for example:
+
+```hcl
+variable "aws_region" {
+  default = env("AWS_DEFAULT_REGION")
+
+  validation {
+    condition     = length(var.aws_region) > 0
+    error_message = <<EOF
+The aws_region var is not set: make sure to at least set the AWS_DEFAULT_REGION env var.
+To fix this you could also set the aws_region variable from the arguments, for example:
+$ packer build -var=aws_region=us-something-1...
+EOF
+  }
+}
+```
diff --git a/website/pages/docs/from-1.5/path-variables.mdx b/website/pages/docs/from-1.5/path-variables.mdx
index 619b7526b..d95e468de 100644
--- a/website/pages/docs/from-1.5/path-variables.mdx
+++ b/website/pages/docs/from-1.5/path-variables.mdx
@@ -12,3 +12,30 @@ description: |-
 - `path.cwd`: the directory from where Packer was started.
 
 - `path.root`: the directory of the input HCL file or the input folder.
+
+
+## Examples
+
+```HCL
+locals {
+  settings_file  = "${path.cwd}/settings.txt"
+  scripts_folder = "${path.root}/scripts"
+  root           = path.root
+}
+```
+
+## Related Functions
+
+- [`abspath`](/docs/from-1.5/functions/file/abspath) takes a string containing
+  a filesystem path and converts it to an absolute path.
+
+- [`basename`](/docs/from-1.5/functions/file/basename) returns _only_ the last
+  portion of a filesystem path, discarding the portion that would be returned
+  by `dirname`.
+
+- [`fileset`](/docs/from-1.5/functions/file/fileset) enumerates a set of
+  regular file names given a path and pattern.
+
+- [`dirname`](/docs/from-1.5/functions/file/dirname) returns all of the
+  segments of a filesystem path _except_ the last, discarding the portion that
+  would be returned by `basename`.
diff --git a/website/pages/docs/from-1.5/variables.mdx b/website/pages/docs/from-1.5/variables.mdx
index b22792667..73c5c3746 100644
--- a/website/pages/docs/from-1.5/variables.mdx
+++ b/website/pages/docs/from-1.5/variables.mdx
@@ -162,6 +162,8 @@ maintainers, use comments.
 
 The following sections describe these options in more detail.
 
+`@include 'from-1.5/variables/custom-validation.mdx'`
+
 ### Variables on the Command Line
 
 To specify individual variables on the command line, use the `-var` option when
diff --git a/website/pages/docs/post-processors/vagrant-cloud.mdx b/website/pages/docs/post-processors/vagrant-cloud.mdx
index 80d5f25a7..9eaf3dc17 100644
--- a/website/pages/docs/post-processors/vagrant-cloud.mdx
+++ b/website/pages/docs/post-processors/vagrant-cloud.mdx
@@ -114,6 +114,9 @@ on Vagrant Cloud, as well as authentication and version information.
   - `Provider`: The Vagrant provider the box is for
   - `ArtifactId`: The ID of the input artifact.
 
+- `no_direct_upload` (boolean) - When true, upload the box artifact through
+  Vagrant Cloud instead of directly to the backend storage.
+
 ## Use with the Vagrant Post-Processor
 
 An example configuration is shown below. Note the use of the nested array that
diff --git a/website/pages/docs/provisioners/chef-client.mdx b/website/pages/docs/provisioners/chef-client.mdx
index 67de81919..df117c42b 100644
--- a/website/pages/docs/provisioners/chef-client.mdx
+++ b/website/pages/docs/provisioners/chef-client.mdx
@@ -14,6 +14,8 @@ sidebar_title: Chef Client
 
 # Chef Client Provisioner
 
+@include 'provisioners/unmaintained-plugin.mdx'
+
 Type: `chef-client`
 
 The Chef Client Packer provisioner installs and configures software on machines
diff --git a/website/pages/docs/provisioners/chef-solo.mdx b/website/pages/docs/provisioners/chef-solo.mdx
index 4944376d2..5e524c0d6 100644
--- a/website/pages/docs/provisioners/chef-solo.mdx
+++ b/website/pages/docs/provisioners/chef-solo.mdx
@@ -10,6 +10,8 @@ sidebar_title: Chef Solo
 
 # Chef Solo Provisioner
 
+@include 'provisioners/unmaintained-plugin.mdx'
+
 Type: `chef-solo`
 
 The Chef solo Packer provisioner installs and configures software on machines
diff --git a/website/pages/docs/provisioners/converge.mdx b/website/pages/docs/provisioners/converge.mdx
index 96ccc508b..a3aec3597 100644
--- a/website/pages/docs/provisioners/converge.mdx
+++ b/website/pages/docs/provisioners/converge.mdx
@@ -9,6 +9,8 @@ sidebar_title: Converge
 
 # Converge Provisioner
 
+@include 'provisioners/unmaintained-plugin.mdx'
+
 Type: `converge`
 
 The [Converge](http://converge.aster.is) Packer provisioner uses Converge
diff --git a/website/pages/docs/provisioners/puppet-masterless.mdx b/website/pages/docs/provisioners/puppet-masterless.mdx
index 8e9cadfad..4ad97f59f 100644
--- a/website/pages/docs/provisioners/puppet-masterless.mdx
+++ b/website/pages/docs/provisioners/puppet-masterless.mdx
@@ -18,6 +18,8 @@ sidebar_title: Puppet Masterless
 
 # Puppet (Masterless) Provisioner
 
+@include 'provisioners/unmaintained-plugin.mdx'
+
 Type: `puppet-masterless`
 
 The masterless Puppet Packer provisioner configures Puppet to run on the
diff --git a/website/pages/docs/provisioners/puppet-server.mdx b/website/pages/docs/provisioners/puppet-server.mdx
index 3e339728d..ce30bc3a3 100644
--- a/website/pages/docs/provisioners/puppet-server.mdx
+++ b/website/pages/docs/provisioners/puppet-server.mdx
@@ -9,6 +9,8 @@ sidebar_title: Puppet Server
 
 # Puppet Server Provisioner
 
+@include 'provisioners/unmaintained-plugin.mdx'
+
 Type: `puppet-server`
 
 The `puppet-server` Packer provisioner provisions Packer machines with Puppet
diff --git a/website/pages/partials/builder/amazon/common/AccessConfig-not-required.mdx b/website/pages/partials/builder/amazon/common/AccessConfig-not-required.mdx
index 17872ddf5..45b2c116f 100644
--- a/website/pages/partials/builder/amazon/common/AccessConfig-not-required.mdx
+++ b/website/pages/partials/builder/amazon/common/AccessConfig-not-required.mdx
@@ -33,9 +33,6 @@
   profiles](https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/configuring-sdk.html#specifying-profiles)
   for more details.
 
-- `skip_region_validation` (bool) - Set to true if you want to skip
-  validation of the ami_regions configuration option. Default false.
-
 - `skip_metadata_api_check` (bool) - Skip Metadata Api Check
 
 - `skip_credential_validation` (bool) - Set to true if you want to skip validating AWS credentials before runtime.
diff --git a/website/pages/partials/builder/amazon/common/RunConfig-not-required.mdx b/website/pages/partials/builder/amazon/common/RunConfig-not-required.mdx
index 083e499eb..999dc7fd8 100644
--- a/website/pages/partials/builder/amazon/common/RunConfig-not-required.mdx
+++ b/website/pages/partials/builder/amazon/common/RunConfig-not-required.mdx
@@ -297,10 +297,6 @@
   The default is "default", meaning shared tenancy. Allowed values are "default",
   "dedicated" and "host".
 
-- `temporary_key_pair_name` (string) - The name of the temporary key pair to
-  generate. By default, Packer generates a name that looks like
-  `packer_<UUID>`, where &lt;UUID&gt; is a 36 character unique identifier.
-
 - `temporary_security_group_source_cidrs` ([]string) - A list of IPv4 CIDR blocks to be authorized access to the instance, when
   packer is creating a temporary security group.
   
diff --git a/website/pages/partials/builder/azure/common/client/Config-not-required.mdx b/website/pages/partials/builder/azure/common/client/Config-not-required.mdx
index c4c6b20eb..46d553c81 100644
--- a/website/pages/partials/builder/azure/common/client/Config-not-required.mdx
+++ b/website/pages/partials/builder/azure/common/client/Config-not-required.mdx
@@ -23,3 +23,10 @@
   looked up using `subscription_id`.
 
 - `subscription_id` (string) - The subscription to use.
+
+- `use_azure_cli_auth` (bool) - Flag to use Azure CLI authentication. Defaults to false.
+  CLI auth will use the information from an active `az login` session to connect to Azure and set the subscription id and tenant id associated to the signed in account.
+  If enabled, it will use the authentication provided by the `az` CLI.
+  Azure CLI authentication will use the credential marked as `isDefault` and can be verified using `az account show`.
+  Works with normal authentication (`az login`) and service principals (`az login --service-principal --username APP_ID --password PASSWORD --tenant TENANT_ID`).
+  Ignores all other configurations if enabled.
diff --git a/website/pages/partials/builder/digitalocean/Config-not-required.mdx b/website/pages/partials/builder/digitalocean/Config-not-required.mdx
index 3f2cb0abf..4eabeacce 100644
--- a/website/pages/partials/builder/digitalocean/Config-not-required.mdx
+++ b/website/pages/partials/builder/digitalocean/Config-not-required.mdx
@@ -43,3 +43,11 @@
   data when launching the Droplet.
 
 - `tags` ([]string) - Tags to apply to the droplet when it is created
+
+- `vpc_uuid` (string) - UUID of the VPC which the droplet will be created in. Before using this,
+  private_networking should be enabled.
+
+- `connect_with_private_ip` (bool) - Wheter the communicators should use private IP or not (public IP in that case).
+  If the droplet is or going to be accessible only from the local network because
+  it is at behind a firewall, then communicators should use the private IP
+  instead of the public IP. Before using this, private_networking should be enabled.
diff --git a/website/pages/partials/builder/hyperv/common/CommonConfig-not-required.mdx b/website/pages/partials/builder/hyperv/common/CommonConfig-not-required.mdx
index e3b3ed4bf..aa7a2b789 100644
--- a/website/pages/partials/builder/hyperv/common/CommonConfig-not-required.mdx
+++ b/website/pages/partials/builder/hyperv/common/CommonConfig-not-required.mdx
@@ -95,8 +95,6 @@
 - `keep_registered` (bool) - If "true", Packer will not delete the VM from
   The Hyper-V manager.
 
-- `communicator` (string) - Communicator
-
 - `skip_compaction` (bool) - If true skip compacting the hard disk for
   the virtual machine when exporting. This defaults to false.
 
diff --git a/website/pages/partials/builder/scaleway/Config-not-required.mdx b/website/pages/partials/builder/scaleway/Config-not-required.mdx
index 47c8b3e7b..ef73b13c1 100644
--- a/website/pages/partials/builder/scaleway/Config-not-required.mdx
+++ b/website/pages/partials/builder/scaleway/Config-not-required.mdx
@@ -1,6 +1,7 @@
 <!-- Code generated from the comments of the Config struct in builder/scaleway/config.go; DO NOT EDIT MANUALLY -->
 
 - `api_url` (string) - The Scaleway API URL to use
+  Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
   It can also be specified via the environment variable SCW_API_URL
 
 - `snapshot_name` (string) - The name of the resulting snapshot that will
diff --git a/website/pages/partials/builder/scaleway/Config-required.mdx b/website/pages/partials/builder/scaleway/Config-required.mdx
index 90123c05d..4e63cf752 100644
--- a/website/pages/partials/builder/scaleway/Config-required.mdx
+++ b/website/pages/partials/builder/scaleway/Config-required.mdx
@@ -1,15 +1,19 @@
 <!-- Code generated from the comments of the Config struct in builder/scaleway/config.go; DO NOT EDIT MANUALLY -->
 
 - `access_key` (string) - The AccessKey corresponding to the secret key.
+  Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
   It can also be specified via the environment variable SCW_ACCESS_KEY.
 
 - `secret_key` (string) - The SecretKey to authenticate against the Scaleway API.
+  Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
   It can also be specified via the environment variable SCW_SECRET_KEY.
 
 - `project_id` (string) - The Project ID in which the instances, volumes and snapshots will be created.
+  Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
   It can also be specified via the environment variable SCW_DEFAULT_PROJECT_ID.
 
 - `zone` (string) - The Zone in which the instances, volumes and snapshots will be created.
+  Will be fetched first from the [scaleway configuration file](https://github.com/scaleway/scaleway-sdk-go/blob/master/scw/README.md).
   It can also be specified via the environment variable SCW_DEFAULT_ZONE
 
 - `image` (string) - The UUID of the base image to use. This is the image
diff --git a/website/pages/partials/builder/vagrant/Config-not-required.mdx b/website/pages/partials/builder/vagrant/Config-not-required.mdx
index 4889f1d3e..04535b7d2 100644
--- a/website/pages/partials/builder/vagrant/Config-not-required.mdx
+++ b/website/pages/partials/builder/vagrant/Config-not-required.mdx
@@ -37,8 +37,6 @@
   This parameter is required when source_path have more than one provider,
   or when using vagrant-cloud post-processor. Defaults to unset.
 
-- `communicator` (string) - Communicator
-
 - `vagrantfile_template` (string) - What vagrantfile to use
 
 - `teardown_method` (string) - Whether to halt, suspend, or destroy the box when the build has
diff --git a/website/pages/partials/builder/virtualbox/common/GuestAdditionsConfig-not-required.mdx b/website/pages/partials/builder/virtualbox/common/GuestAdditionsConfig-not-required.mdx
index 0c57a3f70..214353b06 100644
--- a/website/pages/partials/builder/virtualbox/common/GuestAdditionsConfig-not-required.mdx
+++ b/website/pages/partials/builder/virtualbox/common/GuestAdditionsConfig-not-required.mdx
@@ -1,7 +1,5 @@
 <!-- Code generated from the comments of the GuestAdditionsConfig struct in builder/virtualbox/common/guest_additions_config.go; DO NOT EDIT MANUALLY -->
 
-- `communicator` (string) - Communicator
-
 - `guest_additions_mode` (string) - The method by which guest additions are
   made available to the guest for installation. Valid options are `upload`,
   `attach`, or `disable`. If the mode is `attach` the guest additions ISO will
diff --git a/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx b/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx
index 69c87362c..0744b932f 100644
--- a/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx
+++ b/website/pages/partials/builder/virtualbox/common/VBoxVersionConfig-not-required.mdx
@@ -1,7 +1,5 @@
 <!-- Code generated from the comments of the VBoxVersionConfig struct in builder/virtualbox/common/vbox_version_config.go; DO NOT EDIT MANUALLY -->
 
-- `communicator` (string) - Communicator
-
 - `virtualbox_version_file` (\*string) - The path within the virtual machine to
   upload a file that contains the VirtualBox version that was used to create
   the machine. This information can be useful for provisioning. By default
diff --git a/website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx b/website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx
similarity index 83%
rename from website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx
rename to website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx
index 8e31b90d4..f7267b405 100644
--- a/website/pages/partials/builder/vsphere/iso/DiskConfig-not-required.mdx
+++ b/website/pages/partials/builder/vsphere/common/DiskConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the DiskConfig struct in builder/vsphere/iso/step_create.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the DiskConfig struct in builder/vsphere/common/storage_config.go; DO NOT EDIT MANUALLY -->
 
 - `disk_thin_provisioned` (bool) - Enable VMDK thin provisioning for VM. Defaults to `false`.
 
diff --git a/website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx b/website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx
similarity index 62%
rename from website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx
rename to website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx
index 83683c366..29a583222 100644
--- a/website/pages/partials/builder/vsphere/iso/DiskConfig-required.mdx
+++ b/website/pages/partials/builder/vsphere/common/DiskConfig-required.mdx
@@ -1,3 +1,3 @@
-<!-- Code generated from the comments of the DiskConfig struct in builder/vsphere/iso/step_create.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the DiskConfig struct in builder/vsphere/common/storage_config.go; DO NOT EDIT MANUALLY -->
 
 - `disk_size` (int64) - The size of the disk in MB.
diff --git a/website/pages/partials/builder/vsphere/iso/DiskConfig.mdx b/website/pages/partials/builder/vsphere/common/DiskConfig.mdx
similarity index 94%
rename from website/pages/partials/builder/vsphere/iso/DiskConfig.mdx
rename to website/pages/partials/builder/vsphere/common/DiskConfig.mdx
index 988ce2819..44040b0f7 100644
--- a/website/pages/partials/builder/vsphere/iso/DiskConfig.mdx
+++ b/website/pages/partials/builder/vsphere/common/DiskConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the DiskConfig struct in builder/vsphere/iso/step_create.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the DiskConfig struct in builder/vsphere/common/storage_config.go; DO NOT EDIT MANUALLY -->
 
 Defines the disk storage for a VM.
 
diff --git a/website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx b/website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx
new file mode 100644
index 000000000..2146f4442
--- /dev/null
+++ b/website/pages/partials/builder/vsphere/common/StorageConfig-not-required.mdx
@@ -0,0 +1,8 @@
+<!-- Code generated from the comments of the StorageConfig struct in builder/vsphere/common/storage_config.go; DO NOT EDIT MANUALLY -->
+
+- `disk_controller_type` ([]string) - Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers.
+  Defaults to `lsilogic`. See
+  [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362)
+  for additional details.
+
+- `storage` ([]DiskConfig) - Configures a collection of one or more disks to be provisioned along with the VM. See the [Storage Configuration](#storage-configuration).
diff --git a/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx b/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx
index a69992f04..cd2ddc28d 100644
--- a/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx
+++ b/website/pages/partials/builder/vsphere/iso/CreateConfig-not-required.mdx
@@ -9,13 +9,6 @@
   here](https://code.vmware.com/apis/358/vsphere/doc/vim.vm.GuestOsDescriptor.GuestOsIdentifier.html)
   for a full list of possible values.
 
-- `disk_controller_type` ([]string) - Set VM disk controller type. Example `lsilogic`, `pvscsi`, `nvme`, or `scsi`. Use a list to define additional controllers.
-  Defaults to `lsilogic`. See
-  [SCSI, SATA, and NVMe Storage Controller Conditions, Limitations, and Compatibility](https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html#GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362)
-  for additional details.
-
-- `storage` ([]DiskConfig) - A collection of one or more disks to be provisioned along with the VM.
-
 - `network_adapters` ([]NIC) - Network adapters
 
 - `usb_controller` ([]string) - Create USB controllers for the virtual machine. "usb" for a usb 2.0 controller. "xhci" for a usb 3.0 controller. There can only be at most one of each.
diff --git a/website/pages/partials/builder/yandex/Config-not-required.mdx b/website/pages/partials/builder/yandex/Config-not-required.mdx
index 2d933cb3e..806a1d3ee 100644
--- a/website/pages/partials/builder/yandex/Config-not-required.mdx
+++ b/website/pages/partials/builder/yandex/Config-not-required.mdx
@@ -9,6 +9,8 @@
 
 - `disk_type` (string) - Specify disk type for the launched instance. Defaults to `network-hdd`.
 
+- `disk_labels` (map[string]string) - Key/value pair labels to apply to the disk.
+
 - `image_description` (string) - The description of the resulting image.
 
 - `image_family` (string) - The family name of the resulting image.
diff --git a/website/pages/partials/from-1.5/variables/custom-validation.mdx b/website/pages/partials/from-1.5/variables/custom-validation.mdx
new file mode 100644
index 000000000..42af7e1d7
--- /dev/null
+++ b/website/pages/partials/from-1.5/variables/custom-validation.mdx
@@ -0,0 +1,73 @@
+## Custom Validation Rules
+
+In addition to Type Constraints, you can specify arbitrary custom validation
+rules for a particular variable using one or more `validation` block nested
+within the corresponding `variable` block:
+
+```hcl
+variable "image_id" {
+  type        = string
+  description = "The id of the machine image (AMI) to use for the server."
+
+  validation {
+    condition     = length(var.image_id) > 4 && substr(var.image_id, 0, 4) == "ami-"
+    error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"."
+  }
+}
+```
+
+The `condition` argument is an expression that must use the value of the
+variable to return `true` if the value is valid or `false` if it is invalid.
+The expression can refer only to the variable that the condition applies to,
+and _must not_ produce errors.
+
+If the failure of an expression is the basis of the validation decision, use
+[the `can` function](/docs/from-1.5/functions/conversion/can) to detect such errors. For example:
+
+```hcl
+variable "image_id" {
+  type        = string
+  description = "The id of the machine image (AMI) to use for the server."
+
+  validation {
+    # regex(...) fails if it cannot find a match
+    condition     = can(regex("^ami-", var.image_id))
+    error_message = "The image_id value must be a valid AMI id, starting with \"ami-\"."
+  }
+}
+```
+
+If `condition` evaluates to `false`,  an error message including the sentences
+given in `error_message` will be produced. The error message string should be
+at least one full sentence explaining the constraint that failed, using a
+sentence structure similar to the above examples.
+
+Validation also works with more complex cases:
+
+```hcl
+variable "image_metadata" {
+
+  default = {
+    key: "value",
+    something: { 
+      foo: "bar",
+    }
+  }
+
+  validation {
+    condition     = length(var.image_metadata.key) > 4
+    error_message = "The image_metadata.key field must be more than 4 runes."
+  }
+
+  validation {
+    condition     = can(var.image_metadata.something.foo)
+    error_message = "The image_metadata.something.foo field must exist."
+  }
+
+  validation {
+    condition     = substr(var.image_metadata.something.foo, 0, 3) == "bar"
+    error_message = "The image_metadata.something.foo field must start with \"bar\"."
+  }
+
+}
+```
diff --git a/website/pages/partials/common/bootcommand/BootConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx
similarity index 94%
rename from website/pages/partials/common/bootcommand/BootConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx
index c3ce262ac..1bf92b193 100644
--- a/website/pages/partials/common/bootcommand/BootConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the BootConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the BootConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 - `boot_keygroup_interval` (duration string | ex: "1h5m2s") - Time to wait after sending a group of key pressses. The value of this
   should be a duration. Examples are `5s` and `1m30s` which will cause
diff --git a/website/pages/partials/common/bootcommand/BootConfig.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx
similarity index 98%
rename from website/pages/partials/common/bootcommand/BootConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx
index f8115899c..8d41f834f 100644
--- a/website/pages/partials/common/bootcommand/BootConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/BootConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the BootConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the BootConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 The boot configuration is very important: `boot_command` specifies the keys
 to type when the virtual machine is first booted in order to start the OS
diff --git a/website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx
similarity index 81%
rename from website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx
index 6c532fd4f..008fdb54a 100644
--- a/website/pages/partials/common/bootcommand/VNCConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the VNCConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the VNCConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 - `disable_vnc` (bool) - Whether to create a VNC connection or not. A boot_command cannot be used
   when this is true. Defaults to false.
diff --git a/website/pages/partials/common/bootcommand/VNCConfig.mdx b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx
similarity index 87%
rename from website/pages/partials/common/bootcommand/VNCConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx
index 34a6748ac..f539a6590 100644
--- a/website/pages/partials/common/bootcommand/VNCConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/bootcommand/VNCConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the VNCConfig struct in common/bootcommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the VNCConfig struct in packer-plugin-sdk/bootcommand/config.go; DO NOT EDIT MANUALLY -->
 
 The boot command "typed" character for character over a VNC connection to
 the machine, simulating a human actually typing the keyboard.
diff --git a/website/pages/partials/common/CDConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx
similarity index 94%
rename from website/pages/partials/common/CDConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx
index 11e4b8fc6..e06fe94d6 100644
--- a/website/pages/partials/common/CDConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the CDConfig struct in common/extra_iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the CDConfig struct in packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
 
 - `cd_files` ([]string) - A list of files to place onto a CD that is attached when the VM is
   booted. This can include either files or directories; any directories
diff --git a/website/pages/partials/common/CDConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx
similarity index 84%
rename from website/pages/partials/common/CDConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx
index b234df3eb..d8778c6ee 100644
--- a/website/pages/partials/common/CDConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/CDConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the CDConfig struct in common/extra_iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the CDConfig struct in packer-plugin-sdk/multistep/commonsteps/extra_iso_config.go; DO NOT EDIT MANUALLY -->
 
 An iso (CD) containing custom files can be made available for your build.
 
diff --git a/website/pages/partials/common/FloppyConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx
similarity index 91%
rename from website/pages/partials/common/FloppyConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx
index 9c6fcda8a..aacdc62f4 100644
--- a/website/pages/partials/common/FloppyConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the FloppyConfig struct in common/floppy_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the FloppyConfig struct in packer-plugin-sdk/multistep/commonsteps/floppy_config.go; DO NOT EDIT MANUALLY -->
 
 - `floppy_files` ([]string) - A list of files to place onto a floppy disk that is attached when the VM
   is booted. Currently, no support exists for creating sub-directories on
diff --git a/website/pages/partials/common/FloppyConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx
similarity index 87%
rename from website/pages/partials/common/FloppyConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx
index bca819832..fe2645506 100644
--- a/website/pages/partials/common/FloppyConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/FloppyConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the FloppyConfig struct in common/floppy_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the FloppyConfig struct in packer-plugin-sdk/multistep/commonsteps/floppy_config.go; DO NOT EDIT MANUALLY -->
 
 A floppy can be made available for your build. This is most useful for
 unattended Windows installs, which look for an Autounattend.xml file on
diff --git a/website/pages/partials/common/HTTPConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx
similarity index 93%
rename from website/pages/partials/common/HTTPConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx
index 4a3238ad4..a44424f45 100644
--- a/website/pages/partials/common/HTTPConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the HTTPConfig struct in common/http_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the HTTPConfig struct in packer-plugin-sdk/multistep/commonsteps/http_config.go; DO NOT EDIT MANUALLY -->
 
 - `http_directory` (string) - Path to a directory to serve using an HTTP server. The files in this
   directory will be available over HTTP that will be requestable from the
diff --git a/website/pages/partials/common/HTTPConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx
similarity index 81%
rename from website/pages/partials/common/HTTPConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx
index 27c79796b..3ef715056 100644
--- a/website/pages/partials/common/HTTPConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/HTTPConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the HTTPConfig struct in common/http_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the HTTPConfig struct in packer-plugin-sdk/multistep/commonsteps/http_config.go; DO NOT EDIT MANUALLY -->
 
 Packer will create an http server serving `http_directory` when it is set, a
 random free port will be selected and the architecture of the directory
diff --git a/website/pages/partials/common/ISOConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx
similarity index 90%
rename from website/pages/partials/common/ISOConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx
index b93fdafd5..a0c584c3a 100644
--- a/website/pages/partials/common/ISOConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ISOConfig struct in common/iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ISOConfig struct in packer-plugin-sdk/multistep/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
 
 - `iso_urls` ([]string) - Multiple URLs for the ISO to download. Packer will try these in order.
   If anything goes wrong attempting to download or while downloading a
diff --git a/website/pages/partials/common/ISOConfig-required.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx
similarity index 94%
rename from website/pages/partials/common/ISOConfig-required.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx
index 1611af8ca..f5f6654d5 100644
--- a/website/pages/partials/common/ISOConfig-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ISOConfig struct in common/iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ISOConfig struct in packer-plugin-sdk/multistep/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
 
 - `iso_checksum` (string) - The checksum for the ISO file or virtual hard drive file. The type of
   the checksum is specified within the checksum field as a prefix, ex:
diff --git a/website/pages/partials/common/ISOConfig.mdx b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx
similarity index 95%
rename from website/pages/partials/common/ISOConfig.mdx
rename to website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx
index 4dfbd19f2..98eca88b2 100644
--- a/website/pages/partials/common/ISOConfig.mdx
+++ b/website/pages/partials/packer-plugin-sdk/multistep/commonsteps/ISOConfig.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ISOConfig struct in common/iso_config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ISOConfig struct in packer-plugin-sdk/multistep/commonsteps/iso_config.go; DO NOT EDIT MANUALLY -->
 
 By default, Packer will symlink, download or copy image files to the Packer
 cache into a "`hash($iso_url+$iso_checksum).$iso_target_extension`" file.
diff --git a/website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx
similarity index 92%
rename from website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx
rename to website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx
index 2b705dd61..0cd262f0d 100644
--- a/website/pages/partials/common/shutdowncommand/ShutdownConfig-not-required.mdx
+++ b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig-not-required.mdx
@@ -1,4 +1,4 @@
-<!-- Code generated from the comments of the ShutdownConfig struct in common/shutdowncommand/config.go; DO NOT EDIT MANUALLY -->
+<!-- Code generated from the comments of the ShutdownConfig struct in packer-plugin-sdk/shutdowncommand/config.go; DO NOT EDIT MANUALLY -->
 
 - `shutdown_command` (string) - The command to use to gracefully shut down the machine once all
   provisioning is complete. By default this is an empty string, which
diff --git a/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx
new file mode 100644
index 000000000..e958c8ca3
--- /dev/null
+++ b/website/pages/partials/packer-plugin-sdk/shutdowncommand/ShutdownConfig.mdx
@@ -0,0 +1,9 @@
+<!-- Code generated from the comments of the ShutdownConfig struct in packer-plugin-sdk/shutdowncommand/config.go; DO NOT EDIT MANUALLY -->
+
+ShutdownConfig defines implementation details for shutting down a VM once it
+is done provisioned.
+It is provided as a convenience to encourage builder developers to
+consider implementing these options, which we believe are valuable for all
+builders. It also helps guarantee that option names for similar options
+are the same across the various builders. Embed it in your builder config
+using the `mapstructure:",squash"` struct tag.
diff --git a/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx b/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx
index aa3a5243e..bacbd84e5 100644
--- a/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx
+++ b/website/pages/partials/post-processor/googlecompute-import/Config-not-required.mdx
@@ -13,7 +13,7 @@
 - `image_family` (string) - The name of the image family to which the resulting image belongs.
 
 - `image_guest_os_features` ([]string) - A list of features to enable on the guest operating system. Applicable only for bootable images. Valid
-  values are `MULTI_IP_SUBNET`, `SECURE_BOOT`, `UEFI_COMPATIBLE`,
+  values are `MULTI_IP_SUBNET`, `UEFI_COMPATIBLE`,
   `VIRTIO_SCSI_MULTIQUEUE` and `WINDOWS` currently.
 
 - `image_labels` (map[string]string) - Key/value pair labels to apply to the created image.
@@ -24,3 +24,11 @@
   `false`.
 
 - `vault_gcp_oauth_engine` (string) - Vault GCP Oauth Engine
+
+- `image_platform_key` (string) - A key used to establish the trust relationship between the platform owner and the firmware. You may only specify one platform key, and it must be a valid X.509 certificate.
+
+- `image_key_exchange_key` ([]string) - A key used to establish a trust relationship between the firmware and the OS. You may specify multiple comma-separated keys for this value.
+
+- `image_signatures_db` ([]string) - A database of certificates that have been revoked and will cause the system to stop booting if a boot file is signed with one of them. You may specify single or multiple comma-separated values for this value.
+
+- `image_forbidden_signatures_db` ([]string) - A database of certificates that are trusted and can be used to sign boot files. You may specify single or multiple comma-separated values for this value.
diff --git a/website/pages/partials/provisioners/unmaintained-plugin.mdx b/website/pages/partials/provisioners/unmaintained-plugin.mdx
index 6f92a3339..8d9dd44b9 100644
--- a/website/pages/partials/provisioners/unmaintained-plugin.mdx
+++ b/website/pages/partials/provisioners/unmaintained-plugin.mdx
@@ -1 +1 @@
-~> **This community-supported provisioner is unmaintained**, read more details in the [README](https://github.com/hashicorp/packer/blob/master/README.md#unmaintained-plugins)
+~> **This is community maintained provisioner is currently unmaintained**; if you are interested in contributing or taking ownership of it, please reach out to us at [packer@hashicorp.com](mailto://packer@hashicorp.com). More details can be found in the [README](https://github.com/hashicorp/packer/blob/master/README.md#unmaintained-plugins).