diff --git a/.github/workflows/features-release.yml b/.github/workflows/features-release.yml
index 5e7377f..ded9c09 100644
--- a/.github/workflows/features-release.yml
+++ b/.github/workflows/features-release.yml
@@ -1,4 +1,5 @@
-name: "Release dev container features & Generate Documentation"
+name: Release dev container features & Generate Documentation
+
 on:
   workflow_dispatch:
 
diff --git a/.github/workflows/features-test.yml b/.github/workflows/features-test.yml
deleted file mode 100644
index 4acc787..0000000
--- a/.github/workflows/features-test.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: "CI - Test Features"
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  test-autogenerated:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        features:
-          - 7z
-          - bannerlord
-          - mono
-          - upgrade
-          - vortex
-        baseImage:
-          - debian:latest
-          - ubuntu:latest
-          - mcr.microsoft.com/devcontainers/base:ubuntu
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli
-
-      - name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
-        run: devcontainer features test --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
-
-  test-scenarios:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        features:
-          - 7z
-          - bannerlord
-          - mono
-          - upgrade
-          - vortex
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli
-
-      - name: "Generating tests for '${{ matrix.features }}' scenarios"
-        run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated --skip-duplicated .
-
-  test-global:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: "Install latest devcontainer CLI"
-        run: npm install -g @devcontainers/cli
-
-      - name: "Testing global scenarios"
-        run: devcontainer features test --global-scenarios-only .
\ No newline at end of file
diff --git a/.github/workflows/image-release.yml b/.github/workflows/image-release.yml
index 0393461..a2dbe39 100644
--- a/.github/workflows/image-release.yml
+++ b/.github/workflows/image-release.yml
@@ -1,16 +1,16 @@
 name: Dev Container Build and Push Image
 
 on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.image-base/**/*'
   workflow_dispatch:
 
 jobs:
   build-and-publish-docker:
+    if: ${{ github.ref == 'refs/heads/master' }}
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+      packages: write
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v4