diff --git a/arista/workspace.v1/services.gen.swagger.json b/arista/workspace.v1/services.gen.swagger.json
index ddc203b6..f52d11fa 100644
--- a/arista/workspace.v1/services.gen.swagger.json
+++ b/arista/workspace.v1/services.gen.swagger.json
@@ -2682,10 +2682,11 @@
         "ERROR_CODE_PHYSICAL_DEVICE_EOS_INCOMPATIBLE",
         "ERROR_CODE_TA_EMBEDDEDEXT_INCOMPATIBLE",
         "ERROR_CODE_DEVICE_EOS_2GB_INCOMPATIBLE",
-        "ERROR_CODE_EOS_EXTENSION_VERSION_INCOMPATIBLE"
+        "ERROR_CODE_EOS_EXTENSION_VERSION_INCOMPATIBLE",
+        "ERROR_CODE_ARCH_UNSUPPORTED"
       ],
       "default": "ERROR_CODE_UNSPECIFIED",
-      "description": "ErrorCode indicates errors produced during image validations.\n\n - ERROR_CODE_UNSPECIFIED: ERROR_CODE_UNSPECIFIED indicates error code is unspecified.\n - ERROR_CODE_SUPPORT_NOT_INTRODUCED: ERROR_CODE_SUPPORT_NOT_INTRODUCED represents case where the given EOS version does\nnot support the SKU.\nDeprecated - use ERROR_CODE_EOS_SUPPORT_NOT_INTRODUCED\n - ERROR_CODE_SUPPORT_REMOVED: ERROR_CODE_SUPPORT_REMOVED represents case where the given EOS version no longer\nsupports the SKU.\nDeprecated - use ERROR_CODE_EOS_SUPPORT_REMOVED\n - ERROR_CODE_DEVICE_UNREACHABLE: ERROR_CODE_DEVICE_UNREACHABLE represents the case where the device\nis unreachable during a compliance computation.\n - ERROR_CODE_VALIDATION_FAILED: ERROR_CODE_VALIDATION_FAILED represents case where the validations checks\nfailed.\n - ERROR_CODE_GET_PROPOSED_IMAGE_INFO_FAILED: ERROR_CODE_GET_PROPOSED_IMAGE_INFO_FAILED represents case where we are\nunable to get proposed image information for a device.\n - ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED: ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED represents case where we\nfail to get running image information from an active supervisor.\n - ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED: ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED represents case when we\nfail to get information from peer supervisor.\n - ERROR_CODE_EOS_TA_ARCHITECTURE_INCOMPATIBLE: ERROR_CODE_EOS_TA_ARCHITECTURE_INCOMPATIBLE represents the case where EOS architecture and\nTerminAttr architecture are incompatible.\n - ERROR_CODE_TA_CV_INCOMPATIBLE: ERROR_CODE_TA_CV_INCOMPATIBLE represents the case where TerminAttr is incompatible with\nCloudVision; i.e., the TerminAttr version is below CloudVision's minimum supported version.\n - ERROR_CODE_EOS_CV_INCOMPATIBLE: ERROR_CODE_EOS_CV_INCOMPATIBLE represents the case where the EOS version is incompatible with\nCloudVision; i.e., the EOS version is outside of CloudVision's supported range of versions.\n - ERROR_CODE_EOS_SUPPORT_NOT_INTRODUCED: ERROR_CODE_EOS_SUPPORT_NOT_INTRODUCED represents the case where the given EOS version does\nnot support the SKU.\n - ERROR_CODE_EOS_SUPPORT_REMOVED: ERROR_CODE_EOS_SUPPORT_REMOVED represents the case where the given EOS version no longer\nsupports the SKU.\n - ERROR_CODE_PHYSICAL_DEVICE_EOS_INCOMPATIBLE: ERROR_CODE_PHYSICAL_DEVICE_EOS_INCOMPATIBLE represents the case where the physical device\ndoes not support the given EOS type.\n - ERROR_CODE_TA_EMBEDDEDEXT_INCOMPATIBLE: ERROR_CODE_TA_EMBEDDEDEXT_INCOMPATIBLE represents the case where the extension TerminAttr\nversion is lower than the embedded TerminAttr version in SWI.\n - ERROR_CODE_DEVICE_EOS_2GB_INCOMPATIBLE: ERROR_CODE_DEVICE_EOS_2GB_INCOMPATIBLE represents the case where a 2GB-device is incompatible\nwith a non-2GB EOS or a non-2GB device is incompatible with a 2GB-EOS.\n - ERROR_CODE_EOS_EXTENSION_VERSION_INCOMPATIBLE: ERROR_CODE_EOS_EXTENSION_VERSION_INCOMPATIBLE represents the case where the given extension\nversion doesn't support the given EOS version."
+      "description": "ErrorCode indicates errors produced during image validations.\n\n - ERROR_CODE_UNSPECIFIED: ERROR_CODE_UNSPECIFIED indicates error code is unspecified.\n - ERROR_CODE_SUPPORT_NOT_INTRODUCED: ERROR_CODE_SUPPORT_NOT_INTRODUCED represents case where the given EOS version does\nnot support the SKU.\nDeprecated - use ERROR_CODE_EOS_SUPPORT_NOT_INTRODUCED\n - ERROR_CODE_SUPPORT_REMOVED: ERROR_CODE_SUPPORT_REMOVED represents case where the given EOS version no longer\nsupports the SKU.\nDeprecated - use ERROR_CODE_EOS_SUPPORT_REMOVED\n - ERROR_CODE_DEVICE_UNREACHABLE: ERROR_CODE_DEVICE_UNREACHABLE represents the case where the device\nis unreachable during a compliance computation.\n - ERROR_CODE_VALIDATION_FAILED: ERROR_CODE_VALIDATION_FAILED represents case where the validations checks\nfailed.\n - ERROR_CODE_GET_PROPOSED_IMAGE_INFO_FAILED: ERROR_CODE_GET_PROPOSED_IMAGE_INFO_FAILED represents case where we are\nunable to get proposed image information for a device.\n - ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED: ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_ACTIVE_SUPERVISOR_FAILED represents case where we\nfail to get running image information from an active supervisor.\n - ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED: ERROR_CODE_GET_RUNNING_IMAGE_INFO_FROM_PEER_SUPERVISOR_FAILED represents case when we\nfail to get information from peer supervisor.\n - ERROR_CODE_EOS_TA_ARCHITECTURE_INCOMPATIBLE: ERROR_CODE_EOS_TA_ARCHITECTURE_INCOMPATIBLE represents the case where EOS architecture and\nTerminAttr architecture are incompatible.\n - ERROR_CODE_TA_CV_INCOMPATIBLE: ERROR_CODE_TA_CV_INCOMPATIBLE represents the case where TerminAttr is incompatible with\nCloudVision; i.e., the TerminAttr version is below CloudVision's minimum supported version.\n - ERROR_CODE_EOS_CV_INCOMPATIBLE: ERROR_CODE_EOS_CV_INCOMPATIBLE represents the case where the EOS version is incompatible with\nCloudVision; i.e., the EOS version is outside of CloudVision's supported range of versions.\n - ERROR_CODE_EOS_SUPPORT_NOT_INTRODUCED: ERROR_CODE_EOS_SUPPORT_NOT_INTRODUCED represents the case where the given EOS version does\nnot support the SKU.\n - ERROR_CODE_EOS_SUPPORT_REMOVED: ERROR_CODE_EOS_SUPPORT_REMOVED represents the case where the given EOS version no longer\nsupports the SKU.\n - ERROR_CODE_PHYSICAL_DEVICE_EOS_INCOMPATIBLE: ERROR_CODE_PHYSICAL_DEVICE_EOS_INCOMPATIBLE represents the case where the physical device\ndoes not support the given EOS type.\n - ERROR_CODE_TA_EMBEDDEDEXT_INCOMPATIBLE: ERROR_CODE_TA_EMBEDDEDEXT_INCOMPATIBLE represents the case where the extension TerminAttr\nversion is lower than the embedded TerminAttr version in SWI.\n - ERROR_CODE_DEVICE_EOS_2GB_INCOMPATIBLE: ERROR_CODE_DEVICE_EOS_2GB_INCOMPATIBLE represents the case where a 2GB-device is incompatible\nwith a non-2GB EOS or a non-2GB device is incompatible with a 2GB-EOS.\n - ERROR_CODE_EOS_EXTENSION_VERSION_INCOMPATIBLE: ERROR_CODE_EOS_EXTENSION_VERSION_INCOMPATIBLE represents the case where the given extension\nversion doesn't support the given EOS version.\n - ERROR_CODE_ARCH_UNSUPPORTED: ERROR_CODE_ARCH_UNSUPPORTED represents the case where the given image architecture is not\nsupported by CloudVision."
     },
     "arista.imagestatus.v1.Extension": {
       "type": "object",
@@ -3223,10 +3224,11 @@
         "CONFIG_VALIDATION_SKIP_CAUSE_INACTIVE",
         "CONFIG_VALIDATION_SKIP_CAUSE_PRE_PROVISIONED",
         "CONFIG_VALIDATION_SKIP_CAUSE_CONFIG_UNCHANGED",
-        "CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES"
+        "CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES",
+        "CONFIG_VALIDATION_SKIP_CAUSE_DEVICE_DECOMMISSIONED"
       ],
       "default": "CONFIG_VALIDATION_SKIP_CAUSE_UNSPECIFIED",
