diff --git a/e2e/defaults.env b/e2e/defaults.env
index dd2cbfd1..7089cda0 100755
--- a/e2e/defaults.env
+++ b/e2e/defaults.env
@@ -11,4 +11,4 @@
 export HOME=${HOME:-/home/ubuntu/}
 export TESTDIR=${TESTDIR:-$E2EDIR/tests/${E2ETYPE:-free5gc}}
 export LIBDIR=${LIBDIR:-$E2EDIR/lib}
-export REVISION=${REVISION:-v2.0.0}
+export REVISION=${REVISION:-main}
diff --git a/e2e/provision/playbooks/cluster.yml b/e2e/provision/playbooks/cluster.yml
index f8b49111..b328f7d7 100644
--- a/e2e/provision/playbooks/cluster.yml
+++ b/e2e/provision/playbooks/cluster.yml
@@ -130,7 +130,7 @@
       become_user: root
       ansible.builtin.unarchive:
         remote_src: true
-        src: https://github.com/nephio-project/porch/releases/download/v2.0.0/porchctl_2.0.0_linux_amd64.tar.gz
+        src: https://github.com/nephio-project/porch/releases/download/main/porchctl.tgz
         dest: /usr/local/bin/
         creates: /usr/local/bin/porchctl
   roles:
diff --git a/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml b/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml
index 789484c2..885b24de 100644
--- a/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml
+++ b/e2e/provision/playbooks/roles/bootstrap/defaults/main.yml
@@ -30,7 +30,7 @@ kind:
   enabled: true
 
 nephio_catalog_repo_uri: https://github.com/nephio-project/catalog.git
-nephio_catalog_revision: v2.0.0
+nephio_catalog_revision: main
 
 gitea:
   enabled: true
diff --git a/e2e/provision/playbooks/roles/bootstrap/tasks/load-gtp5g-module.yml b/e2e/provision/playbooks/roles/bootstrap/tasks/load-gtp5g-module.yml
index de572d20..0ee73750 100644
--- a/e2e/provision/playbooks/roles/bootstrap/tasks/load-gtp5g-module.yml
+++ b/e2e/provision/playbooks/roles/bootstrap/tasks/load-gtp5g-module.yml
@@ -19,7 +19,7 @@
 
 - name: Ensure gtp5g kernel constraints
   ansible.builtin.assert:
-    that: 'ansible_facts.kernel == "5.0.0-23-generic" or {{ ansible_facts.kernel | replace("-generic", "") is version("5.4", ">=") }}'
+    that: 'ansible_facts.kernel == "5.0.0-23-generic" or ansible_facts.kernel | replace("-generic", "") is version("5.4", ">=") '
     fail_msg: "{{ ansible_facts.kernel }} version not supported by gtp5g module"
 
 - name: Install compilation packages and kernel development tools on {{ ansible_os_family }}
diff --git a/e2e/tests/free5gc/002-edge-clusters.yaml b/e2e/tests/free5gc/002-edge-clusters.yaml
index 7fa32690..bea3107a 100644
--- a/e2e/tests/free5gc/002-edge-clusters.yaml
+++ b/e2e/tests/free5gc/002-edge-clusters.yaml
@@ -16,7 +16,7 @@ spec:
   upstream:
     repo: catalog-infra-capi
     package: nephio-workload-cluster
-    revision: v2.0.0
+    revision: main
   targets:
   - repositories:
     - name: mgmt
diff --git a/e2e/tests/free5gc/002-network.yaml b/e2e/tests/free5gc/002-network.yaml
index b8ca13cc..36c304a5 100644
--- a/e2e/tests/free5gc/002-network.yaml
+++ b/e2e/tests/free5gc/002-network.yaml
@@ -16,7 +16,7 @@ spec:
   upstream:
     repo: catalog-distros-sandbox
     package: network
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: mgmt
     package: network
diff --git a/e2e/tests/free5gc/004-free5gc-operator.yaml b/e2e/tests/free5gc/004-free5gc-operator.yaml
index be202e13..1cab306c 100644
--- a/e2e/tests/free5gc/004-free5gc-operator.yaml
+++ b/e2e/tests/free5gc/004-free5gc-operator.yaml
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-free5gc
     package: free5gc-operator
-    revision: v2.0.0
+    revision: main
   targets:
   - objectSelector:
       apiVersion: infra.nephio.org/v1alpha1
diff --git a/e2e/tests/free5gc/005-edge-free5gc-upf.yaml b/e2e/tests/free5gc/005-edge-free5gc-upf.yaml
index 6675d595..3ad095f8 100644
--- a/e2e/tests/free5gc/005-edge-free5gc-upf.yaml
+++ b/e2e/tests/free5gc/005-edge-free5gc-upf.yaml
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-free5gc
     package: pkg-example-upf-bp
