diff --git a/.github/workflows/auto-add-issue-to-project.yml b/.github/workflows/auto-add-issue-to-project.yml
index 8124d26af..b83bd6b4b 100644
--- a/.github/workflows/auto-add-issue-to-project.yml
+++ b/.github/workflows/auto-add-issue-to-project.yml
@@ -1,5 +1,5 @@
 name: Auto Add Issues to Tracking boards
-on:
+on:  # yamllint disable-line rule:truthy
   issues:
     types:
       - opened
@@ -21,4 +21,4 @@ jobs:
       - uses: actions/add-to-project@v0.5.0
         with:
           project-url: https://github.com/orgs/opendatahub-io/projects/45
-          github-token: ${{ steps.app-token.outputs.token }}
\ No newline at end of file
+          github-token: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/notebooks-digest-updater-upstream.yaml b/.github/workflows/notebooks-digest-updater-upstream.yaml
index a24c42f55..7435a6a2b 100644
--- a/.github/workflows/notebooks-digest-updater-upstream.yaml
+++ b/.github/workflows/notebooks-digest-updater-upstream.yaml
@@ -1,5 +1,6 @@
+---
 # The aim of this GitHub workflow is to update the params.env file with the latest digest.
-on:
+on:  # yamllint disable-line rule:truthy
   workflow_dispatch:
     inputs:
       branch:
@@ -9,7 +10,7 @@ on:
         required: true
         description: "Provide release N version of the notebooks ex 2023a"
   schedule:
-    - cron: "0 0 * * 5" #Scheduled every Friday
+    - cron: "0 0 * * 5"  # Scheduled every Friday
 env:
   DIGEST_UPDATER_BRANCH: digest-updater-${{ github.run_id }}
   BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }}
@@ -40,7 +41,7 @@ jobs:
          git push --set-upstream origin ${{ env.DIGEST_UPDATER_BRANCH }}
 
   update-n-version:
-    needs: [ initialize ]
+    needs: [initialize]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -54,8 +55,8 @@ jobs:
       - name: Checkout upstream notebooks repo
         uses: actions/checkout@v3
         with:
-         repository: opendatahub-io/notebooks.git
-         ref: ${{ env.RELEASE_VERSION }}
+          repository: opendatahub-io/notebooks.git
+          ref: ${{ env.RELEASE_VERSION }}
       - name: Retrive latest weekly commit hash from the release branch
         id: hash
         shell: bash
@@ -86,7 +87,7 @@ jobs:
               done
               git fetch origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git pull origin  ${{ env.DIGEST_UPDATER_BRANCH }} && git add manifests/base/params.env && git commit -m "Update file via  ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}
   open-pull-request:
-    needs: [ update-n-version ]
+    needs: [update-n-version]
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
@@ -96,7 +97,7 @@ jobs:
       - name: pull-request
         uses: repo-sync/pull-request@v2
         with:
-          source_branch:  ${{ env.DIGEST_UPDATER_BRANCH }}
+          source_branch: ${{ env.DIGEST_UPDATER_BRANCH }}
           destination_branch: ${{ env.BRANCH_NAME}}
           github_token: ${{ secrets.GITHUB_TOKEN }}
           pr_label: "automated pr"
diff --git a/.github/workflows/piplock-renewal-2023a.yml b/.github/workflows/piplock-renewal-2023a.yml
index 089a51f83..4f17147b8 100644
--- a/.github/workflows/piplock-renewal-2023a.yml
+++ b/.github/workflows/piplock-renewal-2023a.yml
@@ -1,17 +1,18 @@
-# This GitHub action is meant to be triggered weekly in order to update the pipfile.locks 
+---
+# This GitHub action is meant to be triggered weekly in order to update the pipfile.locks
 
 name: Weekly Pipfile.locks renewal on [2023a] branch
 
