diff --git a/.ci_support/kernel.json b/.ci_support/kernel.json
new file mode 100644
index 000000000..ce5a7bdc0
--- /dev/null
+++ b/.ci_support/kernel.json
@@ -0,0 +1,16 @@
+{
+ "argv": [
+  "flux",
+  "start",
+  "/home/runner/miniconda3/envs/test/bin/python",
+  "-m",
+  "ipykernel_launcher",
+  "-f",
+  "{connection_file}"
+ ],
+ "display_name": "flux",
+ "language": "python",
+ "metadata": {
+  "debugger": true
+ }
+}
\ No newline at end of file
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 91cd89ca5..210c95459 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -147,6 +147,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Merge Notebook environment
         run: |
+          mkdir -p /home/runner/.local/share/jupyter/kernels/flux
+          cp .ci_support/kernel.json /home/runner/.local/share/jupyter/kernels/flux
           cp binder/environment.yml environment.yml
           tail --lines=+4 .ci_support/environment-notebooks.yml >> environment.yml
           echo -e "channels:\n  - conda-forge\n" > .condarc
@@ -165,8 +167,8 @@ jobs:
         timeout-minutes: 5
         run: |
           papermill notebooks/1-single-node.ipynb notebooks/1-single-node-out.ipynb -k python3
-          flux start papermill notebooks/2-hpc-cluster.ipynb notebooks/2-hpc-cluster-out.ipynb -k python3
-          flux start papermill notebooks/3-hpc-job.ipynb notebooks/3-hpc-job-out.ipynb -k python3
+          papermill notebooks/2-hpc-cluster.ipynb notebooks/2-hpc-cluster-out.ipynb -k flux
+          papermill notebooks/3-hpc-job.ipynb notebooks/3-hpc-job-out.ipynb -k flux
           papermill notebooks/4-developer.ipynb notebooks/4-developer-out.ipynb -k python3
 
   notebooks_integration:
@@ -176,6 +178,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Merge Notebook environment
         run: |
+          mkdir -p /home/runner/.local/share/jupyter/kernels/flux
+          cp .ci_support/kernel.json /home/runner/.local/share/jupyter/kernels/flux
           echo -e "channels:\n  - conda-forge\n" > .condarc
       - name: Setup Mambaforge
         uses: conda-incubator/setup-miniconda@v3
@@ -191,8 +195,8 @@ jobs:
         shell: bash -l {0}
         timeout-minutes: 20
         run: |
-          flux start papermill notebooks/5-1-gpaw.ipynb notebooks/5-1-gpaw-out.ipynb -k python3
-          flux start papermill notebooks/5-2-quantum-espresso.ipynb notebooks/5-2-quantum-espresso-out.ipynb -k python3
+          papermill notebooks/5-1-gpaw.ipynb notebooks/5-1-gpaw-out.ipynb -k flux
+          papermill notebooks/5-2-quantum-espresso.ipynb notebooks/5-2-quantum-espresso-out.ipynb -k flux
 
   unittest_flux_mpich:
     needs: [black]