diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b05afb71ff36f4265dc44ce511611e0d721d9f8..701740513011815a2fe33c918732d655fac1eccb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -194,8 +194,8 @@ aws/rke2/cluster up:
   extends:
     - .infra create
     - .rke2 up
-  needs:
-    - job: aws/network up
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Install BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang up:
@@ -213,6 +213,9 @@ aws/rke2/bigbang up:
     - kubectl apply -f ${CI_PROJECT_DIR}/.gitlab-ci/jobs/rke2/dependencies/k8s-resources/aws/default-ebs-sc.yaml
   script:
     - *deploy_bigbang
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+
 
 # Run tests on BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang test:
@@ -223,7 +226,6 @@ aws/rke2/bigbang test:
   needs:
     - job: aws/rke2/cluster up
       artifacts: true
-    - job: aws/rke2/bigbang up
   before_script:
     - mkdir -p ~/.kube
     - cp ${CI_PROJECT_DIR}/rke2.yaml ~/.kube/config
@@ -233,6 +235,8 @@ aws/rke2/bigbang test:
     - yum install bind-utils -y
     - ./scripts/hosts.sh
     - *test_bigbang
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Uninstall BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang down:
@@ -243,7 +247,6 @@ aws/rke2/bigbang down:
   needs:
     - job: aws/rke2/cluster up
       artifacts: true
-    - job: aws/rke2/bigbang test
   before_script:
     - mkdir -p ~/.kube
     - cp ${CI_PROJECT_DIR}/rke2.yaml ~/.kube/config
@@ -251,6 +254,8 @@ aws/rke2/bigbang down:
     - helm un -n bigbang bigbang
     # TODO: Smarter wait
     - sleep 180
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Destroy RKE2 cluster on AWS
 aws/rke2/cluster down:
@@ -258,8 +263,8 @@ aws/rke2/cluster down:
   extends:
     - .infra cleanup
     - .rke2 down
-  needs:
-    - job: aws/rke2/bigbang down
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 #-----------------------------------------------------------------------------------------------------------------------