-on:
- # Triggers the workflow every Monday at 22pm UTC am 0 22 * * 1
- schedule:
-   - cron: "0 22 * * 1"
- workflow_dispatch:  # for manual trigger workflow from GH Web UI
- 
+on:  # yamllint disable-line rule:truthy
+  # Triggers the workflow every Monday at 22pm UTC am 0 22 * * 1
+  schedule:
+    - cron: "0 22 * * 1"
+  workflow_dispatch:  # for manual trigger workflow from GH Web UI
+
 jobs:
   build:
     runs-on: ubuntu-latest
-     
+
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the
       # added or changed files to the repository.
diff --git a/.github/workflows/pr-merge-image-delete.yml b/.github/workflows/pr-merge-image-delete.yml
index 9bad3ad59..41da2aabb 100644
--- a/.github/workflows/pr-merge-image-delete.yml
+++ b/.github/workflows/pr-merge-image-delete.yml
@@ -1,5 +1,6 @@
+---
 name: Delete quay image of PR once merged
-on:
+on:  # yamllint disable-line rule:truthy
   push:
     branches:
       - 'main'
@@ -69,7 +70,7 @@ jobs:
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-pytorch-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-trustyai-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-anaconda-python-3.8-pr-${{ env.PR }}  
+          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-anaconda-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-minimal-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-datascience-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-tensorflow-ubi8-python-3.8-pr-${{ env.PR }}
@@ -77,7 +78,7 @@ jobs:
           skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-datascience-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-pytorch-ubi8-python-3.8-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-cuda-tensorflow-ubi8-python-3.8-pr-${{ env.PR }}
-          
+
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-minimal-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-datascience-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-pytorch-ubi9-python-3.9-pr-${{ env.PR }}
@@ -91,4 +92,4 @@ jobs:
           skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-cuda-tensorflow-ubi9-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:codeserver-c9s-python-3.9-pr-${{ env.PR }}
           skopeo delete docker://${QUAY_IMAGE_REPO}:rstudio-c9s-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-rstudio-c9s-python-3.9-pr-${{ env.PR }}
\ No newline at end of file
+          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-rstudio-c9s-python-3.9-pr-${{ env.PR }}
diff --git a/base/anaconda-python-3.8/environment.yml b/base/anaconda-python-3.8/environment.yml
index 59547f3d8..d853c6f73 100644
--- a/base/anaconda-python-3.8/environment.yml
+++ b/base/anaconda-python-3.8/environment.yml
@@ -1,3 +1,4 @@
+---
 name: /opt/app-root
 channels:
   - defaults
diff --git a/codeserver/c9s-python-3.9/kustomize/base/pod.yaml b/codeserver/c9s-python-3.9/kustomize/base/pod.yaml
index 7236a9cc1..4b7fbe0db 100644
--- a/codeserver/c9s-python-3.9/kustomize/base/pod.yaml
+++ b/codeserver/c9s-python-3.9/kustomize/base/pod.yaml
@@ -1,21 +1,22 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: codeserver-image
 spec:
-  containers:                            
-  - name: codeserver
-    image: codeserver-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 5; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8585
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
+  containers:
+    - name: codeserver
+      image: codeserver-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 5; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8585
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
diff --git a/jupyter/datascience/anaconda-python-3.8/environment.yml b/jupyter/datascience/anaconda-python-3.8/environment.yml
index 85f63b974..57a97f7fe 100644
--- a/jupyter/datascience/anaconda-python-3.8/environment.yml
+++ b/jupyter/datascience/anaconda-python-3.8/environment.yml
@@ -1,3 +1,4 @@
+---
 name: /opt/app-root
 channels:
   - conda-forge
@@ -363,4 +364,4 @@ dependencies:
   - zipp=3.15.0=pyhd8ed1ab_0
   - zlib=1.2.13=h5eee18b_0
   - zstd=1.5.2=ha4553b6_0
