diff --git a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
index 6d7262c824..7d6b9c33ef 100644
--- a/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
+++ b/.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP
@@ -1 +1,3 @@
 FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.01
+LABEL org.website="https://nanoframework.net/"
+LABEL description="This is dockerfile image for NXP targets"
diff --git a/.github/workflows/devcontainer-all.yaml b/.github/workflows/devcontainer-all.yaml
index 6419e8cf84..2b1977255f 100644
--- a/.github/workflows/devcontainer-all.yaml
+++ b/.github/workflows/devcontainer-all.yaml
@@ -6,7 +6,8 @@ name: Build Dev Container for all platforms
 env:
   CONTAINER_REPO: ghcr.io
   CONTAINER_NAME: dev-container-all
-  CONTAINER_SRC_FILE: .devcontainer/All/Dockerfile.All.SRC
+  CONTAINER_SOURCE_FILE: .devcontainer/All/Dockerfile.All.SRC
+  CONTAINER_VERSION_FILE: .devcontainer/All/Dockerfile.All
 
 on:
   push:
@@ -21,8 +22,11 @@ jobs:
   build:
     if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
     runs-on: ubuntu-latest
-    steps:
+    permissions:
+      contents: read
+      packages: write
 
+    steps:
     - name: Checkout Repository
       uses: actions/checkout@v4
       
@@ -35,28 +39,29 @@ jobs:
         large-packages: false
 
     - name: Get container version
+      shell: pwsh
       run: |
-        $dockerfileContent = Get-Content(".devcontainer/All/Dockerfile.All")
+        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
         $dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
         $containerVersion = $Matches[0].ToString()
         echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-      shell: pwsh
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: ${{ github.event_name != 'pull_request' }}
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
+        registry: ${{ env.CONTAINER_REPO }}
         username: ${{ github.repository_owner }}
-        password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v5
       with:
-        file: ${{ env.CONTAINER_SRC_FILE }}
-        push: true # Will only build if this is not here
+        file: ${{ env.CONTAINER_SOURCE_FILE }}
+        push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-azurertos.yaml b/.github/workflows/devcontainer-azurertos.yaml
index 2c88eff37f..668d87c644 100644
--- a/.github/workflows/devcontainer-azurertos.yaml
+++ b/.github/workflows/devcontainer-azurertos.yaml
@@ -6,7 +6,8 @@ name: Build Dev Container for Azure RTOS
 env:
   CONTAINER_REPO: ghcr.io
   CONTAINER_NAME: dev-container-azure-rtos
-  CONTAINER_SRC_FILE: .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
+  CONTAINER_SOURCE_FILE: .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
+  CONTAINER_VERSION_FILE: .devcontainer/AzureRTOS/Dockerfile.AzureRTOS
 
 on:
   push:
@@ -21,8 +22,11 @@ jobs:
   build:
     if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
     steps:
-    
+
     - name: Checkout Repository
       uses: actions/checkout@v4
 
@@ -35,28 +39,29 @@ jobs:
         large-packages: false
     
     - name: Get container version
+      shell: pwsh
       run: |
-        $dockerfileContent = Get-Content(".devcontainer/AzureRTOS/Dockerfile.AzureRTOS")
+        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
         $dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
         $containerVersion = $Matches[0].ToString()
         echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-      shell: pwsh
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: ${{ github.event_name != 'pull_request' }}
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
+        registry: ${{ env.CONTAINER_REPO }}
         username: ${{ github.repository_owner }}
-        password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v5
       with:
-        file: ${{ env.CONTAINER_SRC_FILE }}
-        push: true # Will only build if this is not here
+        file: ${{ env.CONTAINER_SOURCE_FILE }}
+        push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-chibios.yaml b/.github/workflows/devcontainer-chibios.yaml
index e7d889cb7f..b102f13be7 100644
--- a/.github/workflows/devcontainer-chibios.yaml
+++ b/.github/workflows/devcontainer-chibios.yaml
@@ -6,7 +6,8 @@ name: Build Dev Container for ChibiOS
 env:
   CONTAINER_REPO: ghcr.io
   CONTAINER_NAME: dev-container-chibios
-  CONTAINER_SRC_FILE: .devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
+  CONTAINER_SOURCE_FILE: .devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC
+  CONTAINER_VERSION_FILE: .devcontainer/ChibiOS/Dockerfile.ChibiOS
 
 on:
   push:
@@ -21,8 +22,11 @@ jobs:
   build:
     if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
     runs-on: ubuntu-latest
-    steps:
+    permissions:
+      contents: read
+      packages: write
 
+    steps:
     - name: Checkout Repository
       uses: actions/checkout@v4
 
@@ -35,28 +39,29 @@ jobs:
         large-packages: false
 
     - name: Get container version
+      shell: pwsh
       run: |
