diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
index dea445015f..b364d77206 100644
--- a/botocore/data/endpoints.json
+++ b/botocore/data/endpoints.json
@@ -677,6 +677,7 @@
             },
             "hostname" : "api.ecr.af-south-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.af-south-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -686,6 +687,7 @@
             },
             "hostname" : "api.ecr.ap-east-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-east-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -695,6 +697,7 @@
             },
             "hostname" : "api.ecr.ap-northeast-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-northeast-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -704,6 +707,7 @@
             },
             "hostname" : "api.ecr.ap-northeast-2.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-northeast-2.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -713,6 +717,7 @@
             },
             "hostname" : "api.ecr.ap-northeast-3.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-northeast-3.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -722,6 +727,7 @@
             },
             "hostname" : "api.ecr.ap-south-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-south-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -731,6 +737,7 @@
             },
             "hostname" : "api.ecr.ap-south-2.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-south-2.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -740,6 +747,7 @@
             },
             "hostname" : "api.ecr.ap-southeast-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-southeast-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -749,6 +757,7 @@
             },
             "hostname" : "api.ecr.ap-southeast-2.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-southeast-2.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -758,6 +767,7 @@
             },
             "hostname" : "api.ecr.ap-southeast-3.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-southeast-3.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -767,6 +777,7 @@
             },
             "hostname" : "api.ecr.ap-southeast-4.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-southeast-4.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -776,6 +787,7 @@
             },
             "hostname" : "api.ecr.ap-southeast-5.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ap-southeast-5.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -785,6 +797,7 @@
             },
             "hostname" : "api.ecr.ca-central-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.ca-central-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -794,162 +807,7 @@
             },
             "hostname" : "api.ecr.ca-west-1.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-af-south-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-east-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-northeast-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-northeast-2" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-northeast-3" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-south-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-south-2" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-southeast-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-southeast-2" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-southeast-3" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-southeast-4" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ap-southeast-5" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ca-central-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-ca-west-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-central-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-central-2" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-north-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-south-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-south-2" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-west-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-west-2" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-eu-west-3" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-il-central-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-me-central-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-me-south-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-sa-east-1" : {
-            "deprecated" : true,
-            "variants" : [ {
+              "hostname" : "ecr.ca-west-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -959,10 +817,6 @@
             },
             "deprecated" : true,
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            }, {
-              "tags" : [ "dualstack", "fips" ]
-            }, {
               "hostname" : "ecr-fips.us-east-1.amazonaws.com",
               "tags" : [ "fips" ]
             } ]
@@ -973,10 +827,6 @@
             },
             "deprecated" : true,
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            }, {
-              "tags" : [ "dualstack", "fips" ]
-            }, {
               "hostname" : "ecr-fips.us-east-2.amazonaws.com",
               "tags" : [ "fips" ]
             } ]
@@ -987,10 +837,6 @@
             },
             "deprecated" : true,
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            }, {
-              "tags" : [ "dualstack", "fips" ]
-            }, {
               "hostname" : "ecr-fips.us-west-1.amazonaws.com",
               "tags" : [ "fips" ]
             } ]
@@ -1001,10 +847,6 @@
             },
             "deprecated" : true,
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            }, {
-              "tags" : [ "dualstack", "fips" ]
-            }, {
               "hostname" : "ecr-fips.us-west-2.amazonaws.com",
               "tags" : [ "fips" ]
             } ]
@@ -1015,6 +857,7 @@
             },
             "hostname" : "api.ecr.eu-central-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-central-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1024,6 +867,7 @@
             },
             "hostname" : "api.ecr.eu-central-2.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-central-2.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1033,6 +877,7 @@
             },
             "hostname" : "api.ecr.eu-north-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-north-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1042,6 +887,7 @@
             },
             "hostname" : "api.ecr.eu-south-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-south-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1051,6 +897,7 @@
             },
             "hostname" : "api.ecr.eu-south-2.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-south-2.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1060,6 +907,7 @@
             },
             "hostname" : "api.ecr.eu-west-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-west-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1069,6 +917,7 @@
             },
             "hostname" : "api.ecr.eu-west-2.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-west-2.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1078,6 +927,7 @@
             },
             "hostname" : "api.ecr.eu-west-3.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.eu-west-3.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1143,6 +993,7 @@
             },
             "hostname" : "api.ecr.il-central-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.il-central-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1152,6 +1003,7 @@
             },
             "hostname" : "api.ecr.me-central-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.me-central-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1161,6 +1013,7 @@
             },
             "hostname" : "api.ecr.me-south-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.me-south-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1170,6 +1023,7 @@
             },
             "hostname" : "api.ecr.sa-east-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr.sa-east-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -1179,12 +1033,14 @@
             },
             "hostname" : "api.ecr.us-east-1.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