-prefix: /opt/app-root
\ No newline at end of file
+prefix: /opt/app-root
diff --git a/manifests/base/jupyter-datascience-notebook-imagestream.yaml b/manifests/base/jupyter-datascience-notebook-imagestream.yaml
index 72554631e..71e930c1f 100644
--- a/manifests/base/jupyter-datascience-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-datascience-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -13,26 +14,26 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-      opendatahub.io/workbench-image-recommended: 'true'
-    from:
-      kind: DockerImage
-      name: $(odh-generic-data-science-notebook-image-n)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
-  # N-1 Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
-      openshift.io/imported-from: quay.io/opendatahub/notebooks
-    from:
-      kind: DockerImage
-      name:  $(odh-generic-data-science-notebook-image-n-1)
-    name: "1.2"
-    referencePolicy:
-      type: Source
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        opendatahub.io/workbench-image-recommended: 'true'
+      from:
+        kind: DockerImage
+        name: $(odh-generic-data-science-notebook-image-n)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-1 Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
+        openshift.io/imported-from: quay.io/opendatahub/notebooks
+      from:
+        kind: DockerImage
+        name: $(odh-generic-data-science-notebook-image-n-1)
+      name: "1.2"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-habana-notebook-imagestream.yaml b/manifests/base/jupyter-habana-notebook-imagestream.yaml
index f828eedc5..4a76a60ef 100644
--- a/manifests/base/jupyter-habana-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-habana-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -14,25 +15,25 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # 1.11.0 Version of the image n
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.11"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.1"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-    from:
-      kind: DockerImage
-      name: $(odh-habana-notebook-image-n)
-    name: "2023.2"
-    referencePolicy:
-      type: Source
-  # 1.10.0 Version of the image n-1
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.0"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-    from:
-      kind: DockerImage
-      name: $(odh-habana-notebook-image-n-1)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
+    # 1.11.0 Version of the image n
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.11"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.1"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+      from:
+        kind: DockerImage
+        name: $(odh-habana-notebook-image-n)
+      name: "2023.2"
+      referencePolicy:
+        type: Source
+    # 1.10.0 Version of the image n-1
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.0"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+      from:
+        kind: DockerImage
+        name: $(odh-habana-notebook-image-n-1)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
index 530eb4801..179601847 100644
--- a/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -14,26 +15,26 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
-  - annotations:
+    # N Version of the image
+    - annotations:
         opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
         opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.5"},{"name":"Notebook","version":"6.5"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
-    from:
-      kind: DockerImage
-      name: $(odh-minimal-gpu-notebook-image-n)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
-  # N-1 Version of the image
-  - annotations:
+      from:
+        kind: DockerImage
+        name: $(odh-minimal-gpu-notebook-image-n)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-1 Version of the image
+    - annotations:
         opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"}]'
         opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.2"},{"name":"Notebook","version":"6.4"}]'
         openshift.io/imported-from: quay.io/opendatahub/notebooks
-    from:
-      kind: DockerImage
-      name: $(odh-minimal-gpu-notebook-image-n-1)
-    name: "1.2"
-    referencePolicy:
-      type: Source
+      from:
+        kind: DockerImage
+        name: $(odh-minimal-gpu-notebook-image-n-1)
+      name: "1.2"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-minimal-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-notebook-imagestream.yaml
index 2eaf79525..3687c1229 100644
--- a/manifests/base/jupyter-minimal-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-minimal-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -13,27 +14,27 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.5"}, {"name": "Notebook","version": "6.5"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-      opendatahub.io/workbench-image-recommended: 'true'
-      opendatahub.io/default-image: "true"
-    from:
-      kind: DockerImage
-      name: $(odh-minimal-notebook-image-n)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
-  # N-1 Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]'
-      openshift.io/imported-from: quay.io/opendatahub/notebooks
-    from:
-      kind: DockerImage
-      name: $(odh-minimal-notebook-image-n-1)
-    name: "1.2"
-    referencePolicy:
-      type: Source
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.5"}, {"name": "Notebook","version": "6.5"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        opendatahub.io/workbench-image-recommended: 'true'
+        opendatahub.io/default-image: "true"
+      from:
+        kind: DockerImage
+        name: $(odh-minimal-notebook-image-n)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-1 Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]'
+        openshift.io/imported-from: quay.io/opendatahub/notebooks
+      from:
+        kind: DockerImage
+        name: $(odh-minimal-notebook-image-n-1)
+      name: "1.2"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
index acecf92fa..1eb063840 100644
--- a/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -14,26 +15,26 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"1.13"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-      opendatahub.io/workbench-image-recommended: 'true'
-    from:
-      kind: DockerImage
-      name: $(odh-pytorch-gpu-notebook-image-n)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
-  # N-1 Version of the image
-  - annotations:
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"1.13"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        opendatahub.io/workbench-image-recommended: 'true'
+      from:
+        kind: DockerImage
+        name: $(odh-pytorch-gpu-notebook-image-n)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-1 Version of the image
+    - annotations:
         opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"},{"name":"PyTorch","version":"1.8"}]'
         opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.8"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
         openshift.io/imported-from: quay.io/opendatahub/notebooks
