diff --git a/Dockerfile.network-observer b/Dockerfile.network-observer
index c50b37e4b..e30bdeee8 100644
--- a/Dockerfile.network-observer
+++ b/Dockerfile.network-observer
@@ -16,9 +16,9 @@ RUN make GOARCH=$TARGETARCH build-network-observer
 FROM --platform=$BUILDPLATFORM node:20.9.0 AS console-builder
 
 WORKDIR /skupper-console/
-ADD https://github.com/skupperproject/skupper-console/archive/refs/tags/2.0.0-preview.tar.gz .
-RUN tar -zxf 2.0.0-preview.tar.gz
-WORKDIR ./skupper-console-2.0.0-preview
+ADD https://github.com/skupperproject/skupper-console/archive/v2.tar.gz .
+RUN tar -zxf v2.tar.gz
+WORKDIR ./skupper-console-2
 RUN yarn install && yarn build
 
 FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9-minimal
@@ -34,5 +34,5 @@ USER 10000
 
 WORKDIR /app
 COPY --from=builder /go/src/app/network-observer .
-COPY --from=console-builder /skupper-console/skupper-console-2.0.0-preview/build/ console
+COPY --from=console-builder /skupper-console/skupper-console-2/build/ console
 ENTRYPOINT ["/app/network-observer"]
diff --git a/charts/skupper-setup/values.yaml b/charts/skupper-setup/values.yaml
index 46711fb0a..50f0871b8 100644
--- a/charts/skupper-setup/values.yaml
+++ b/charts/skupper-setup/values.yaml
@@ -1,6 +1,6 @@
 images:
-  controller: "quay.io/skupper/controller:2.0.0-preview-2"
-  adaptor: "quay.io/skupper/kube-adaptor:2.0.0-preview-2"
+  controller: "quay.io/skupper/controller:v2-latest"
+  adaptor: "quay.io/skupper/kube-adaptor:v2-latest"
 
 # available options: cluster, namespace
 scope: cluster
\ No newline at end of file
diff --git a/cmd/bootstrap/bootstrap.sh b/cmd/bootstrap/bootstrap.sh
index 60e4a3fcc..dc2f258d6 100755
--- a/cmd/bootstrap/bootstrap.sh
+++ b/cmd/bootstrap/bootstrap.sh
@@ -2,7 +2,7 @@
 
 set -Ceu
 
-IMAGE="quay.io/skupper/cli:2.0.0-preview-2"
+IMAGE="quay.io/skupper/cli:v2-latest"
 export INPUT_PATH=""
 export NAMESPACE=""
 export FORCE_FLAG=""
diff --git a/cmd/network-observer/resources/developer/native-complete.yaml b/cmd/network-observer/resources/developer/native-complete.yaml
index ba1d3a9c7..876198370 100644
--- a/cmd/network-observer/resources/developer/native-complete.yaml
+++ b/cmd/network-observer/resources/developer/native-complete.yaml
@@ -242,7 +242,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:2.0.0-preview-2
+      - image: quay.io/skupper/network-observer:v2-latest
         imagePullPolicy: Always
         name: network-observer
         args:
diff --git a/cmd/network-observer/resources/developer/native-insecure-complete.yaml b/cmd/network-observer/resources/developer/native-insecure-complete.yaml
index b7a1fa296..9d379903a 100644
--- a/cmd/network-observer/resources/developer/native-insecure-complete.yaml
+++ b/cmd/network-observer/resources/developer/native-insecure-complete.yaml
@@ -214,7 +214,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:2.0.0-preview-2
+      - image: quay.io/skupper/network-observer:v2-latest
         imagePullPolicy: Always
         name: network-observer
         args:
diff --git a/cmd/network-observer/resources/developer/openshift-complete.yaml b/cmd/network-observer/resources/developer/openshift-complete.yaml
index 8460d224c..b52cd9c5c 100644
--- a/cmd/network-observer/resources/developer/openshift-complete.yaml
+++ b/cmd/network-observer/resources/developer/openshift-complete.yaml
@@ -238,7 +238,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:2.0.0-preview-2
+      - image: quay.io/skupper/network-observer:v2-latest
         imagePullPolicy: Always
         name: network-observer
         args:
diff --git a/cmd/network-observer/resources/native/deployment.yaml b/cmd/network-observer/resources/native/deployment.yaml
index 62c7f03af..f9a06eea6 100644
--- a/cmd/network-observer/resources/native/deployment.yaml
+++ b/cmd/network-observer/resources/native/deployment.yaml
@@ -58,7 +58,7 @@ spec:
         app.kubernetes.io/component: server
     spec:
       containers:
-      - image: quay.io/skupper/network-observer:2.0.0-preview-2
+      - image: quay.io/skupper/network-observer:v2-latest
         imagePullPolicy: Always
         name: network-observer
         args:
diff --git a/cmd/network-observer/resources/openshift/deployment.yaml b/cmd/network-observer/resources/openshift/deployment.yaml
index da8b4fe51..0c9ab1e22 100644
--- a/cmd/network-observer/resources/openshift/deployment.yaml
+++ b/cmd/network-observer/resources/openshift/deployment.yaml
@@ -43,7 +43,7 @@ spec:
       serviceAccountName: network-observer
       containers:
       - name: network-observer
-        image: quay.io/skupper/network-observer:2.0.0-preview-2
+        image: quay.io/skupper/network-observer:v2-latest
         imagePullPolicy: Always
         args:
           - -listen=127.0.0.1:8080
diff --git a/pkg/images/images.go b/pkg/images/images.go
index 6bb3b6e21..4d0caf834 100644
--- a/pkg/images/images.go
+++ b/pkg/images/images.go
@@ -2,11 +2,11 @@ package images
 
 const (
 	DefaultImageRegistry     string = "quay.io/skupper"
-	RouterImageName          string = "skupper-router:3.1.0"
-	ControllerImageName      string = "controller:2.0.0-preview-2"
-	AdaptorImageName         string = "kube-adaptor:2.0.0-preview-2"
-	NetworkObserverImageName string = "network-observer:2.0.0-preview-2"
-	CliImageName             string = "cli:2.0.0-preview-2"
+	RouterImageName          string = "skupper-router:main"
+	ControllerImageName      string = "controller:v2-latest"
+	AdaptorImageName         string = "kube-adaptor:v2-latest"
+	NetworkObserverImageName string = "network-observer:v2-latest"
+	CliImageName             string = "cli:v2-latest"
 
 	PrometheusImageRegistry   string = "quay.io/prometheus"
 	PrometheusServerImageName string = "prometheus:v2.42.0"