diff --git a/.pipelines/e2e.yml b/.pipelines/e2e.yml
index d12111a4900..77757c48e52 100644
--- a/.pipelines/e2e.yml
+++ b/.pipelines/e2e.yml
@@ -7,9 +7,9 @@ resources:
       source: \Public Cloud ARO pipelines\CI\CI
       trigger: true
   containers:
-    - container: container
-      image: registry.access.redhat.com/ubi8/toolbox:8.8
-      options: --user=0 --privileged -v /dev/shm:/dev/shm --device /dev/net/tun --name vpn
+    - container: golang
+      image: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
+      options: --user=0
 
 # Azure DevOps Pipeline running e2e tests
 variables:
@@ -26,7 +26,6 @@ jobs:
 
       - script: |
           set -xe
-          sudo rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
           sudo dnf install -y make
         displayName: Setup (Container)
         target: container
@@ -36,11 +35,11 @@ jobs:
           azureDevOpsJSONSPN: $(aro-v4-e2e-devops-spn)
 
       - script: |
-          set -e
+          set -xe
           # retrieve the oc cli
           wget -nv https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/$(OpenShiftCLIVersion)/openshift-client-linux-$(OpenShiftCLIVersion).tar.gz
           tar xf openshift-client-linux-$(OpenShiftCLIVersion).tar.gz
-          
+
           OCP_VERSION=4.14.37 OC=./oc make validate-roledef
         displayName: Run check
         target: container