diff --git a/devops/gc/pipeline/override-stages.yml b/devops/gc/pipeline/override-stages.yml
index 37ae44b5380368f363a7c04a2a33df691d321efb..7fbe869583913ca3c0875ca46fd7c4a4732229f2 100644
--- a/devops/gc/pipeline/override-stages.yml
+++ b/devops/gc/pipeline/override-stages.yml
@@ -18,11 +18,11 @@ variables:
         REF_DATA_BRANCH="master";
       fi;
 
-gc-anthos-test:
+gc-baremetal-test:
   variables:
-    GC_VENDOR: anthos
+    GC_VENDOR: baremetal
     TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_ID: storage-no-access-tester
-    TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_SECRET: $OSDU_ANTHOS_STORAGE_NO_ACCESS_CLIENT_SECRET
+    TEST_NO_ACCESS_OPENID_PROVIDER_CLIENT_SECRET: $OSDU_BAREMETAL_STORAGE_NO_ACCESS_CLIENT_SECRET
 
 gc-containerize-bootstrap-gitlab:
   variables:
diff --git a/provider/storage-gc/README.md b/provider/storage-gc/README.md
index 9ad43bc8b5bc3c2edcb8e363f52a162fbc812835..5b58ee1b9d6fef2b541143c67442524192c363e4 100644
--- a/provider/storage-gc/README.md
+++ b/provider/storage-gc/README.md
@@ -48,8 +48,8 @@ In the current version, the mappers are equipped with several drivers to the sto
 2. For Google Cloud only
    - GCloud SDK with java (latest version)
 
-### Anthos Service Configuration:
-[Anthos service configuration ](docs/anthos/README.md)
+### Baremetal Service Configuration:
+[Baremetal service configuration ](docs/baremetal/README.md)
 ### Google Cloud Service Configuration:
 [Google Cloud service configuration ](docs/gc/README.md)
 
@@ -139,8 +139,8 @@ cd provider/storage-gc/ && mvn spring-boot:run
 
 This section describes how to run cloud OSDU E2E tests.
 
-### Anthos test configuration:
-[Anthos service configuration ](docs/anthos/README.md)
+### Baremetal test configuration:
+[Baremetal service configuration ](docs/baremetal/README.md)
 ### Google Cloud test configuration:
 [Google Cloud service configuration ](docs/gc/README.md)
 
diff --git a/provider/storage-gc/bootstrap/bootstrap_storage.sh b/provider/storage-gc/bootstrap/bootstrap_storage.sh
index c993d0fe7403aaa3f4b6ab08b036c0ed9db333c2..7e9b730e9a7789e8c3a01c87bd805dc4fc386ea1 100644
--- a/provider/storage-gc/bootstrap/bootstrap_storage.sh
+++ b/provider/storage-gc/bootstrap/bootstrap_storage.sh
@@ -21,7 +21,7 @@ if [ "${ONPREM_ENABLED}" == "true" ]; then
     source ./validate-env.sh "OPENID_PROVIDER_CLIENT_ID"
     source ./validate-env.sh "OPENID_PROVIDER_CLIENT_SECRET"
 
-    # Check that all env ANTHOS variables are provided
+    # Check that all env Baremetal variables are provided
     export KEYCLOAK_AUTH_URL="${OPENID_PROVIDER_URL}/protocol/openid-connect/token"
     export KEYCLOAK_CLIENT_ID="${OPENID_PROVIDER_CLIENT_ID}"
     export KEYCLOAK_CLIENT_SECRET="${OPENID_PROVIDER_CLIENT_SECRET}"
