diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 8e490d4a..ffbc6403 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -71,7 +71,7 @@ jobs:
   conformance-test:
     name: MCS Conformance
     needs: images
-    timeout-minutes: 30
+    timeout-minutes: 60
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repository
@@ -80,16 +80,40 @@ jobs:
       - name: Check out the mcs-api repository
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
         with:
-          ref: 99db3af0a467136b9d1d2f19b13db0b78adac6d1
-          repository: kubernetes-sigs/mcs-api
+          ref: d7f9ae8600139f8044baf3924b08466448a3bfd9
+          repository: tpantelis/mcs-api
           path: mcs-api
 
-      - name: Deploy Submariner
+      - name: Deploy Submariner without clusterset IP enabled
+        shell: bash
+        run: |
+          make deploy
+
+      - name: Run conformance tests with Connectivity
+        shell: bash
+        run: |
+          export KUBECONFIG=$(find $(git rev-parse --show-toplevel)/output/kubeconfigs/ -type f -printf %p:)
+          cd mcs-api/conformance
+          go test -v -timeout 30m -contexts cluster1,cluster2 -args -test.timeout 15m \
+              --ginkgo.v --ginkgo.trace --ginkgo.label-filter "Connectivity"
+
+      - name: Print report.html
+        if: always()
+        shell: bash
+        run: |
+          cat mcs-api/conformance/report.html
+
+      - name: Clean up Submariner deployment
+        shell: bash
+        run: |
+          make clean-clusters
+
+      - name: Deploy Submariner with clusterset IP enabled
         shell: bash
         run: |
           make deploy using="clusterset-ip"
 
-      - name: Run conformance tests
+      - name: Run conformance tests without Connectivity
         shell: bash
         run: |
           export KUBECONFIG=$(find $(git rev-parse --show-toplevel)/output/kubeconfigs/ -type f -printf %p:)