diff --git a/.github/workflows/microshed-ci.yml b/.github/workflows/microshed-ci.yml
index 0bbb1566..a2f93097 100644
--- a/.github/workflows/microshed-ci.yml
+++ b/.github/workflows/microshed-ci.yml
@@ -3,7 +3,7 @@ name: MicroShed CI
 on:
   pull_request:
     branches: 
-    - master
+    - main
     types: [opened, synchronize, reopened, ready_for_review]
     paths-ignore:
       - '.gitignore'
diff --git a/docs/features/Examples.md b/docs/features/Examples.md
index 02e80f71..798620b6 100644
--- a/docs/features/Examples.md
+++ b/docs/features/Examples.md
@@ -8,19 +8,19 @@ Sometimes code is worth a thousand words. Here are some pointers to working exam
 
 ## General Examples
 
-- [Basic JAX-RS application using Gradle](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/jaxrs-json)
-- [Basic JAX-RS application using Maven](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/maven-app)
-- [Basic JAX-RS application using REST Assured](https://github.com/MicroShed/microshed-testing/blob/master/sample-apps/everything-app/src/test/java/org/example/app/RestAssuredIT.java)
-- [JAX-RS and JDBC application using a PostgreSQL database](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/jdbc-app)
-- [JAX-RS application secured with Basic Auth](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/jaxrs-basicauth) 
-- [JAX-RS application secured with MP JWT](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/jaxrs-mpjwt)
-- [JAX-RS and MongoDB application that depends on an external REST service](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/everything-app)
-- [Application using Apache Kafka messaging](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/kafka-app)
-- [Application with no Dockerfile using OpenLiberty adapter](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/liberty-app)
+- [Basic JAX-RS application using Gradle](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/jaxrs-json)
+- [Basic JAX-RS application using Maven](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/maven-app)
+- [Basic JAX-RS application using REST Assured](https://github.com/MicroShed/microshed-testing/blob/main/sample-apps/everything-app/src/test/java/org/example/app/RestAssuredIT.java)
+- [JAX-RS and JDBC application using a PostgreSQL database](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/jdbc-app)
+- [JAX-RS application secured with Basic Auth](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/jaxrs-basicauth) 
+- [JAX-RS application secured with MP JWT](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/jaxrs-mpjwt)
+- [JAX-RS and MongoDB application that depends on an external REST service](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/everything-app)
+- [Application using Apache Kafka messaging](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/kafka-app)
+- [Application with no Dockerfile using OpenLiberty adapter](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/liberty-app)
 
 ## Runtime examples:
 
-- [Testing an application with OpenLiberty](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/liberty-app)
-- [Testing an application with Payara Micro](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/payara-app)
-- [Testing an application with Wildfly](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/wildfly-app)
-- [Testing an application with Quarkus](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/quarkus-app)
+- [Testing an application with OpenLiberty](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/liberty-app)
+- [Testing an application with Payara Micro](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/payara-app)
+- [Testing an application with Wildfly](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/wildfly-app)
+- [Testing an application with Quarkus](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/quarkus-app)
diff --git a/docs/features/KafkaMessaging.md b/docs/features/KafkaMessaging.md
index 86193139..e8f15587 100644
--- a/docs/features/KafkaMessaging.md
+++ b/docs/features/KafkaMessaging.md
@@ -85,6 +85,6 @@ injected `consumer` to the specified `topics`.
 
 ## Additional resources
 
-- [Example application using Apache Kafka messaging](https://github.com/MicroShed/microshed-testing/tree/master/sample-apps/kafka-app)
+- [Example application using Apache Kafka messaging](https://github.com/MicroShed/microshed-testing/tree/main/sample-apps/kafka-app)
 - [OpenLiberty blog on using MicroProfile Reactive Messaging](https://openliberty.io/blog/2019/09/13/microprofile-reactive-messaging.html)
 - [Quarkus guide on using Apache Kafka with Reactive Messaging](https://quarkus.io/guides/kafka)
diff --git a/docs/features/RestAssured.md b/docs/features/RestAssured.md
index 5ddbdeef..f15a2a50 100644
--- a/docs/features/RestAssured.md
+++ b/docs/features/RestAssured.md
@@ -90,7 +90,7 @@ It is also possible to send/receive POJOs with the JSON-B based ObjectMapper:
     }
 ```
 
-For a complete working example, see the [RestAssuredTest class](https://github.com/MicroShed/microshed-testing/blob/master/sample-apps/everything-app/src/test/java/org/example/app/RestAssuredIT.java)
+For a complete working example, see the [RestAssuredTest class](https://github.com/MicroShed/microshed-testing/blob/main/sample-apps/everything-app/src/test/java/org/example/app/RestAssuredIT.java)
 
 ## Auto-configuration override
 
diff --git a/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ApplicationContainer.java b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ApplicationContainer.java
index 905c712a..951d65d1 100644
--- a/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ApplicationContainer.java
+++ b/modules/testcontainers/src/main/java/org/microshed/testing/testcontainers/ApplicationContainer.java
@@ -538,7 +538,7 @@ private String readMpRestClientConfigKey(Class<?> restClientClass) {
      */
     public ApplicationContainer withMpRestClient(String restClientClass, String hostUri) {
         // If we will be running in Docker, sanitize environment variable name using Environment Variables Mapping Rules defined in MP Config:
-        // https://github.com/eclipse/microprofile-config/blob/master/spec/src/main/asciidoc/configsources.asciidoc#environment-variables-mapping-rules
+        // https://github.com/eclipse/microprofile-config/blob/main/spec/src/main/asciidoc/configsources.asciidoc#environment-variables-mapping-rules
         if (ApplicationEnvironment.Resolver.isSelected(TestcontainersConfiguration.class)) {
             restClientClass = restClientClass.replaceAll("[^a-zA-Z0-9_]", "_") + "_mp_rest_url";
         } else {