-      "description": "ConfigValidationSkipCause enumerates the set of reasons a device can skip the config\nvalidation stage.\n\n - CONFIG_VALIDATION_SKIP_CAUSE_UNSPECIFIED: CONFIG_VALIDATION_SKIP_CAUSE_UNSPECIFIED indicates config validation skip cause is\nunspecified.\n - CONFIG_VALIDATION_SKIP_CAUSE_INACTIVE: CONFIG_VALIDATION_SKIP_CAUSE_INACTIVE indicates that the stage was skipped\nbecause the device is not streaming.\n - CONFIG_VALIDATION_SKIP_CAUSE_PRE_PROVISIONED: CONFIG_VALIDATION_SKIP_CAUSE_PRE_PROVISIONED indicates that the stage was\nskipped because the device is pre-provisioned.\n - CONFIG_VALIDATION_SKIP_CAUSE_CONFIG_UNCHANGED: CONFIG_VALIDATION_SKIP_CAUSE_CONFIG_UNCHANGED indicates that the stage was\nskipped because the device has no configuration changes in the workspace.\n - CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES: CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES indicates that the stage was\nskipped because the device has no config sources in the workspace."
+      "description": "ConfigValidationSkipCause enumerates the set of reasons a device can skip the config\nvalidation stage.\n\n - CONFIG_VALIDATION_SKIP_CAUSE_UNSPECIFIED: CONFIG_VALIDATION_SKIP_CAUSE_UNSPECIFIED indicates config validation skip cause is\nunspecified.\n - CONFIG_VALIDATION_SKIP_CAUSE_INACTIVE: CONFIG_VALIDATION_SKIP_CAUSE_INACTIVE indicates that the stage was skipped\nbecause the device is not streaming.\n - CONFIG_VALIDATION_SKIP_CAUSE_PRE_PROVISIONED: CONFIG_VALIDATION_SKIP_CAUSE_PRE_PROVISIONED indicates that the stage was\nskipped because the device is pre-provisioned.\n - CONFIG_VALIDATION_SKIP_CAUSE_CONFIG_UNCHANGED: CONFIG_VALIDATION_SKIP_CAUSE_CONFIG_UNCHANGED indicates that the stage was\nskipped because the device has no configuration changes in the workspace.\n - CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES: CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES indicates that the stage was\nskipped because the device has no config sources in the workspace.\n - CONFIG_VALIDATION_SKIP_CAUSE_DEVICE_DECOMMISSIONED: CONFIG_VALIDATION_SKIP_CAUSE_DEVICE_DECOMMISSIONED indicates that the stage was\nskipped because the device is decommissioned in the workspace."
     },
     "arista.workspace.v1.ConfigletBuildResult": {
       "type": "object",
diff --git a/arista/workspace.v1/workspace-changelog.yaml b/arista/workspace.v1/workspace-changelog.yaml
index ea938f4f..4dc59a19 100644
--- a/arista/workspace.v1/workspace-changelog.yaml
+++ b/arista/workspace.v1/workspace-changelog.yaml
@@ -7,6 +7,10 @@
 # New entries go on top.
 
 Changes:
+    - date: 2024-07-30
+      description: Add device decommissioned skip cause to ConfigValidationSkipCause
+      version: 1.3.6
+      cvaas: true
     - date: 2024-07-29
       description: Add device sync config
       version: 1.3.5
diff --git a/arista/workspace.v1/workspace.proto b/arista/workspace.v1/workspace.proto
index 0a414503..eef6f498 100644
--- a/arista/workspace.v1/workspace.proto
+++ b/arista/workspace.v1/workspace.proto
@@ -478,6 +478,9 @@ enum ConfigValidationSkipCause {
 	// CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES indicates that the stage was
 	// skipped because the device has no config sources in the workspace.
 	CONFIG_VALIDATION_SKIP_CAUSE_NO_CONFIG_SOURCES = 4;
+	// CONFIG_VALIDATION_SKIP_CAUSE_DEVICE_DECOMMISSIONED indicates that the stage was
+	// skipped because the device is decommissioned in the workspace.
+	CONFIG_VALIDATION_SKIP_CAUSE_DEVICE_DECOMMISSIONED = 5;
 }
 
 // ImageValidationSkipCause enumerates the set of reasons a device can skip the image