diff --git a/.github/workflows/spacktainer.yaml b/.github/workflows/spacktainer.yaml
index c66d667..800c050 100644
--- a/.github/workflows/spacktainer.yaml
+++ b/.github/workflows/spacktainer.yaml
@@ -3,10 +3,13 @@ name: Build Spacktainers
 on: [push]
 jobs:
   base-container-job:
-    runs-on:
-      - codebuild-spacktainers-${{ github.run_id }}-${{ github.run_attempt }}
-      - image:LINUX_CONTAINER-quay.io/buildah/stable:latest
+    runs-on: [ubuntu-latest]
     steps:
+      - name: Run CodeBuild
+        uses: aws-actions/aws-codebuild-run-build@v1
+        with:
+          project-name: spacktainers
+          image-override: quay.io/buildah/stable:latest
       - name: clone repo
         uses: actions/checkout@v4
       - name: create builder
@@ -15,14 +18,13 @@ jobs:
           AWS_BUILDER_REPO_URL: ${{ secrets.AWS_REPO_URL }}/spacktainers/builder
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
-          BUILDAH_EXTRA_ARGS: (
-            '--label org.opencontainers.image.revision="$GITHUB_SHA"'
+          BUILDAH_EXTRA_ARGS: ( '--label org.opencontainers.image.revision="$GITHUB_SHA"'
             ' --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR"'
             ' --label org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}"'
             ' --label org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}"'
             ' --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"'
-            ' --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"'
-            '--build-arg SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651')
+            ' --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"' '--build-arg
+            SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651')
           # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
         run: |-
           echo "Creating builder"
@@ -45,14 +47,13 @@ jobs:
           AWS_BUILDER_REPO_URL: ${{ secrets.AWS_REPO_URL }}/spacktainers/runtime
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ECR_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ECR_SECRET_ACCESS_KEY }}
-          BUILDAH_EXTRA_ARGS: (
-            '--label org.opencontainers.image.revision="$GITHUB_SHA"'
+          BUILDAH_EXTRA_ARGS: ( '--label org.opencontainers.image.revision="$GITHUB_SHA"'
             ' --label org.opencontainers.image.authors="$GITHUB_TRIGGERING_ACTOR"'
             ' --label org.opencontainers.image.url="https://github.com/${GITHUB_REPOSITORY}"'
             ' --label org.opencontainers.image.source="https://github.com/${GITHUB_REPOSITORY}"'
             ' --label ch.epfl.bbpgitlab.ci-pipeline-url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID"'
-            ' --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"'
-            '--build-arg SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651')
+            ' --label ch.epfl.bbpgitlab.ci-commit-branch="$GITHUB_REF_NAME"' '--build-arg
+            SPACK_BRANCH=59179764d711a9a4e9e36b5b08a8587e2455a651')
           # ' --label org.opencontainers.image.created="$CI_JOB_STARTED_AT"'
         run: |-
           # Holy code duplication, Batman!