diff --git a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettingsTests.java b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettingsTests.java
index 1f8fd89b6fa..137ea65a9bc 100644
--- a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettingsTests.java
+++ b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettingsTests.java
@@ -153,10 +153,9 @@ public class GoogleCloudStorageClientSettingsTests extends OpenSearchTestCase {
         secureSettings.setFile(CREDENTIALS_FILE_SETTING.getConcreteSettingForNamespace(clientName).getKey(), credentials.v2());
 
         String endpoint;
-        // TODO: use openearch.co, will update once finalized
         if (randomBoolean()) {
-            endpoint = randomFrom("http://www.opensearch.co", "http://metadata.google.com:88/oauth", "https://www.googleapis.com",
-                    "https://www.opensearch.co:443", "http://localhost:8443", "https://www.googleapis.com/oauth/token");
+            endpoint = randomFrom("http://www.opensearch.org", "http://metadata.google.com:88/oauth", "https://www.googleapis.com",
+                    "https://www.opensearch.org:443", "http://localhost:8443", "https://www.googleapis.com/oauth/token");
             settings.put(ENDPOINT_SETTING.getConcreteSettingForNamespace(clientName).getKey(), endpoint);
         } else {
             endpoint = ENDPOINT_SETTING.getDefault(Settings.EMPTY);
diff --git a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java
index b802ad65235..d7405aab86c 100644
--- a/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java
+++ b/plugins/repository-gcs/src/test/java/org/opensearch/repositories/gcs/GoogleCloudStorageServiceTests.java
@@ -62,9 +62,8 @@ public class GoogleCloudStorageServiceTests extends OpenSearchTestCase {
         final TimeValue connectTimeValue = TimeValue.timeValueNanos(randomIntBetween(0, 2000000));
         final TimeValue readTimeValue = TimeValue.timeValueNanos(randomIntBetween(0, 2000000));
         final String applicationName = randomAlphaOfLength(randomIntBetween(1, 10)).toLowerCase(Locale.ROOT);
-        // TODO: use www.opensearch.co now, will update once finalized
         final String endpoint = randomFrom("http://", "https://")
-                + randomFrom("www.opensearch.co", "www.googleapis.com", "localhost/api", "google.com/oauth")
+                + randomFrom("www.opensearch.org", "www.googleapis.com", "localhost/api", "google.com/oauth")
                 + ":" + randomIntBetween(1, 65535);
         final String projectIdName = randomAlphaOfLength(randomIntBetween(1, 10)).toLowerCase(Locale.ROOT);
         final Settings settings = Settings.builder()
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml
index db47c588a94..dedf010576a 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_create.yml
@@ -13,7 +13,7 @@
               uri: "hdfs://localhost:9998"
               path: "/user/opensearch/test/repository_create"
               security:
-                principal: "opensearch@BUILD.OPENSEARCH.CO"
+                principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
     # Get repository
     - do:
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml
index e5125601ef6..ce38ff21d7d 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_delete.yml
@@ -13,7 +13,7 @@
               uri: "hdfs://localhost:9998"
               path: "/user/opensearch/foo/bar"
               security:
-                principal: "opensearch@BUILD.OPENSEARCH.CO"
+                principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
     # Get repository
     - do:
@@ -44,7 +44,7 @@
               uri: "hdfs://localhost:9998"
               path: "/user/opensearch/foo/bar"
               security:
-                principal: "opensearch@BUILD.OPENSEARCH.CO"
+                principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
     # Get repository again
     - do:
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml
index 93c92484783..2438ff40126 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/20_repository_verify.yml
@@ -12,7 +12,7 @@
               uri: "hdfs://localhost:9998"
               path: "/user/opensearch/test/repository_verify"
               security:
-                principal: "opensearch@BUILD.OPENSEARCH.CO"
+                principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
     # Verify repository
     - do:
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml
index 4aea31dde86..44f29fe0341 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot.yml
@@ -14,7 +14,7 @@
             uri: "hdfs://localhost:9998"
             path: "/user/opensearch/test/snapshot"
             security:
-              principal: "opensearch@BUILD.OPENSEARCH.CO"
+              principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
   # Create index
   - do:
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml
index 246e51d9f90..3a85f4ccc93 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_get.yml
@@ -14,7 +14,7 @@
             uri: "hdfs://localhost:9998"
             path: "/user/opensearch/test/snapshot_get"
             security:
-              principal: "opensearch@BUILD.OPENSEARCH.CO"
+              principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
   # Create index
   - do:
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_readonly.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_readonly.yml
index 88c32909fb8..ba95fbeb978 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_readonly.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/30_snapshot_readonly.yml
@@ -14,7 +14,7 @@
             uri: "hdfs://localhost:9998"
             path: "/user/opensearch/existing/readonly-repository"
             security:
-              principal: "opensearch@BUILD.OPENSEARCH.CO"
+              principal: "opensearch@BUILD.OPENSEARCH.ORG"
             readonly: true
 
   # List snapshot info
diff --git a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
index 9729d5b23b6..03f1b7d366a 100644
--- a/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
+++ b/plugins/repository-hdfs/src/test/resources/rest-api-spec/test/secure_hdfs_repository/40_restore.yml
@@ -15,7 +15,7 @@
             uri: "hdfs://localhost:9998"
             path: "/user/opensearch/test/restore"
             security:
-              principal: "opensearch@BUILD.OPENSEARCH.CO"
+              principal: "opensearch@BUILD.OPENSEARCH.ORG"
 
   # Create index
   - do: