diff --git a/internal/osbuild2/waagent_conf.go b/internal/osbuild2/waagent_conf.go
new file mode 100644
index 000000000..d1e5d0c56
--- /dev/null
+++ b/internal/osbuild2/waagent_conf.go
@@ -0,0 +1,19 @@
+package osbuild2
+
+type WAAgentConfig struct {
+	RDFormat     *bool `json:"ResourceDisk.Format"`
+	RDEnableSwap *bool `json:"ResourceDisk.EnableSwap"`
+}
+
+type WAAgentConfStageOptions struct {
+	Config WAAgentConfig `json:"config"`
+}
+
+func (WAAgentConfStageOptions) isStageOptions() {}
+
+func NewWAAgentConfStage(options *WAAgentConfStageOptions) *Stage {
+	return &Stage{
+		Type:    "org.osbuild.waagent.conf",
+		Options: options,
+	}
+}