diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index fd00f43..949854d 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -110,9 +110,11 @@ jobs:
         clang-format-version: '11'
 
   integration:
+    # runs-on:
+    #   - self-hosted
+    #   - hugepages
     runs-on:
-      - self-hosted
-      - hugepages
+      - ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -146,9 +148,11 @@ jobs:
         make retest DEV_IMAGE="${dev_image}"
 
   e2e:
+    # runs-on:
+    #   - self-hosted
+    #   - hugepages
     runs-on:
-      - self-hosted
-      - hugepages
+      - ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/hack/ci-build.sh b/hack/ci-build.sh
index 0c8f913..d854009 100755
--- a/hack/ci-build.sh
+++ b/hack/ci-build.sh
@@ -19,17 +19,6 @@ function do_build {
   # --export-cache type=inline \
   # --import-cache type=registry,ref="${IMAGE_BASE_NAME}" \
   set -x
-  # buildctl build \
-  #          --frontend dockerfile.v0 \
-  #          --progress=plain \
-  #          --local context=. \
-  #          --local dockerfile=. \
-  #          --opt filename="${DOCKERFILE}" \
-  #          --opt build-arg:BUILD_TYPE=${BUILD_TYPE} \
-  #          --opt build-arg:BASE=${VPP_IMAGE_BASE}_${BUILD_TYPE} \
-  #          --opt build-arg:DEVBASE=${VPP_IMAGE_BASE}_dev_${BUILD_TYPE} \
-  #          --opt label:quay.expires-after="${IMAGE_EXPIRES_AFTER}" \
-  #          "$@"
   docker buildx build \
     --progress plain \
     --file "${DOCKERFILE}" \