diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 052549da1..961a01943 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -58,15 +58,6 @@ env:
   ECR_DEV:                "369495373322.dkr.ecr.eu-central-1.amazonaws.com"
   ECR_PROD:               "093970136003.dkr.ecr.eu-central-1.amazonaws.com"
 
-  # Why localhost? We use a local registry so that when docker/build-push-action tries to pull the
-  # image we built locally, it'll actually have a place to pull from.
-  #
-  # Otherwise, if we just try to use a local image, it fails trying to pull it from dockerhub.
-  # See https://github.com/moby/buildkit/issues/2343 for more information.
-  # GO_BASE_IMG_PREFIX: "localhost:5000/neondatabase/autoscaling-go-base"
-  # Default architecture to build. In future it would be changed to multi-arch build or separate builds for each arch
-  TARGET_ARCH: "amd64" # move to matrix strategy
-
 defaults:
   run:
     shell: bash -euo pipefail {0}
@@ -93,7 +84,8 @@ jobs:
           echo "scheduler=${{ env.IMG_SCHEDULER }}-${{matrix.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
           echo "autoscaler-agent=${{ env.IMG_AUTOSCALER_AGENT }}-${{matrix.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
           echo "cluster-autoscaler=${{ env.IMG_CLUSTER_AUTOSCALER }}-${{matrix.arch}}:${{ inputs.tag }}" | tee -a $GITHUB_OUTPUT
-
+  
+  # TODO: uncomment when the final PR version is ready
   # vm-kernel:
   #   # nb: use format(..) to catch both inputs.skip = true AND inputs.skip = 'true'.
   #   if: ${{ format('{0}', inputs.skip) != 'true' }}
@@ -110,8 +102,13 @@ jobs:
   build:
     # nb: use format(..) to catch both inputs.skip = true AND inputs.skip = 'true'.
     if: ${{ format('{0}', inputs.skip) != 'true' }}
-    needs: [ tags  ]
-    env: 
+    needs: [ tags  ] # TODO: return vm-kernel dependency when the final PR version is ready
+    env:
+      # Why localhost? We use a local registry so that when docker/build-push-action tries to pull the
+      # image we built locally, it'll actually have a place to pull from.
+      #
+      # Otherwise, if we just try to use a local image, it fails trying to pull it from dockerhub.
+      # See https://github.com/moby/buildkit/issues/2343 for more information. 
       GO_BASE_IMG: ${{ format('localhost:5000/neondatabase/autoscaling-go-base-{0}:dev', matrix.arch) }}
     permissions:
       contents: read  # This is required for actions/checkout
@@ -177,7 +174,7 @@ jobs:
           registry: cache.neon.build
           username: ${{ secrets.NEON_CI_DOCKERCACHE_USERNAME }}
           password: ${{ secrets.NEON_CI_DOCKERCACHE_PASSWORD }}
-
+      # TODO: uncomment when the final PR version is ready
       # - name: Configure dev AWS credentials
       #   if: ${{ format('{0}', inputs.upload-to-ecr) == 'true' }}
       #   uses: aws-actions/configure-aws-credentials@v4
@@ -214,7 +211,7 @@ jobs:
       - name: Load VM kernel
         env:
           # IMAGE: ${{format(needs.vm-kernel.outputs.image_placeholder, matrix.arch)}}
-          # temporary always use image from one of the previous runs
+          # TODO: temporary always use image from one of the previous runs to speedup the build during debug
           IMAGE:  ${{format('neondatabase/vm-kernel-{0}:3372e65.11573472293', matrix.arch)}}
         run: |
           docker pull --quiet $IMAGE
@@ -328,7 +325,8 @@ jobs:
           cache-to: ${{ github.ref_name == 'main' && 'type=registry,ref=cache.neon.build/cluster-autoscaler-neonvm:cache,mode=max' || '' }}
           build-args: |
             CA_GIT_TAG=${{ steps.get-ca-tag.outputs.tag }}
-
+      
+      # TODO: Uncomment when the final PR version is ready
       # - name: Copy all images to ECR
       #   if: ${{ format('{0}', inputs.upload-to-ecr) == 'true' }}
       #   run: |