diff --git a/.github/ci.yml b/.github/workflows/ci.yml
similarity index 100%
rename from .github/ci.yml
rename to .github/workflows/ci.yml
diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml
deleted file mode 100644
index a220daf8..00000000
--- a/.github/workflows/demo.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: Demo
-on:
-  pull_request:
-
-permissions:
-  contents: read
-  id-token: write
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
-
-jobs:
-  resolve-versions:
-    name: Resolve Grafana images
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
-    outputs:
-      matrix: ${{ steps.resolve-versions.outputs.matrix }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Resolve Grafana E2E versions
-        id: resolve-versions
-        uses: grafana/plugin-actions/e2e-version@main
-        with:
-          version-resolver-type: version-support-policy
-
-  demo-step:
-    needs: resolve-versions
-    timeout-minutes: 60
-    strategy:
-      fail-fast: false
-      matrix:
-        GRAFANA_IMAGE: ${{fromJson(needs.resolve-versions.outputs.matrix)}}
-        exclude:
-          - GRAFANA_IMAGE: { name: 'grafana-enterprise' }
-    name: e2e ${{ matrix.GRAFANA_IMAGE.name }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Print Grafana Image Name
-        run: echo "Running for ${{ matrix.GRAFANA_IMAGE.name }}@${{ matrix.GRAFANA_IMAGE.VERSION }}"
diff --git a/.github/dependabot.yml b/.github/workflows/dependabot.yml
similarity index 100%
rename from .github/dependabot.yml
rename to .github/workflows/dependabot.yml
diff --git a/.github/e2e.yml b/.github/workflows/e2e.yml
similarity index 97%
rename from .github/e2e.yml
rename to .github/workflows/e2e.yml
index 93f6f331..3594c8d4 100644
--- a/.github/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -33,6 +33,8 @@ jobs:
       fail-fast: false
       matrix:
         GRAFANA_IMAGE: ${{fromJson(needs.resolve-versions.outputs.matrix)}}
+        exclude:
+          - GRAFANA_IMAGE: { name: 'grafana-enterprise' }
     name: e2e ${{ matrix.GRAFANA_IMAGE.name }}
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/is-compatible.yml b/.github/workflows/is-compatible.yml
similarity index 100%
rename from .github/is-compatible.yml
rename to .github/workflows/is-compatible.yml
diff --git a/.github/release.yml b/.github/workflows/release.yml
similarity index 100%
rename from .github/release.yml
rename to .github/workflows/release.yml