-    from:
-      kind: DockerImage
-      name: $(odh-pytorch-gpu-notebook-image-n-1)
-    name: "1.2"
-    referencePolicy:
-      type: Source
+      from:
+        kind: DockerImage
+        name: $(odh-pytorch-gpu-notebook-image-n-1)
+      name: "1.2"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml b/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
index c4c39d3cf..3696e4400 100644
--- a/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -14,26 +15,26 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"TensorFlow","version":"2.11"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.11"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-      opendatahub.io/workbench-image-recommended: 'true'
-    from:
-      kind: DockerImage
-      name: $(odh-tensorflow-gpu-notebook-image-n)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
-  # N-1 Version of the image
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"},{"name":"TensorFlow","version":"2.7"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.7"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
-      openshift.io/imported-from: quay.io/opendatahub/notebooks
-    from:
-      kind: DockerImage
-      name: $(odh-tensorflow-gpu-notebook-image-n-1)
-    name: "1.2"
-    referencePolicy:
-      type: Source
+    # N Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"TensorFlow","version":"2.11"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.11"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+        opendatahub.io/workbench-image-recommended: 'true'
+      from:
+        kind: DockerImage
+        name: $(odh-tensorflow-gpu-notebook-image-n)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-1 Version of the image
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"},{"name":"TensorFlow","version":"2.7"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.7"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
+        openshift.io/imported-from: quay.io/opendatahub/notebooks
+      from:
+        kind: DockerImage
+        name: $(odh-tensorflow-gpu-notebook-image-n-1)
+      name: "1.2"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/jupyter-trustyai-notebook-imagestream.yaml b/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
index 6a388e0f9..393e9a478 100644
--- a/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -13,13 +14,13 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.2"}, {"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-    from:
-      kind: DockerImage
-      name: $(odh-trustyai-notebook-image-n)
-    name: "2023.1"
-    referencePolicy:
-      type: Source
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.2"}, {"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+      from:
+        kind: DockerImage
+        name: $(odh-trustyai-notebook-image-n)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index afa95bb93..732eb2ae7 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -1,13 +1,14 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- jupyter-minimal-notebook-imagestream.yaml
-- jupyter-datascience-notebook-imagestream.yaml
-- jupyter-minimal-gpu-notebook-imagestream.yaml
-- jupyter-pytorch-notebook-imagestream.yaml
-- jupyter-tensorflow-notebook-imagestream.yaml
-- jupyter-trustyai-notebook-imagestream.yaml
-- jupyter-habana-notebook-imagestream.yaml
+  - jupyter-minimal-notebook-imagestream.yaml
+  - jupyter-datascience-notebook-imagestream.yaml
+  - jupyter-minimal-gpu-notebook-imagestream.yaml
+  - jupyter-pytorch-notebook-imagestream.yaml
+  - jupyter-tensorflow-notebook-imagestream.yaml
+  - jupyter-trustyai-notebook-imagestream.yaml
+  - jupyter-habana-notebook-imagestream.yaml
 
 commonLabels:
   opendatahub.io/component: "true"