-        $dockerfileContent = Get-Content(".devcontainer/ChibiOS/Dockerfile.ChibiOS")
+        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
         $dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
         $containerVersion = $Matches[0].ToString()
         echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-      shell: pwsh
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: ${{ github.event_name != 'pull_request' }}
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
+        registry: ${{ env.CONTAINER_REPO }}
         username: ${{ github.repository_owner }}
-        password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v5
       with:
-        file: ${{ env.CONTAINER_SRC_FILE }}
-        push: true # Will only build if this is not here
+        file: ${{ env.CONTAINER_SOURCE_FILE }}
+        push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-esp32.yml b/.github/workflows/devcontainer-esp32.yml
index 615fbe127e..522b89af3f 100644
--- a/.github/workflows/devcontainer-esp32.yml
+++ b/.github/workflows/devcontainer-esp32.yml
@@ -6,7 +6,8 @@ name: Build Dev Container for ESP32
 env:
   CONTAINER_REPO: ghcr.io
   CONTAINER_NAME: dev-container-esp32
-  CONTAINER_SRC_FILE: .devcontainer/ESP32/Dockerfile.ESP32.SRC
+  CONTAINER_SOURCE_FILE: .devcontainer/ESP32/Dockerfile.ESP32.SRC
+  CONTAINER_VERSION_FILE: .devcontainer/ESP32/Dockerfile.ESP32
 
 on:
   push:
@@ -35,28 +36,29 @@ jobs:
         large-packages: false
 
     - name: Get container version
+      shell: pwsh
       run: |
-        $dockerfileContent = Get-Content(".devcontainer/ESP32/Dockerfile.ESP32")
+        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
         $dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
         $containerVersion = $Matches[0].ToString()
         echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-      shell: pwsh
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: ${{ github.event_name != 'pull_request' }}
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
+        registry: ${{ env.CONTAINER_REPO }}
         username: ${{ github.repository_owner }}
-        password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v5
       with:
-        file: ${{ env.CONTAINER_SRC_FILE }}
-        push: true # Will only build if this is not here
+        file: ${{ env.CONTAINER_SOURCE_FILE }}
+        push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest
diff --git a/.github/workflows/devcontainer-freertos-nxp.yaml b/.github/workflows/devcontainer-freertos-nxp.yaml
index 55fb97e48a..f660652951 100644
--- a/.github/workflows/devcontainer-freertos-nxp.yaml
+++ b/.github/workflows/devcontainer-freertos-nxp.yaml
@@ -42,7 +42,7 @@ jobs:
     - name: Get container version
       shell: pwsh
       run: |
-        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
+        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}") -First 1
         $dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
         $containerVersion = $Matches[0].ToString()
         echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
diff --git a/.github/workflows/devcontainer-ti.yaml b/.github/workflows/devcontainer-ti.yaml
index 54e4392b39..c9beaaca7e 100644
--- a/.github/workflows/devcontainer-ti.yaml
+++ b/.github/workflows/devcontainer-ti.yaml
@@ -6,7 +6,8 @@ name: Build Dev Container for TI
 env:
   CONTAINER_REPO: ghcr.io
   CONTAINER_NAME: dev-container-ti
-  CONTAINER_SRC_FILE: .devcontainer/TI/Dockerfile.TI.SRC
+  CONTAINER_SOURCE_FILE: .devcontainer/TI/Dockerfile.TI.SRC
+  CONTAINER_VERSION_FILE: .devcontainer/TI/Dockerfile.TI
 
 on:
   push:
@@ -21,8 +22,11 @@ jobs:
   build:
     if: ${{ vars.PUBLISH_DOCKER_IMAGE == 'true' }}
     runs-on: ubuntu-latest
-    steps:
+    permissions:
+      contents: read
+      packages: write
 
+    steps:
     - name: Checkout Repository
       uses: actions/checkout@v4
 
@@ -35,28 +39,29 @@ jobs:
         large-packages: false
 
     - name: Get container version
+      shell: pwsh
       run: |
-        $dockerfileContent = Get-Content(".devcontainer/TI/Dockerfile.TI")
+        $dockerfileContent = Get-Content("${{ env.CONTAINER_VERSION_FILE }}")
         $dockerfileContent -match '(?<=\:)(?:[v]\d+.\d+)'
         $containerVersion = $Matches[0].ToString()
         echo "GCR_VERSION=$containerVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
-      shell: pwsh
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
+      if: ${{ github.event_name != 'pull_request' }}
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
+        registry: ${{ env.CONTAINER_REPO }}
         username: ${{ github.repository_owner }}
-        password: ${{ secrets.CONTAINER_BUILD_TOKEN }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build and Push Docker Image
       uses: docker/build-push-action@v5
       with:
-        file: ${{ env.CONTAINER_SRC_FILE }}
-        push: true # Will only build if this is not here
+        file: ${{ env.CONTAINER_SOURCE_FILE }}
+        push: ${{ github.event_name != 'pull_request' }}
         tags: |
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:${{ env.GCR_VERSION }}
           ${{ env.CONTAINER_REPO }}/${{ github.repository_owner }}/${{ env.CONTAINER_NAME }}:latest