diff --git a/README.md b/README.md
index 9095cf8db..20132abcc 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,8 @@ Skupper v1 will continue to be maintained but no new significant features are pl
 # Useful Links
 Using Skupper v2
 
-* [Simple Example](https://github.com/skupperproject/skupper/blob/v2/cmd/controller/example/README.md)
-* [Network Observer Deployment](https://github.com/skupperproject/skupper/blob/v2/cmd/network-observer/resources/README.md)
+* [Simple Example](https://github.com/skupperproject/skupper/blob/main/cmd/controller/example/README.md)
+* [Network Observer Deployment](https://github.com/skupperproject/skupper/blob/main/cmd/network-observer/resources/README.md)
 * [Redis Example](https://github.com/skupperproject/skupper-example-redis/tree/v2)
 
 # Questions and Feedback
diff --git a/cmd/controller/example/README.md b/cmd/controller/example/README.md
index 9d3293139..b8f6257e7 100644
--- a/cmd/controller/example/README.md
+++ b/cmd/controller/example/README.md
@@ -1,18 +1,18 @@
 # Installing the skupper controller
 
 ```
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_access_grant_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_access_token_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_attached_connector_anchor_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_attached_connector_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_certificate_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_connector_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_link_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_listener_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_router_access_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_secured_access_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/config/crd/bases/skupper_site_crd.yaml
-kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/deploy_cluster_scope.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_access_grant_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_access_token_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_attached_connector_anchor_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_attached_connector_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_certificate_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_connector_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_link_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_listener_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_router_access_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_secured_access_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/config/crd/bases/skupper_site_crd.yaml
+kubectl apply -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/deploy_cluster_scope.yaml
 ```
 
 # Deploy application in two namespaces (or contexts)
@@ -32,23 +32,23 @@ kubectl create deployment backend --image quay.io/skupper/hello-world-backend --
 # Create sites
 
 ```
-kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/site1.yaml
+kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/site1.yaml
 ```
 
 ```
-kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/site2.yaml
+kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/site2.yaml
 ```
 
 # Expose backend in east site
 
 ```
-kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/connector.yaml
+kubectl apply -n east -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/connector.yaml
 ```
 
 # Consume backend in west site
 
 ```
-kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/listener.yaml
+kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/listener.yaml
 ```
 
 # Link sites
@@ -56,7 +56,7 @@ kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skuppe
 Create a Grant in west site:
 
 ```
-kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/controller/example/access_grant.yaml
+kubectl apply -n west -f https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/controller/example/access_grant.yaml
 ```
 
 Wait until url and ca fields in status are set:
diff --git a/cmd/network-observer/README.md b/cmd/network-observer/README.md
index 8c1141e4e..85a86b472 100644
--- a/cmd/network-observer/README.md
+++ b/cmd/network-observer/README.md
@@ -21,7 +21,7 @@ access the Swagger UI at `http://localhost:8080/swagger/`.
 To edit the specification using a hosted (swagger
 editor)[https://editor-next.swagger.io/], open the editor in your browser, and
 import the spec by URL (File -> Import URL) from
-`https://raw.githubusercontent.com/skupperproject/skupper/v2/cmd/network-observer/spec/openapi.yaml`.
+`https://raw.githubusercontent.com/skupperproject/skupper/main/cmd/network-observer/spec/openapi.yaml`.
 
 ## Metrics
 
diff --git a/cmd/network-observer/gen.go b/cmd/network-observer/gen.go
index 403a258c9..6d73fc636 100644
--- a/cmd/network-observer/gen.go
+++ b/cmd/network-observer/gen.go
@@ -1,5 +1,5 @@
 package main
 
-//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen --config=.oapi-codegen.cfg ./spec/openapi.yaml
+//go:generate go run github.com/oapi-codegen/oapi-codegen/main/cmd/oapi-codegen --config=.oapi-codegen.cfg ./spec/openapi.yaml
 //go:generate go run ./codegen -o ./internal/api/extras_gen.go ./internal/api/types_gen.go
 //go:generate go fmt ./internal/api
diff --git a/cmd/network-observer/tools.go b/cmd/network-observer/tools.go
index 648342bb9..473e57ee2 100644
--- a/cmd/network-observer/tools.go
+++ b/cmd/network-observer/tools.go
@@ -3,5 +3,5 @@
 package main
 
 import (
-	_ "github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen"
+	_ "github.com/oapi-codegen/oapi-codegen/main/cmd/oapi-codegen"
 )