diff --git a/packages/manager/.changeset/pr-9839-upcoming-features-1698180186838.md b/packages/manager/.changeset/pr-9839-upcoming-features-1698180186838.md
new file mode 100644
index 00000000000..464cd8a5880
--- /dev/null
+++ b/packages/manager/.changeset/pr-9839-upcoming-features-1698180186838.md
@@ -0,0 +1,5 @@
+---
+"@linode/manager": Upcoming Features
+---
+
+Remove temporary code for surfacing VPC interface errors and fix formatting of error in Linode Config dialog ([#9839](https://github.com/linode/manager/pull/9839))
diff --git a/packages/manager/src/features/Linodes/LinodesCreate/VPCPanel.tsx b/packages/manager/src/features/Linodes/LinodesCreate/VPCPanel.tsx
index f841d73cabd..bf6198e03b4 100644
--- a/packages/manager/src/features/Linodes/LinodesCreate/VPCPanel.tsx
+++ b/packages/manager/src/features/Linodes/LinodesCreate/VPCPanel.tsx
@@ -304,16 +304,16 @@ export const VPCPanel = (props: VPCPanelProps) => {
                   </Box>
                 }
               />
-              {assignPublicIPv4Address && publicIPv4Error && (
-                <Typography
-                  sx={(theme) => ({
-                    color: theme.color.red,
-                  })}
-                >
-                  {publicIPv4Error}
-                </Typography>
-              )}
             </Box>
+            {assignPublicIPv4Address && publicIPv4Error && (
+              <Typography
+                sx={(theme) => ({
+                  color: theme.color.red,
+                })}
+              >
+                {publicIPv4Error}
+              </Typography>
+            )}
           </Stack>
         )}
       </Stack>
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx
index c45b7275fa9..3b55047488a 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeConfigs/LinodeConfigDialog.tsx
@@ -425,20 +425,9 @@ export const LinodeConfigDialog = (props: Props) => {
         });
       };
 
-      // @TODO VPC: Remove this override and surface the field errors appropriately
-      // once API fixes interface index bug for ipv4.vpc & ipv4.nat_1_1 errors
-      const overrideFieldForIPv4 = (error: APIError[]) => {
-        error.forEach((err) => {
-          if (err.field && ['ipv4.nat_1_1', 'ipv4.vpc'].includes(err.field)) {
-            err.field = 'interfaces';
-          }
-        });
-      };
-
       formik.setSubmitting(false);
 
       overrideFieldForDevices(error);
-      overrideFieldForIPv4(error);
 
       handleFieldErrors(formik.setErrors, error);
 
diff --git a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx
index 1e7bb13c0db..5ac50fb93b1 100644
--- a/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx
+++ b/packages/manager/src/features/Linodes/LinodesDetail/LinodeSettings/InterfaceSelect.tsx
@@ -128,6 +128,7 @@ export const InterfaceSelect = (props: CombinedProps) => {
     handleChange({
       ipam_address: null,
       ipv4: {
+        nat_1_1: autoAssignLinodeIPv4 ? 'any' : undefined,
         vpc: autoAssignVPCIPv4 ? undefined : vpcIPv4,
       },
       label: null,
@@ -140,6 +141,7 @@ export const InterfaceSelect = (props: CombinedProps) => {
     handleChange({
       ipam_address: null,
       ipv4: {
+        nat_1_1: autoAssignLinodeIPv4 ? 'any' : undefined,
         vpc: autoAssignVPCIPv4 ? undefined : vpcIPv4,
       },
       label: null,