+              "hostname" : "ecr-fips.us-east-1.amazonaws.com",
+              "tags" : [ "fips" ]
             }, {
+              "hostname" : "ecr-fips.us-east-1.api.aws",
               "tags" : [ "dualstack", "fips" ]
             }, {
-              "hostname" : "ecr-fips.us-east-1.amazonaws.com",
-              "tags" : [ "fips" ]
+              "hostname" : "ecr.us-east-1.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-east-2" : {
@@ -1193,12 +1049,14 @@
             },
             "hostname" : "api.ecr.us-east-2.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
+              "hostname" : "ecr-fips.us-east-2.amazonaws.com",
+              "tags" : [ "fips" ]
             }, {
+              "hostname" : "ecr-fips.us-east-2.api.aws",
               "tags" : [ "dualstack", "fips" ]
             }, {
-              "hostname" : "ecr-fips.us-east-2.amazonaws.com",
-              "tags" : [ "fips" ]
+              "hostname" : "ecr.us-east-2.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-west-1" : {
@@ -1207,12 +1065,14 @@
             },
             "hostname" : "api.ecr.us-west-1.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
+              "hostname" : "ecr-fips.us-west-1.amazonaws.com",
+              "tags" : [ "fips" ]
             }, {
+              "hostname" : "ecr-fips.us-west-1.api.aws",
               "tags" : [ "dualstack", "fips" ]
             }, {
-              "hostname" : "ecr-fips.us-west-1.amazonaws.com",
-              "tags" : [ "fips" ]
+              "hostname" : "ecr.us-west-1.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-west-2" : {
@@ -1221,12 +1081,14 @@
             },
             "hostname" : "api.ecr.us-west-2.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
+              "hostname" : "ecr-fips.us-west-2.amazonaws.com",
+              "tags" : [ "fips" ]
             }, {
+              "hostname" : "ecr-fips.us-west-2.api.aws",
               "tags" : [ "dualstack", "fips" ]
             }, {
-              "hostname" : "ecr-fips.us-west-2.amazonaws.com",
-              "tags" : [ "fips" ]
+              "hostname" : "ecr.us-west-2.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           }
         }
@@ -1239,6 +1101,7 @@
             },
             "hostname" : "api.ecr-public.us-east-1.amazonaws.com",
             "variants" : [ {
+              "hostname" : "ecr-public.us-east-1.api.aws",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -10348,6 +10211,7 @@
           "ap-southeast-2" : { },
           "ap-southeast-3" : { },
           "ap-southeast-4" : { },
+          "ap-southeast-5" : { },
           "ca-central-1" : {
             "variants" : [ {
               "hostname" : "fsx-fips.ca-central-1.amazonaws.com",
@@ -15180,6 +15044,7 @@
           "ap-southeast-2" : { },
           "ap-southeast-3" : { },
           "ap-southeast-4" : { },
+          "ap-southeast-5" : { },
           "ca-central-1" : {
             "variants" : [ {
               "hostname" : "metrics-fips.sagemaker.ca-central-1.amazonaws.com",
@@ -16270,15 +16135,9 @@
       },
       "opsworks-cm" : {
         "endpoints" : {
-          "ap-northeast-1" : { },
-          "ap-southeast-1" : { },
           "ap-southeast-2" : { },
-          "eu-central-1" : { },
           "eu-west-1" : { },
-          "us-east-1" : { },
-          "us-east-2" : { },
-          "us-west-1" : { },
-          "us-west-2" : { }
+          "us-east-1" : { }
         }
       },
       "organizations" : {
@@ -25370,6 +25229,7 @@
             },
             "hostname" : "api.ecr.cn-north-1.amazonaws.com.cn",
             "variants" : [ {
+              "hostname" : "ecr.cn-north-1.api.amazonwebservices.com.cn",
               "tags" : [ "dualstack" ]
             } ]
           },
@@ -25379,18 +25239,7 @@
             },
             "hostname" : "api.ecr.cn-northwest-1.amazonaws.com.cn",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-cn-north-1" : {
-            "deprecated" : true,
-            "variants" : [ {
-              "tags" : [ "dualstack" ]
-            } ]
-          },
-          "dkr-cn-northwest-1" : {
-            "deprecated" : true,
-            "variants" : [ {
+              "hostname" : "ecr.cn-northwest-1.api.amazonwebservices.com.cn",
               "tags" : [ "dualstack" ]
             } ]
           }
@@ -27146,10 +26995,6 @@
             },
             "deprecated" : true,
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            }, {
-              "tags" : [ "dualstack", "fips" ]
-            }, {
               "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com",
               "tags" : [ "fips" ]
             } ]
@@ -27160,10 +27005,6 @@
             },
             "deprecated" : true,
             "variants" : [ {
-              "tags" : [ "dualstack" ]
-            }, {
-              "tags" : [ "dualstack", "fips" ]
-            }, {
               "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com",
               "tags" : [ "fips" ]
             } ]
@@ -27202,12 +27043,14 @@
             },
             "hostname" : "api.ecr.us-gov-east-1.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
+              "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com",
+              "tags" : [ "fips" ]
             }, {
+              "hostname" : "ecr-fips.us-gov-east-1.api.aws",
               "tags" : [ "dualstack", "fips" ]
             }, {
-              "hostname" : "ecr-fips.us-gov-east-1.amazonaws.com",
-              "tags" : [ "fips" ]
+              "hostname" : "ecr.us-gov-east-1.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           },
           "us-gov-west-1" : {
@@ -27216,12 +27059,14 @@
             },
             "hostname" : "api.ecr.us-gov-west-1.amazonaws.com",
             "variants" : [ {
-              "tags" : [ "dualstack" ]
+              "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com",
+              "tags" : [ "fips" ]
             }, {
+              "hostname" : "ecr-fips.us-gov-west-1.api.aws",
               "tags" : [ "dualstack", "fips" ]
             }, {
-              "hostname" : "ecr-fips.us-gov-west-1.amazonaws.com",
-              "tags" : [ "fips" ]
+              "hostname" : "ecr.us-gov-west-1.api.aws",
+              "tags" : [ "dualstack" ]
             } ]
           }
         }