-    revision: v2.0.0
+    revision: main
   targets:
   - objectSelector:
       apiVersion: infra.nephio.org/v1alpha1
diff --git a/e2e/tests/free5gc/006-regional-free5gc-amf.yaml b/e2e/tests/free5gc/006-regional-free5gc-amf.yaml
index a930617a..69befe4d 100644
--- a/e2e/tests/free5gc/006-regional-free5gc-amf.yaml
+++ b/e2e/tests/free5gc/006-regional-free5gc-amf.yaml
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-free5gc
     package: pkg-example-amf-bp
-    revision: v2.0.0
+    revision: main
   targets:
   - objectSelector:
       apiVersion: infra.nephio.org/v1alpha1
diff --git a/e2e/tests/free5gc/006-regional-free5gc-smf.yaml b/e2e/tests/free5gc/006-regional-free5gc-smf.yaml
index 5678666e..ab37022c 100644
--- a/e2e/tests/free5gc/006-regional-free5gc-smf.yaml
+++ b/e2e/tests/free5gc/006-regional-free5gc-smf.yaml
@@ -6,7 +6,7 @@ spec:
   upstream:
     repo: catalog-workloads-free5gc
     package: pkg-example-smf-bp
-    revision: v2.0.0
+    revision: main
   targets:
   - objectSelector:
       apiVersion: infra.nephio.org/v1alpha1
diff --git a/e2e/tests/oai/001-infra.yaml b/e2e/tests/oai/001-infra.yaml
index ba5239bb..4f7faedd 100644
--- a/e2e/tests/oai/001-infra.yaml
+++ b/e2e/tests/oai/001-infra.yaml
@@ -16,7 +16,7 @@ spec:
   upstream:
     repo: catalog-infra-capi
     package: nephio-workload-cluster
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: mgmt
     package: core
@@ -37,7 +37,7 @@ spec:
   upstream:
     repo: catalog-infra-capi
     package: nephio-workload-cluster
-    revision: v2.0.0
+    revision: main
   targets:
   - repositories:
     - name: mgmt
@@ -61,7 +61,7 @@ spec:
   upstream:
     repo: catalog-infra-capi
     package: nephio-workload-cluster
-    revision: v2.0.0
+    revision: main
   targets:
   - repositories:
     - name: mgmt
diff --git a/e2e/tests/oai/001-network.yaml b/e2e/tests/oai/001-network.yaml
index b8ca13cc..36c304a5 100644
--- a/e2e/tests/oai/001-network.yaml
+++ b/e2e/tests/oai/001-network.yaml
@@ -16,7 +16,7 @@ spec:
   upstream:
     repo: catalog-distros-sandbox
     package: network
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: mgmt
     package: network
diff --git a/e2e/tests/oai/002-operators.yaml b/e2e/tests/oai/002-operators.yaml
index 1c47e2d7..31c60e2c 100644
--- a/e2e/tests/oai/002-operators.yaml
+++ b/e2e/tests/oai/002-operators.yaml
@@ -51,7 +51,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai-ran
     package: oai-ran-operator
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: edge
     package: oai-ran-operator
@@ -69,7 +69,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai-ran
     package: oai-ran-operator
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: regional
     package: oai-ran-operator
diff --git a/e2e/tests/oai/004-ran-network.yaml b/e2e/tests/oai/004-ran-network.yaml
index 83820525..ee8ff85b 100644
--- a/e2e/tests/oai/004-ran-network.yaml
+++ b/e2e/tests/oai/004-ran-network.yaml
@@ -16,7 +16,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai-ran
     package: pkg-example-cucp-bp
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: regional
     package: oai-ran-cucp
@@ -33,7 +33,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai-ran
     package: pkg-example-du-bp
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: edge
     package: oai-ran-du
@@ -50,7 +50,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai-ran
     package: pkg-example-cuup-bp
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: edge
     package: oai-ran-cuup
diff --git a/e2e/tests/oai/005-ue.yaml b/e2e/tests/oai/005-ue.yaml
index 9c45d899..279528f3 100644
--- a/e2e/tests/oai/005-ue.yaml
+++ b/e2e/tests/oai/005-ue.yaml
@@ -16,7 +16,7 @@ spec:
   upstream:
     repo: catalog-workloads-oai-ran
     package: pkg-example-ue-bp
-    revision: v2.0.0
+    revision: main
   downstream:
     repo: edge
     package: oai-ran-ue