diff --git a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.16.yaml b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.16.yaml
index d8ad31d1207f..b0c75c76eec5 100644
--- a/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.16.yaml
+++ b/ci-operator/config/medik8s/node-maintenance-operator/medik8s-node-maintenance-operator-main__4.16.yaml
@@ -3,10 +3,6 @@ base_images:
     name: "4.16"
     namespace: ocp
     tag: base
-  cli-operator-sdk:
-    name: cli-operator-sdk
-    namespace: ocp
-    tag: v1.30.0
 binary_build_commands: make build
 build_root:
   from_repository: true
@@ -43,22 +39,52 @@ tests:
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   steps:
     cluster_profile: medik8s-aws
-    dependencies:
-      OO_BUNDLE: my-bundle
     env:
       BASE_DOMAIN: medik8s-ci.projects.ecosystem.sysdeseng.com
-      OO_INSTALL_NAMESPACE: nmo-install
+      OPERATOR_NAMESPACE: nmo-install
     test:
+    - as: e2e-install-operator-last-version
+      cli: latest
+      commands: |
+        oc create namespace "$OPERATOR_NAMESPACE"
+
+        # workaround for OLM pod not running with restricted PSA
+        oc label --overwrite ns "$OPERATOR_NAMESPACE" security.openshift.io/scc.podSecurityLabelSync=false
+        oc label --overwrite ns "$OPERATOR_NAMESPACE" pod-security.kubernetes.io/enforce=privileged
+
+        # OPERATOR_NAMESPACE variable is used by bundle-run and bundle-run-update
+        BUNDLE_IMG=quay.io/medik8s/node-maintenance-operator-bundle:v0.17.0 make bundle-run
+      env:
+      - name: OPERATOR_NAMESPACE
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
+    - as: e2e-upgrade-operator-latest
+      cli: latest
+      commands: BUNDLE_IMG="$OO_BUNDLE" make bundle-run-update
+      dependencies:
+      - env: OO_BUNDLE
+        name: my-bundle
+      env:
+      - name: OPERATOR_NAMESPACE
+      from: src
+      resources:
+        requests:
+          cpu: 100m
+          memory: 200Mi
     - as: e2e-test
-      commands: export OPERATOR_NS="$OO_INSTALL_NAMESPACE" && make cluster-functest
+      cli: latest
+      commands: export OPERATOR_NS="$OPERATOR_NAMESPACE" && make cluster-functest
       env:
-      - name: OO_INSTALL_NAMESPACE
+      - name: OPERATOR_NAMESPACE
       from: src
       resources:
         requests:
           cpu: 100m
           memory: 200Mi
-    workflow: optional-operators-ci-operator-sdk-aws
+    workflow: ipi-aws
 zz_generated_metadata:
   branch: main
   org: medik8s