diff --git a/provider/storage-gc/docs/anthos/README.md b/provider/storage-gc/docs/anthos/README.md
index 22307fd1e5a917bf16fc68069cdb0bc39e4ef126..34e8f6b5f02b236b28fd62d041967213a2e6dd74 100644
--- a/provider/storage-gc/docs/anthos/README.md
+++ b/provider/storage-gc/docs/anthos/README.md
@@ -1,4 +1,4 @@
-# Service Configuration for Anthos
+# Service Configuration for Baremetal
 
 ## Table of Contents <a name="TOC"></a>
 * [Environment variables](#Environment-variables)
@@ -459,12 +459,12 @@ Execute following command to build code and run all the integration tests:
 
  ```bash
  # build + run Google Cloud integration tests.
- $ (cd testing/storage-test-anthos/ && mvn clean test)
+ $ (cd testing/storage-test-baremetal/ && mvn clean test)
  ```
 
 
 ## Running locally
-To run storage service locally connected with anthos environment:
+To run storage service locally connected with baremetal environment:
 #### Specify mappers drivers property or run `SPRING_PROFILES_ACTIVE=anthos`
 ```properties
 obmDriver=minio
@@ -523,5 +523,5 @@ kubectl port-forward <rabbit_pod_name> 15672:15672
 kubectl port-forward <rabbit_pod_name> 5672:5672
 kubectl port-forward <minio_pod_name> 9000:9000
 gcloud components install cloud_sql_proxy
-cloud_sql_proxy -instances=<instance_connection_string> -credential_file=<anthos_service_account_json_file>
+cloud_sql_proxy -instances=<instance_connection_string> -credential_file=<baremetal_service_account_json_file>
 ```
diff --git a/testing/pom.xml b/testing/pom.xml
index 2c1662c5ef5ef7ad1a95f7d831b435e8462ce36b..c404ba1700627d869c7a0c655611f4e1f90ed2b0 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -35,7 +35,7 @@
 		<module>storage-test-azure</module>
 		<module>storage-test-gc</module>
 		<module>storage-test-ibm</module>
-        <module>storage-test-anthos</module>
+        <module>storage-test-baremetal</module>
     </modules>
 
 	<properties>
diff --git a/testing/storage-test-anthos/pom.xml b/testing/storage-test-baremetal/pom.xml
similarity index 98%
rename from testing/storage-test-anthos/pom.xml
rename to testing/storage-test-baremetal/pom.xml
index 9913f533ab41ae7202f26cfcb1945bb487bc3683..57a8f37fd4834b89a1e0613e7bae492cd669500b 100644
--- a/testing/storage-test-anthos/pom.xml
+++ b/testing/storage-test-baremetal/pom.xml
@@ -26,7 +26,7 @@
     </parent>
 
     <groupId>org.opengroup.osdu.storage</groupId>
-    <artifactId>storage-test-anthos</artifactId>
+    <artifactId>storage-test-baremetal</artifactId>
     <version>0.21.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/PubsubEndpoint/TestPubsubEndpoint.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/legal/TestPopulateLegalInfoFromParentRecords.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/misc/TestStorageCors.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/misc/TestStress.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryInfoIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryKindsIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestGetQueryRecordsIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestPostFetchRecordsIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestPostQueryRecordsIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/query/TestStorageQuerySuccessful.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestDeleteRecordLogicallyAndItsVersions.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestGetRecordsIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestIngestRecordNotFound.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestLogicalRecordDelete.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestPatchRecords.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestPatchRecords.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestPatchRecords.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestPatchRecords.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestPurgeRecordsIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestRecordAccessAuthorization.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestRecordWithNullField.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestRecordsApiAcceptance.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/records/TestUpdateRecordsMetadata.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/schema/TestCreateSchemaIntegration.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/schema/TestStorageSchemaNegative.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/util/AnthosTestUtils.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/AnthosTestUtils.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/util/AnthosTestUtils.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/AnthosTestUtils.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/util/OpenIDTokenProvider.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/OpenIDTokenProvider.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/util/OpenIDTokenProvider.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/OpenIDTokenProvider.java
diff --git a/testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/util/conf/OpenIDProviderConfig.java b/testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/conf/OpenIDProviderConfig.java
similarity index 100%
rename from testing/storage-test-anthos/src/test/java/org/opengroup/osdu/storage/util/conf/OpenIDProviderConfig.java
rename to testing/storage-test-baremetal/src/test/java/org/opengroup/osdu/storage/util/conf/OpenIDProviderConfig.java
diff --git a/testing/storage-test-anthos/src/test/resources/logback-test.xml b/testing/storage-test-baremetal/src/test/resources/logback-test.xml
similarity index 100%
rename from testing/storage-test-anthos/src/test/resources/logback-test.xml
rename to testing/storage-test-baremetal/src/test/resources/logback-test.xml
diff --git a/testing/storage-test-anthos/src/test/resources/test.properties b/testing/storage-test-baremetal/src/test/resources/test.properties
similarity index 100%
rename from testing/storage-test-anthos/src/test/resources/test.properties
rename to testing/storage-test-baremetal/src/test/resources/test.properties