@@ -112,4 +113,3 @@ vars:
       fieldpath: data.odh-habana-notebook-image-n-1
 configurations:
   - params.yaml
-
diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml
index f1001a329..b14be22ba 100644
--- a/manifests/base/params.yaml
+++ b/manifests/base/params.yaml
@@ -1,53 +1,54 @@
+---
 varReference:
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-minimal-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-minimal-notebook-image-n-1
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-minimal-gpu-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-minimal-gpu-notebook-image-n-1
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-pytorch-gpu-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-pytorch-gpu-notebook-image-n-1
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-generic-data-science-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-generic-data-science-notebook-image-n-1
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-tensorflow-gpu-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-tensorflow-gpu-notebook-image-n-1
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-trustyai-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-habana-notebook-image-n
-- path: spec/tags[]/from/name
-  kind: ImageStream
-  apiGroup: image.openshift.io/v1
-  name: odh-habana-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-gpu-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-minimal-gpu-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-pytorch-gpu-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-pytorch-gpu-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-generic-data-science-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-generic-data-science-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-tensorflow-gpu-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-tensorflow-gpu-notebook-image-n-1
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-trustyai-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-habana-notebook-image-n
+  - path: spec/tags[]/from/name
+    kind: ImageStream
+    apiGroup: image.openshift.io/v1
+    name: odh-habana-notebook-image-n-1
diff --git a/manifests/overlays/additional/code-server-notebook-imagestream.yaml b/manifests/overlays/additional/code-server-notebook-imagestream.yaml
index 961d953a6..dd38222eb 100644
--- a/manifests/overlays/additional/code-server-notebook-imagestream.yaml
+++ b/manifests/overlays/additional/code-server-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -13,13 +14,13 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"code-sever","version":"4.11"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-    from:
-      kind: DockerImage
-      name: quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
-    name: "2023.1"
-    referencePolicy:
-      type: Source
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"code-sever","version":"4.11"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+      from:
+        kind: DockerImage
+        name: quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
+      name: "2023.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/overlays/additional/kustomization.yaml b/manifests/overlays/additional/kustomization.yaml
index 1d83e07a1..52cb751c8 100644
--- a/manifests/overlays/additional/kustomization.yaml
+++ b/manifests/overlays/additional/kustomization.yaml
@@ -1,11 +1,12 @@
+---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 bases:
-- ../../base
+  - ../../base
 resources:
-- code-server-notebook-imagestream.yaml
-- rstudio-notebook-imagestream.yaml
-- rstudio-gpu-notebook-imagestream.yaml
+  - code-server-notebook-imagestream.yaml
+  - rstudio-notebook-imagestream.yaml
+  - rstudio-gpu-notebook-imagestream.yaml
 commonLabels:
   opendatahub.io/component: "true"
   component.opendatahub.io/name: notebooks
diff --git a/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml b/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml
index d49436c23..39daa81e1 100644
--- a/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml
+++ b/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -14,13 +15,13 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-    from:
-      kind: DockerImage
-      name: quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206
-    name: "2023.1"
-    referencePolicy:
-      type: Source
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+      from:
+        kind: DockerImage
+        name: quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206
+      name: "2023.1"
+      referencePolicy:
+        type: Source
diff --git a/manifests/overlays/additional/rstudio-notebook-imagestream.yaml b/manifests/overlays/additional/rstudio-notebook-imagestream.yaml
index 6a3a31bea..22fd75445 100644
--- a/manifests/overlays/additional/rstudio-notebook-imagestream.yaml
+++ b/manifests/overlays/additional/rstudio-notebook-imagestream.yaml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
@@ -13,13 +14,13 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
-      openshift.io/imported-from: quay.io/opendatahub/workbench-images
-    from:
-      kind: DockerImage
-      name: quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
-    name: "2023.1"
-    referencePolicy:
-      type: Source
+    - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
+        openshift.io/imported-from: quay.io/opendatahub/workbench-images
+      from:
+        kind: DockerImage
+        name: quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
+      name: "2023.1"
+      referencePolicy:
+        type: Source
diff --git a/rstudio/c9s-python-3.9/kustomize/base/pod.yaml b/rstudio/c9s-python-3.9/kustomize/base/pod.yaml
index cb7679019..18f2d0aab 100644
--- a/rstudio/c9s-python-3.9/kustomize/base/pod.yaml
+++ b/rstudio/c9s-python-3.9/kustomize/base/pod.yaml
@@ -1,21 +1,22 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: rstudio-image
 spec:
-  containers:                            
-  - name: rstudio
-    image: rstudio-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 5; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8787
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
+  containers:
+    - name: rstudio
+      image: rstudio-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 5; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8787
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
diff --git a/runtimes/datascience/ubi8-python-3.8/kustomize/base/kustomization.yaml b/runtimes/datascience/ubi8-python-3.8/kustomize/base/kustomization.yaml
index 471efc175..dc37ebff5 100644
--- a/runtimes/datascience/ubi8-python-3.8/kustomize/base/kustomization.yaml
+++ b/runtimes/datascience/ubi8-python-3.8/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-datascience-ubi8-python-3.8
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/datascience/ubi8-python-3.8/kustomize/base/pod.yaml b/runtimes/datascience/ubi8-python-3.8/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/datascience/ubi8-python-3.8/kustomize/base/pod.yaml
+++ b/runtimes/datascience/ubi8-python-3.8/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/datascience/ubi9-python-3.9/kustomize/base/kustomization.yaml b/runtimes/datascience/ubi9-python-3.9/kustomize/base/kustomization.yaml
index 8f6a01a80..d141a0e1c 100644
--- a/runtimes/datascience/ubi9-python-3.9/kustomize/base/kustomization.yaml
+++ b/runtimes/datascience/ubi9-python-3.9/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-datascience-ubi9-python-3.9
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/datascience/ubi9-python-3.9/kustomize/base/pod.yaml b/runtimes/datascience/ubi9-python-3.9/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/datascience/ubi9-python-3.9/kustomize/base/pod.yaml
+++ b/runtimes/datascience/ubi9-python-3.9/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/minimal/ubi8-python-3.8/kustomize/base/kustomization.yaml b/runtimes/minimal/ubi8-python-3.8/kustomize/base/kustomization.yaml
index 5fc2d3a5d..03974cb31 100644
--- a/runtimes/minimal/ubi8-python-3.8/kustomize/base/kustomization.yaml
+++ b/runtimes/minimal/ubi8-python-3.8/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-minimal-ubi8-python-3.8
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/minimal/ubi8-python-3.8/kustomize/base/pod.yaml b/runtimes/minimal/ubi8-python-3.8/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/minimal/ubi8-python-3.8/kustomize/base/pod.yaml
+++ b/runtimes/minimal/ubi8-python-3.8/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/minimal/ubi9-python-3.9/kustomize/base/kustomization.yaml b/runtimes/minimal/ubi9-python-3.9/kustomize/base/kustomization.yaml
index 4c9f8405c..4b87845da 100644
--- a/runtimes/minimal/ubi9-python-3.9/kustomize/base/kustomization.yaml
+++ b/runtimes/minimal/ubi9-python-3.9/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-minimal-ubi9-python-3.9
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/minimal/ubi9-python-3.9/kustomize/base/pod.yaml b/runtimes/minimal/ubi9-python-3.9/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/minimal/ubi9-python-3.9/kustomize/base/pod.yaml
+++ b/runtimes/minimal/ubi9-python-3.9/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/pytorch/ubi8-python-3.8/kustomize/base/kustomization.yaml b/runtimes/pytorch/ubi8-python-3.8/kustomize/base/kustomization.yaml
index 1c9ef35c2..044992bef 100644
--- a/runtimes/pytorch/ubi8-python-3.8/kustomize/base/kustomization.yaml
+++ b/runtimes/pytorch/ubi8-python-3.8/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-pytorch-ubi8-python-3.8
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/pytorch/ubi8-python-3.8/kustomize/base/pod.yaml b/runtimes/pytorch/ubi8-python-3.8/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/pytorch/ubi8-python-3.8/kustomize/base/pod.yaml
+++ b/runtimes/pytorch/ubi8-python-3.8/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/pytorch/ubi9-python-3.9/kustomize/base/kustomization.yaml b/runtimes/pytorch/ubi9-python-3.9/kustomize/base/kustomization.yaml
index a1899c245..9e509d5d6 100644
--- a/runtimes/pytorch/ubi9-python-3.9/kustomize/base/kustomization.yaml
+++ b/runtimes/pytorch/ubi9-python-3.9/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-pytorch-ubi9-python-3.9
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/pytorch/ubi9-python-3.9/kustomize/base/pod.yaml b/runtimes/pytorch/ubi9-python-3.9/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/pytorch/ubi9-python-3.9/kustomize/base/pod.yaml
+++ b/runtimes/pytorch/ubi9-python-3.9/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/kustomization.yaml b/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/kustomization.yaml
index 81f5dfef5..547a3e656 100644
--- a/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/kustomization.yaml
+++ b/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-cuda-tensorflow-ubi8-python-3.8
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/pod.yaml b/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/pod.yaml
+++ b/runtimes/tensorflow/ubi8-python-3.8/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config
diff --git a/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/kustomization.yaml b/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/kustomization.yaml
index 78d86814f..4b6d23b68 100644
--- a/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/kustomization.yaml
+++ b/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/kustomization.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namePrefix: runtime- 
+namePrefix: runtime-
 resources:
   - pod.yaml
 images:
@@ -9,6 +9,6 @@ images:
     newName: quay.io/opendatahub/workbench-images
     newTag: runtime-cuda-tensorflow-ubi9-python-3.9
 configMapGenerator:
-- name: req-config
-  files:
-  - requirements-elyra.txt
\ No newline at end of file
+  - name: req-config
+    files:
+      - requirements-elyra.txt
diff --git a/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/pod.yaml b/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/pod.yaml
index 89db7295f..bc5343566 100644
--- a/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/pod.yaml
+++ b/runtimes/tensorflow/ubi9-python-3.9/kustomize/base/pod.yaml
@@ -1,28 +1,29 @@
+---
 apiVersion: v1
 kind: Pod
 metadata:
   name: pod
-  labels:                                
+  labels:
     app: runtime-image
 spec:
-  containers:                            
-  - name: runtime
-    image: runtime-workbench
-    command: [ "/bin/sh", "-c", "while true ; do date; sleep 1; done;" ] 
-    imagePullPolicy: Always
-    ports:
-      - containerPort: 8080
-    resources:
-      limits:
-        cpu: 500m
-        memory: 500Mi
-      requests:
-        cpu: 500m
-        memory: 500Mi
-    volumeMounts:                       
-      - name: config
-        mountPath: /opt/app-root/elyra
+  containers:
+    - name: runtime
+      image: runtime-workbench
+      command: ["/bin/sh", "-c", "while true ; do date; sleep 1; done;"]
+      imagePullPolicy: Always
+      ports:
+        - containerPort: 8080
+      resources:
+        limits:
+          cpu: 500m
+          memory: 500Mi
+        requests:
+          cpu: 500m
+          memory: 500Mi
+      volumeMounts:
+        - name: config
+          mountPath: /opt/app-root/elyra
   volumes:
-  - name: config
-    configMap:
-      name: req-config
\ No newline at end of file
+    - name: config
+      configMap:
+        name: req-config