diff --git a/.github/workflows/auto-add-issue-to-project.yml b/.github/workflows/auto-add-issue-to-project.yml
deleted file mode 100644
index c222441f3..000000000
--- a/.github/workflows/auto-add-issue-to-project.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Auto Add Issues to Tracking boards
-on:  # yamllint disable-line rule:truthy
-  issues:
-    types:
-      - opened
-jobs:
-  add-to-project:
-    name: Add issue to projects
-    runs-on: ubuntu-latest
-    steps:
-      - name: Generate github-app token
-        id: app-token
-        uses: getsentry/action-github-app-token@v2
-        with:
-          app_id: ${{ secrets.DEVOPS_APP_ID }}
-          private_key: ${{ secrets.DEVOPS_APP_PRIVATE_KEY }}
-      - uses: actions/add-to-project@v0.5.0
-        with:
-          project-url: https://github.com/orgs/opendatahub-io/projects/40
-          github-token: ${{ steps.app-token.outputs.token }}
-      - 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 }}
diff --git a/.github/workflows/notebooks-digest-updater-upstream.yaml b/.github/workflows/notebooks-digest-updater-upstream.yaml
deleted file mode 100644
index 8d1c6bc84..000000000
--- a/.github/workflows/notebooks-digest-updater-upstream.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
----
-# The aim of this GitHub workflow is to update the params.env file with the latest digest.
-name: Update notebook image build commit hashes
-on:  # yamllint disable-line rule:truthy
-  workflow_dispatch:
-    inputs:
-      branch:
-        required: true
-        description: "Provide the name of the branch you want to update ex main, vYYYYx etc: "
-        # Put the scheduler on comment until automate the full release procedure
-        # schedule:
-        #   - cron: "0 0 * * 5"  #Scheduled every Friday
-env:
-  DIGEST_UPDATER_BRANCH: digest-updater-${{ github.run_id }}
-  BRANCH_NAME: ${{ github.event.inputs.branch || 'main' }}
-  RELEASE_VERSION_N: 2023b
-  RELEASE_VERSION_N_1: 2023a
-jobs:
-  initialize:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Install Skopeo CLI
-        shell: bash
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install skopeo
-
-      # Checkout the branch
-      - name: Checkout branch
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ env.BRANCH_NAME }}
-
-      # Create a new branch
-      - name: Create a new branch
-        run: |
-         echo ${{ env.DIGEST_UPDATER_BRANCH }}
-         git checkout -b ${{ env.DIGEST_UPDATER_BRANCH }}
-         git push --set-upstream origin ${{ env.DIGEST_UPDATER_BRANCH }}
-
-  update-n-version:
-    needs: [initialize]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Configure Git
-        run: |
-         git config --global user.email "github-actions[bot]@users.noreply.github.com"
-         git config --global user.name "GitHub Actions"
-
-      # Get the latest weekly build commit hash: https://github.com/opendatahub-io/notebooks/commits/2023b
-      - name: Checkout upstream notebooks repo
-        uses: actions/checkout@v3
-        with:
-          repository: opendatahub-io/notebooks.git
-          ref: ${{ env.RELEASE_VERSION_N }}
-
-      - name: Retrieve latest weekly commit hash from the release branch
-        id: hash-n
-        shell: bash
-        run: |
-          echo "HASH_N=$(git rev-parse --short HEAD)" >> ${GITHUB_OUTPUT}
-
-      # Checkout the release branch to apply the updates
-      - name: Checkout release branch
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ env.DIGEST_UPDATER_BRANCH }}
-
-      - name: Fetch digest, and update the param.env file
-        run: |
-              echo Latest commit is: ${{ steps.hash-n.outputs.HASH_N }} on ${{ env.RELEASE_VERSION_N}}
-              IMAGES=("odh-minimal-notebook-image-n" "odh-minimal-gpu-notebook-image-n" "odh-pytorch-gpu-notebook-image-n" "odh-generic-data-science-notebook-image-n" "odh-tensorflow-gpu-notebook-image-n" "odh-trustyai-notebook-image-n")
-              for ((i=0;i<${#IMAGES[@]};++i)); do
-                image=${IMAGES[$i]}
-                echo $image
-                img=$(cat manifests/base/params.env | grep -E "${image}=" | cut -d '=' -f2)
-                registry=$(echo $img | cut -d '@' -f1)
-                src_tag=$(skopeo inspect docker://$img | jq '.Env[] | select(startswith("OPENSHIFT_BUILD_NAME=")) | split("=")[1]' | tr -d '"' | sed 's/-amd64$//')
-                regex="$src_tag-${{ env.RELEASE_VERSION_N}}-\d+-${{ steps.hash-n.outputs.HASH_N }}"
-                latest_tag=$(skopeo inspect docker://$img | jq -r --arg regex "$regex" '.RepoTags | map(select(. | test($regex))) | .[0]')
-                digest=$(skopeo inspect docker://$registry:$latest_tag | jq .Digest | tr -d '"')
-                output=$registry@$digest
-                echo $output
-                sed -i "s|${image}=.*|${image}=$output|" manifests/base/params.env
-              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 images for release N via ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}
-
-  update-n-1-version:
-    needs: [initialize, update-n-version]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Configure Git
-        run: |
-         git config --global user.email "github-actions[bot]@users.noreply.github.com"
-         git config --global user.name "GitHub Actions"
-
-      # Get the latest weekly build commit hash: https://github.com/opendatahub-io/notebooks/commits/2023a
-      - name: Checkout upstream notebooks repo
-        uses: actions/checkout@v3
-        with:
-          repository: opendatahub-io/notebooks.git
-          ref: ${{ env.RELEASE_VERSION_N_1 }}
-
-      - name: Retrieve latest weekly commit hash from the release branch
-        id: hash-n-1
-        shell: bash
-        run: |
-          echo "HASH_N_1=$(git rev-parse --short HEAD)" >> ${GITHUB_OUTPUT}
-
-      # Checkout the release branch to apply the updates
-      - name: Checkout release branch
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ env.DIGEST_UPDATER_BRANCH }}
-
-      - name: Fetch digest, and update the param.env file
-        run: |
-              echo Latest commit is: ${{ steps.hash-n-1.outputs.HASH_N_1 }} on ${{ env.RELEASE_VERSION_N_1}}
-              IMAGES=("odh-minimal-notebook-image-n-1" "odh-minimal-gpu-notebook-image-n-1" "odh-pytorch-gpu-notebook-image-n-1" "odh-generic-data-science-notebook-image-n-1" "odh-tensorflow-gpu-notebook-image-n-1" "odh-trustyai-notebook-image-n-1")
-              for ((i=0;i<${#IMAGES[@]};++i)); do
-                image=${IMAGES[$i]}
-                echo $image
-                img=$(cat manifests/base/params.env | grep -E "${image}=" | cut -d '=' -f2)
-                registry=$(echo $img | cut -d '@' -f1)
-                src_tag=$(skopeo inspect docker://$img | jq '.Env[] | select(startswith("OPENSHIFT_BUILD_NAME=")) | split("=")[1]' | tr -d '"' | sed 's/-amd64$//')
-                regex="$src_tag-${{ env.RELEASE_VERSION_N_1}}-\d+-${{ steps.hash-n-1.outputs.HASH_N_1 }}"
-                latest_tag=$(skopeo inspect docker://$img | jq -r --arg regex "$regex" '.RepoTags | map(select(. | test($regex))) | .[0]')
-                digest=$(skopeo inspect docker://$registry:$latest_tag | jq .Digest | tr -d '"')
-                output=$registry@$digest
-                echo $output
-                sed -i "s|${image}=.*|${image}=$output|" manifests/base/params.env
-              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 images for release N-1 via ${{ env.DIGEST_UPDATER_BRANCH }} GitHub action" && git push origin  ${{ env.DIGEST_UPDATER_BRANCH }}
-
-  # Creates the Pull Request
-  open-pull-request:
-    needs: [update-n-version, update-n-1-version]
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: pull-request
-        uses: repo-sync/pull-request@v2
-        with:
-          source_branch: ${{ env.DIGEST_UPDATER_BRANCH }}
-          destination_branch: ${{ env.BRANCH_NAME}}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          pr_label: "automated pr"
-          pr_title: "[Digest Updater Action] Update notebook's imageStreams image tag to digest format"
-          pr_body: |
-            :rocket: This is an automated Pull Request.
-
-            This PR updates the `manifests/base/params.env` file with the latest updated SHA digests of the notebooks (N & N-1).
-            Created by `/.github/workflows/notebooks-digest-updater-upstream.yaml`
-
-            :exclamation: **IMPORTANT NOTE**: Remember to delete the ` ${{ env.DIGEST_UPDATER_BRANCH }}` branch after merging the changes
diff --git a/.github/workflows/piplock-renewal-2023a.yml b/.github/workflows/piplock-renewal-2023a.yml
deleted file mode 100644
index 4f17147b8..000000000
--- a/.github/workflows/piplock-renewal-2023a.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-# 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:  # 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.
-      contents: write
-
-    steps:
-      # Checkout the paricular branch
-      - name: Checkout code from the release branch
-        uses: actions/checkout@v3
-        with:
-          ref: 2023a
-          token: ${{ secrets.GH_ACCESS_TOKEN }}
-
-      # Setup Python environment
-      - name: Setup Python environment
-        uses: actions/setup-python@v4
-        with:
-          python-version: |
-            3.8
-            3.9
-      - name: Install pipenv
-        run: pip install pipenv
-
-      # Runs the makefile recipe `refresh-pipfilelock-files` and push the chances back to the branch
-      - name: Run make refresh-pipfilelock-files and push the chances back to the branch
-        run: |
-          make refresh-pipfilelock-files
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "GitHub Actions"
-          git add .
-          git commit -m "Update the pipfile.lock via the weekly workflow action"
-          git push
diff --git a/.github/workflows/piplock-renewal-2023b.yml b/.github/workflows/piplock-renewal-2023b.yml
deleted file mode 100644
index 6ea54fa8c..000000000
--- a/.github/workflows/piplock-renewal-2023b.yml
+++ /dev/null
@@ -1,47 +0,0 @@
----
-# This GitHub action is meant to be triggered weekly in order to update the pipfile.locks
-
-name: Weekly Pipfile.locks renewal on [2023b] branch
-
-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.
-      contents: write
-
-    steps:
-      # Checkout the paricular branch
-      - name: Checkout code from the release branch
-        uses: actions/checkout@v3
-        with:
-          ref: 2023b
-          token: ${{ secrets.GH_ACCESS_TOKEN }}
-
-      # Setup Python environment
-      - name: Setup Python environment
-        uses: actions/setup-python@v4
-        with:
-          python-version: |
-            3.8
-            3.9
-      - name: Install pipenv
-        run: pip install pipenv
-
-      # Runs the makefile recipe `refresh-pipfilelock-files` and push the chances back to the branch
-      - name: Run make refresh-pipfilelock-files and push the chances back to the branch
-        run: |
-          make refresh-pipfilelock-files
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "GitHub Actions"
-          git add .
-          git commit -m "Update the pipfile.lock via the weekly workflow action"
-          git push
diff --git a/.github/workflows/pr-merge-image-delete.yml b/.github/workflows/pr-merge-image-delete.yml
deleted file mode 100644
index 41da2aabb..000000000
--- a/.github/workflows/pr-merge-image-delete.yml
+++ /dev/null
@@ -1,95 +0,0 @@
----
-name: Delete quay image of PR once merged
-on:  # yamllint disable-line rule:truthy
-  push:
-    branches:
-      - 'main'
-
-permissions:
-  pull-requests: read
-env:
-  QUAY_IMAGE_REPO: ${{ secrets.QUAY_IMAGE_REPO }}
-jobs:
-  delete-pr-quay-image:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Git checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: '0'
-      - name: Install skopeo
-        shell: bash
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install skopeo
-      - name: Get Pull Request Number
-        uses: actions/github-script@v6
-        id: get_pr_number
-        with:
-          script: |
-            if (context.issue.number) {
-              // Return issue number if present
-              return context.issue.number;
-            } else {
-              // Otherwise return issue number from commit
-              return (
-                await github.rest.repos.listPullRequestsAssociatedWithCommit({
-                  commit_sha: context.sha,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                })
-              ).data[0].number;
-            }
-          result-encoding: string
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login to quay.io
-        shell: bash
-        env:
-          QUAY_ROBOT_USERNAME: ${{ secrets.QUAY_ROBOT_USERNAME }}
-          QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
-        run: |
-         skopeo login quay.io -u ${QUAY_ROBOT_USERNAME} -p ${QUAY_ROBOT_TOKEN}
-      - name: Delete PR image
-        shell: bash
-        continue-on-error: true
-        env:
-          PR: ${{steps.get_pr_number.outputs.result}}
-        run: |
-
-          set +e # Don't abort if a delete operation fails as all images might not be available for the PR
-
-          skopeo delete docker://${QUAY_IMAGE_REPO}:base-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:base-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:base-c9s-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-ubi8-python-3.8-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-c9s-python-3.9-pr-${{ env.PR }}
-
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-minimal-ubi8-python-3.8-pr-${{ env.PR }}
-          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}: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 }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-minimal-ubi8-python-3.8-pr-${{ env.PR }}
-          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 }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:jupyter-trustyai-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-minimal-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-datascience-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:cuda-jupyter-tensorflow-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-minimal-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-datascience-ubi9-python-3.9-pr-${{ env.PR }}
-          skopeo delete docker://${QUAY_IMAGE_REPO}:runtime-pytorch-ubi9-python-3.9-pr-${{ env.PR }}
-          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 }}
diff --git a/.github/workflows/sync-release-branch-2023a.yml b/.github/workflows/sync-release-branch-2023a.yml
new file mode 100644
index 000000000..df5f89398
--- /dev/null
+++ b/.github/workflows/sync-release-branch-2023a.yml
@@ -0,0 +1,35 @@
+# This GitHub action is meant to be triggered weekly in order to sync the upstream release branch with the downstream branch fork
+
+name: Sync downstream release-2023a branch with upstream's
+on:
+  # Triggers the workflow every Tue at 8 A.M
+  schedule:
+  - cron: "0 8 * * 2"
+  workflow_dispatch:  # for manual trigger workflow from GH Web UI
+env:
+  # UPSTREAM_URL: "https://github.com/opendatahub-io/notebooks.git"
+  UPSTREAM_REPO: "opendatahub-io/notebooks"
+  UPSTREAM_BRANCH: "2023a"
+  DOWNSTREAM_BRANCH: "release-2023a"
+jobs:
+  sync_latest_from_upstream:
+    runs-on: ubuntu-latest
+    # Bug in GitHub Action does not support env variable in name
+    name: sync release branch from 2023a to release-2023a
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ env.DOWNSTREAM_BRANCH }}
+    - name: Sync upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
+      with:
+        target_sync_branch: ${{ env.DOWNSTREAM_BRANCH }}
+        target_repo_token: ${{ secrets.GITHUB_TOKEN }}
+        upstream_sync_branch: ${{ env.UPSTREAM_BRANCH }}
+        upstream_sync_repo: ${{ env.UPSTREAM_REPO }}
+    - name: New commits found
+      if: steps.sync.outputs.has_new_commits == 'true'
+      run: echo "New commits were found to sync."
+
diff --git a/.github/workflows/sync-release-branch-2023b.yml b/.github/workflows/sync-release-branch-2023b.yml
new file mode 100644
index 000000000..29e6bab99
--- /dev/null
+++ b/.github/workflows/sync-release-branch-2023b.yml
@@ -0,0 +1,35 @@
+# This GitHub action is meant to be triggered weekly in order to sync the upstream release branch with the downstream branch fork
+
+name: Sync downstream release-2023b branch with upstream's
+on:
+  # Triggers the workflow every Tue at 8 A.M
+  schedule:
+  - cron: "0 8 * * 2"
+  workflow_dispatch:  # for manual trigger workflow from GH Web UI
+env:
+  # UPSTREAM_URL: "https://github.com/opendatahub-io/notebooks.git"
+  UPSTREAM_REPO: "opendatahub-io/notebooks"
+  UPSTREAM_BRANCH: "2023b"
+  DOWNSTREAM_BRANCH: "release-2023b"
+jobs:
+  sync_latest_from_upstream:
+    runs-on: ubuntu-latest
+    # Bug in GitHub Action does not support env variable in name
+    name: sync release branch from 2023b to release-2023b
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+      with:
+        ref: ${{ env.DOWNSTREAM_BRANCH }}
+    - name: Sync upstream changes
+      id: sync
+      uses: aormsby/Fork-Sync-With-Upstream-action@v3.4
+      with:
+        target_sync_branch: ${{ env.DOWNSTREAM_BRANCH }}
+        target_repo_token: ${{ secrets.GITHUB_TOKEN }}
+        upstream_sync_branch: ${{ env.UPSTREAM_BRANCH }}
+        upstream_sync_repo: ${{ env.UPSTREAM_REPO }}
+    - name: New commits found
+      if: steps.sync.outputs.has_new_commits == 'true'
+      run: echo "New commits were found to sync."
+
diff --git a/manifests/base/jupyter-datascience-notebook-imagestream.yaml b/manifests/base/jupyter-datascience-notebook-imagestream.yaml
index 71e930c1f..e37a9f5e8 100644
--- a/manifests/base/jupyter-datascience-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-datascience-notebook-imagestream.yaml
@@ -5,11 +5,11 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com//opendatahub-io/notebooks/tree/main/jupyter/datascience"
-    opendatahub.io/notebook-image-name: "Jupyter Data Science"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/jupyter/datascience"
+    opendatahub.io/notebook-image-name: "Standard Data Science"
     opendatahub.io/notebook-image-desc: "Jupyter notebook image with a set of data science libraries that advanced AI/ML notebooks will use as a base image to provide a standard for libraries avialable in all notebooks"
-    opendatahub.io/notebook-image-order: "2"
-  name: jupyter-datascience-notebook
+    opendatahub.io/notebook-image-order: "20"
+  name: generic-data-science
 spec:
   lookupPolicy:
     local: true
@@ -17,23 +17,34 @@ spec:
     # 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/notebook-python-dependencies: '[{"name":"Boto3","version":"1.28"},{"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.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10.0"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
+        openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook
         opendatahub.io/workbench-image-recommended: 'true'
       from:
         kind: DockerImage
         name: $(odh-generic-data-science-notebook-image-n)
-      name: "2023.1"
+      name: "2023.2"
       referencePolicy:
         type: Source
     # N-1 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/modh/odh-generic-data-science-notebook
+      from:
+        kind: DockerImage
+        name: $(odh-generic-data-science-notebook-image-n-1)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-2 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
+        openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook
       from:
         kind: DockerImage
-        name: $(odh-generic-data-science-notebook-image-n-1)
+        name: $(odh-generic-data-science-notebook-image-n-2)
       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 4a76a60ef..1e0f58cb5 100644
--- a/manifests/base/jupyter-habana-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-habana-notebook-imagestream.yaml
@@ -5,12 +5,12 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com//opendatahub-io/notebooks/tree/main/habana"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/habana"
     opendatahub.io/notebook-image-name: "HabanaAI"
     opendatahub.io/notebook-image-desc: "Jupyter notebook image with a set of habana libraries that advanced AI/ML notebooks will use as a base image to provide a standard for libraries avialable in all notebooks"
-    opendatahub.io/notebook-image-order: "7"
+    opendatahub.io/notebook-image-order: "70"
     opendatahub.io/recommended-accelerators: '["habana.ai/gaudi"]'
-  name: jupyter-habana-notebook
+  name: habana
 spec:
   lookupPolicy:
     local: true
@@ -19,7 +19,7 @@ spec:
     - 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
+        openshift.io/imported-from: quay.io/modh/odh-habana-notebooks
       from:
         kind: DockerImage
         name: $(odh-habana-notebook-image-n)
@@ -30,7 +30,7 @@ spec:
     - 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
+        openshift.io/imported-from: quay.io/modh/odh-habana-notebooks
       from:
         kind: DockerImage
         name: $(odh-habana-notebook-image-n-1)
diff --git a/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
index 179601847..32bb4a974 100644
--- a/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
@@ -5,12 +5,12 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/jupyter/minimal"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/jupyter/minimal"
     opendatahub.io/notebook-image-name: "CUDA"
     opendatahub.io/notebook-image-desc: "Jupyter notebook image with GPU support and minimal dependency set to start experimenting with Jupyter environment."
-    opendatahub.io/notebook-image-order: "3"
+    opendatahub.io/notebook-image-order: "30"
     opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
-  name: jupyter-minimal-gpu-notebook
+  name: minimal-gpu
 spec:
   lookupPolicy:
     local: true
@@ -18,23 +18,35 @@ spec:
     # 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/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name":"Notebook","version":"6.5"}]'
+        openshift.io/imported-from: quay.io/modh/cuda-notebooks
         opendatahub.io/workbench-image-recommended: 'true'
       from:
         kind: DockerImage
         name: $(odh-minimal-gpu-notebook-image-n)
-      name: "2023.1"
+      name: "2023.2"
       referencePolicy:
         type: Source
     # N-1 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/modh/cuda-notebooks
+        opendatahub.io/workbench-image-recommended: 'true'
+      from:
+        kind: DockerImage
+        name: $(odh-minimal-gpu-notebook-image-n-1)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-2 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
+        openshift.io/imported-from: quay.io/modh/cuda-notebooks
       from:
         kind: DockerImage
-        name: $(odh-minimal-gpu-notebook-image-n-1)
+        name: $(odh-minimal-gpu-notebook-image-n-2)
       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 3687c1229..665f1338a 100644
--- a/manifests/base/jupyter-minimal-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-minimal-notebook-imagestream.yaml
@@ -5,11 +5,11 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com//opendatahub-io/notebooks/tree/main/jupyter/minimal"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/jupyter/minimal"
     opendatahub.io/notebook-image-name: "Minimal Python"
     opendatahub.io/notebook-image-desc: "Jupyter notebook image with minimal dependency set to start experimenting with Jupyter environment."
-    opendatahub.io/notebook-image-order: "1"
-  name: jupyter-minimal-notebook
+    opendatahub.io/notebook-image-order: "10"
+  name: minimal
 spec:
   lookupPolicy:
     local: true
@@ -17,24 +17,37 @@ spec:
     # 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/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.6"}, {"name": "Notebook","version": "6.5"}]'
+        openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/default-image: "true"
       from:
         kind: DockerImage
         name: $(odh-minimal-notebook-image-n)
-      name: "2023.1"
+      name: "2023.2"
       referencePolicy:
         type: Source
     # N-1 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/modh/odh-minimal-notebook-container
+        opendatahub.io/workbench-image-recommended: 'true'
+        opendatahub.io/default-image: "true"
+      from:
+        kind: DockerImage
+        name: $(odh-minimal-notebook-image-n-1)
+      name: "2023.1"
+      referencePolicy:
+        type: Source
+    # N-2 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
+        openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container
       from:
         kind: DockerImage
-        name: $(odh-minimal-notebook-image-n-1)
+        name: $(odh-minimal-notebook-image-n-2)
       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 1eb063840..64d67e78b 100644
--- a/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
@@ -5,36 +5,48 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/pytorch"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/jupyter/pytorch"
     opendatahub.io/notebook-image-name: "PyTorch"
     opendatahub.io/notebook-image-desc: "Jupyter notebook image with PyTorch libraries and dependencies to start experimenting with advanced AI/ML notebooks."
-    opendatahub.io/notebook-image-order: "4"
+    opendatahub.io/notebook-image-order: "40"
     opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
-  name: jupyter-pytorch-notebook
+  name: pytorch
 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":"2.0"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.13"}, {"name":"Boto3","version":"1.28"},{"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.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10.0"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
+        openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook
+        opendatahub.io/workbench-image-recommended: 'true'
+      from:
+        kind: DockerImage
+        name: $(odh-pytorch-gpu-notebook-image-n)
+      name: "2023.2"
+      referencePolicy:
+        type: Source
+    # N-1 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
+        openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook
         opendatahub.io/workbench-image-recommended: 'true'
       from:
         kind: DockerImage
-        name: $(odh-pytorch-gpu-notebook-image-n)
+        name: $(odh-pytorch-gpu-notebook-image-n-1)
       name: "2023.1"
       referencePolicy:
         type: Source
-    # N-1 Version of the image
+    # N-2 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
+        openshift.io/imported-from: quay.io/modh/cuda-notebooks
       from:
         kind: DockerImage
-        name: $(odh-pytorch-gpu-notebook-image-n-1)
+        name: $(odh-pytorch-gpu-notebook-image-n-2)
       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 3696e4400..6df66d1a1 100644
--- a/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
@@ -5,36 +5,48 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/tensorflow"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/blob/main/jupyter/tensorflow"
     opendatahub.io/notebook-image-name: "TensorFlow"
     opendatahub.io/notebook-image-desc: "Jupyter notebook image with TensorFlow libraries and dependencies to start experimenting with advanced AI/ML notebooks."
-    opendatahub.io/notebook-image-order: "5"
+    opendatahub.io/notebook-image-order: "50"
     opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
-  name: jupyter-tensorflow-notebook
+  name: tensorflow
 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.13"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.13"},{"name":"Tensorboard","version":"2.13"}, {"name":"Boto3","version":"1.28"},{"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.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10.0"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
+        openshift.io/imported-from: quay.io/modh/cuda-notebooks
+        opendatahub.io/workbench-image-recommended: 'true'
+      from:
+        kind: DockerImage
+        name: $(odh-tensorflow-gpu-notebook-image-n)
+      name: "2023.2"
+      referencePolicy:
+        type: Source
+    # N-1 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
+        openshift.io/imported-from: quay.io/modh/cuda-notebooks
         opendatahub.io/workbench-image-recommended: 'true'
       from:
         kind: DockerImage
-        name: $(odh-tensorflow-gpu-notebook-image-n)
+        name: $(odh-tensorflow-gpu-notebook-image-n-1)
       name: "2023.1"
       referencePolicy:
         type: Source
-    # N-1 Version of the image
+    # N-2 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
+        openshift.io/imported-from: quay.io/modh/cuda-notebooks
       from:
         kind: DockerImage
-        name: $(odh-tensorflow-gpu-notebook-image-n-1)
+        name: $(odh-tensorflow-gpu-notebook-image-n-2)
       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 393e9a478..f76c87d97 100644
--- a/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
+++ b/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
@@ -5,22 +5,34 @@ metadata:
   labels:
     opendatahub.io/notebook-image: "true"
   annotations:
-    opendatahub.io/notebook-image-url: "https://github.com//opendatahub-io/notebooks/tree/main/jupyter/trustyai"
+    opendatahub.io/notebook-image-url: "https://github.com/red-hat-data-services/notebooks/tree/main/jupyter/trustyai"
     opendatahub.io/notebook-image-name: "TrustyAI"
     opendatahub.io/notebook-image-desc: "Jupyter TrustyAI notebook integrates the TrustyAI Explainability Toolkit on Jupyter environment."
-    opendatahub.io/notebook-image-order: "6"
-  name: jupyter-trustyai-notebook
+    opendatahub.io/notebook-image-order: "60"
+  name: trustyai
 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":"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
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.3"}, {"name":"Boto3","version":"1.28"},{"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.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10.0"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
+        openshift.io/imported-from: quay.io/modh/odh-trustyai-notebook
       from:
         kind: DockerImage
         name: $(odh-trustyai-notebook-image-n)
+      name: "2023.2"
+      referencePolicy:
+        type: Source
+    # N-1 Version of the image
+    - 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/modh/odh-trustyai-notebook
+      from:
+        kind: DockerImage
+        name: $(odh-trustyai-notebook-image-n-1)
       name: "2023.1"
       referencePolicy:
         type: Source
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
index 732eb2ae7..829b7581c 100644
--- a/manifests/base/kustomization.yaml
+++ b/manifests/base/kustomization.yaml
@@ -2,13 +2,13 @@
 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-habana-notebook-imagestream.yaml
+- jupyter-minimal-gpu-notebook-imagestream.yaml
+- jupyter-pytorch-notebook-imagestream.yaml
+- jupyter-tensorflow-notebook-imagestream.yaml
+- jupyter-trustyai-notebook-imagestream.yaml
 
 commonLabels:
   opendatahub.io/component: "true"
@@ -34,6 +34,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-minimal-notebook-image-n-1
+  - name: odh-minimal-notebook-image-n-2
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-minimal-notebook-image-n-2
   - name: odh-minimal-gpu-notebook-image-n
     objref:
       kind: ConfigMap
@@ -48,6 +55,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-minimal-gpu-notebook-image-n-1
+  - name: odh-minimal-gpu-notebook-image-n-2
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-minimal-gpu-notebook-image-n-2
   - name: odh-pytorch-gpu-notebook-image-n
     objref:
       kind: ConfigMap
@@ -62,6 +76,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-pytorch-gpu-notebook-image-n-1
+  - name: odh-pytorch-gpu-notebook-image-n-2
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-pytorch-gpu-notebook-image-n-2
   - name: odh-generic-data-science-notebook-image-n
     objref:
       kind: ConfigMap
@@ -76,6 +97,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-generic-data-science-notebook-image-n-1
+  - name: odh-generic-data-science-notebook-image-n-2
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-generic-data-science-notebook-image-n-2
   - name: odh-tensorflow-gpu-notebook-image-n
     objref:
       kind: ConfigMap
@@ -90,6 +118,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-tensorflow-gpu-notebook-image-n-1
+  - name: odh-tensorflow-gpu-notebook-image-n-2
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-tensorflow-gpu-notebook-image-n-2
   - name: odh-trustyai-notebook-image-n
     objref:
       kind: ConfigMap
@@ -97,6 +132,13 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-trustyai-notebook-image-n
+  - name: odh-trustyai-notebook-image-n-1
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-trustyai-notebook-image-n-1
   - name: odh-habana-notebook-image-n
     objref:
       kind: ConfigMap
diff --git a/manifests/base/params.env b/manifests/base/params.env
index 880e2fcd2..e72a88d1f 100644
--- a/manifests/base/params.env
+++ b/manifests/base/params.env
@@ -1,14 +1,19 @@
-odh-minimal-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:61c165b94739386e8070d957a0ed0548719bafa7a3b66bb4f53adfc4ac697729
-odh-minimal-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:697f067146f21102333e8607d0dfc03ddb2225214489869dec0bbfb383e0f737
-odh-minimal-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:89b2e157447d19b153dfe667e74f6f871dae7a0cd8cad69d525918dcc78e4093
-odh-minimal-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:a42bdf57c3d61d7a81a63d923c5a6ff1bf5e5284bb0aa972862fc063933ae733
-odh-pytorch-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:05791c355613831bae3ec18f1a9b5e8d4d8c8073ffd3e162af3c6ae5d233d8fe
-odh-pytorch-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:fc11d04f90817c15969203bced343f65ba7e3b10cb16861706e788da368f61f0
-odh-generic-data-science-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:24eea7c729f17d8ec11e340bca55e6c86d14e95530fc7656dbf9c8f84f6ef84c
-odh-generic-data-science-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:a24baff695680fa3055218643f775156f9d1c8c95a9ec68a24928642b8f0393d
-odh-tensorflow-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:4946093512883baaaa611682056225d3f9373b3c8e28327e83838a60a43f7f9c
-odh-tensorflow-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:e1092904418c1366704feccfdadcaee808bc4c94d78abc515724b2cf25c242c5
-odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:1584f960ecc06f5ca5c19dc517fe6366b7ce2dd484207625ccf615b789fa9c7f
-odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:326af53ec96cd1a4897f0add69db5edb1e4e60428d83fa3ee60347424374b4d8
-odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:901001f289a248f9e1cf46021efd5c0601bdeadde1e89e79112083d30600d07a
-odh-habana-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
+odh-minimal-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:d34600c1ecb2cd0f38604e496db50622f68431c209de7afe7e1a67cc5acd9f67
+odh-minimal-notebook-image-n-1=quay.io/modh/odh-minimal-notebook-container@sha256:565566bcae219a28cfc189e4ca60c542e93f9a492608ac7066b8de76db11bc76
+odh-minimal-notebook-image-n-2=quay.io/modh/odh-minimal-notebook-container@sha256:a5a7738b09a204804e084a45f96360b568b0b9d85709c0ce6742d440ff917183
+odh-minimal-gpu-notebook-image-n=quay.io/modh/cuda-notebooks@sha256:2e1e308fa17c21fba807386766c87caf79a3dec63662bd80a0e400aff80e6854
+odh-minimal-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:b68775065fef75814af1fbd78de785678c0375ee3183fb73f4dc716581b95157
+odh-minimal-gpu-notebook-image-n-2=quay.io/modh/cuda-notebooks@sha256:348fa993347f86d1e0913853fb726c584ae8b5181152f0430967d380d68d804f
+odh-pytorch-gpu-notebook-image-n=quay.io/modh/odh-pytorch-notebook@sha256:9b2239fd59f032fdb4e6d57c1f48d0d8daa6b377ca3ffd17889becf217cd8a3c
+odh-pytorch-gpu-notebook-image-n-1=quay.io/modh/odh-pytorch-notebook@sha256:aae4210015d79db3ee8f44b34ad7b911bab3e9448aea6e2514eca71d98c2e9b7
+odh-pytorch-gpu-notebook-image-n-2=quay.io/modh/cuda-notebooks@sha256:492c37fb4b71c07d929ac7963896e074871ded506230fe926cdac21eb1ab9db8
+odh-generic-data-science-notebook-image-n=quay.io/modh/odh-generic-data-science-notebook@sha256:64a38b9e3c695a6ef7cfc272d16861af7cd86f154b19df62619b8354f898f95d
+odh-generic-data-science-notebook-image-n-1=quay.io/modh/odh-generic-data-science-notebook@sha256:12f3b13d6bb6edc5d46adfbfbdbb20e457bf45094c07f1f4f3f9a05648939a58
+odh-generic-data-science-notebook-image-n-2=quay.io/modh/odh-generic-data-science-notebook@sha256:ebb5613e6b53dc4e8efcfe3878b4cd10ccb77c67d12c00d2b8c9d41aeffd7df5
+odh-tensorflow-gpu-notebook-image-n=quay.io/modh/cuda-notebooks@sha256:356e7db38913d7e8b7ddb543e5962b6748e5baf6abdfef29c64bae82f6e7b482
+odh-tensorflow-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:5943f22d622dc14ec71bbebf86b554dd9ff333db072c54777aa60c4da65e0a3b
+odh-tensorflow-gpu-notebook-image-n-2=quay.io/modh/cuda-notebooks@sha256:2163ba74f602ec4b3049a88dcfa4fe0a8d0fff231090001947da66ef8e75ab9a
+odh-trustyai-notebook-image-n=quay.io/modh/odh-trustyai-notebook@sha256:d63481a2dc57845c934cfd5a22d0964e5da4a131f5dc9dd7782f965a9c93eedf
+odh-trustyai-notebook-image-n-1=quay.io/modh/odh-trustyai-notebook@sha256:e56619204c60654f45bd4fedb98ae842b917b24a29cec4a51df87634211db198
+odh-habana-notebook-image-n=quay.io/modh/odh-habana-notebooks@sha256:56041d1d4588105a3b21256cb9fc976d4673a2640b321674ba5379fbb6edea8b
+odh-habana-notebook-image-n-1=quay.io/modh/odh-habana-notebooks@sha256:25e43ae89f7f509170bf5a58ce98376e9ae9637d5054ae4e7dc83498f15dd874
diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml
index b14be22ba..76f944857 100644
--- a/manifests/base/params.yaml
+++ b/manifests/base/params.yaml
@@ -8,6 +8,10 @@ varReference:
     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-notebook-image-n-2
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1
@@ -16,6 +20,10 @@ varReference:
     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-minimal-gpu-notebook-image-n-2
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1
@@ -24,6 +32,10 @@ varReference:
     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-pytorch-gpu-notebook-image-n-2
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1
@@ -32,6 +44,10 @@ varReference:
     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-generic-data-science-notebook-image-n-2
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1
@@ -40,10 +56,18 @@ varReference:
     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-tensorflow-gpu-notebook-image-n-2
   - 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-trustyai-notebook-image-n-1
   - path: spec/tags[]/from/name
     kind: ImageStream
     apiGroup: image.openshift.io/v1
diff --git a/manifests/overlays/additional/README.md b/manifests/overlays/additional/README.md
deleted file mode 100644
index 7b03fab93..000000000
--- a/manifests/overlays/additional/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Open Data Hub Tier 1 Notebooks
-===
-
-All of the notebooks in this repo are supported by the ODH Community as a Tier 1 component but not part of the ODH Core deployment.
-The source build files for any notebook in this repo must exist under the [opendatahub-io](https://github.com/opendatahub-io) organization
-
-Notebooks:
-===
-* [Code Server Notebook ](https://github.com/opendatahub-io/notebooks/tree/main/codeserver) - Notebook image, allows to run Visual Studio Code (VSCode)
-* [R Studio Notebook](https://github.com/opendatahub-io/notebooks/tree/main/rstudio) - Notebook image, integrated development environment (IDE) for R
-* [CUDA R Studio Notebook](https://github.com/opendatahub-io/notebooks/tree/main/rstudio) - Notebook image, integrated development environment (IDE) for R with embedded CUDA capabilities
diff --git a/manifests/overlays/additional/code-server-notebook-imagestream.yaml b/manifests/overlays/additional/code-server-notebook-imagestream.yaml
deleted file mode 100644
index dd38222eb..000000000
--- a/manifests/overlays/additional/code-server-notebook-imagestream.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  labels:
-    opendatahub.io/notebook-image: "true"
-  annotations:
-    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/codeserver"
-    opendatahub.io/notebook-image-name: "Code Server"
-    opendatahub.io/notebook-image-desc: "Code Server workbench image, allows to run Visual Studio Code (VSCode) on a remote server through the browser."
-    opendatahub.io/notebook-image-order: "8"
-  name: code-server-notebook
-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
diff --git a/manifests/overlays/additional/kustomization.yaml b/manifests/overlays/additional/kustomization.yaml
deleted file mode 100644
index 643d11e51..000000000
--- a/manifests/overlays/additional/kustomization.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - ../../base
-  - 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
deleted file mode 100644
index 39daa81e1..000000000
--- a/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  labels:
-    opendatahub.io/notebook-image: "true"
-  annotations:
-    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/rstudio"
-    opendatahub.io/notebook-image-name: "CUDA - R Studio"
-    opendatahub.io/notebook-image-desc: "R Studio workbench image, allows to integrated development environment for R, a programming language for statistical computing and graphics."
-    opendatahub.io/notebook-image-order: "10"
-    opendatahub.io/recommended-accelerators: '["nvidia.com/gpu"]'
-  name: rstudio-gpu-notebook
-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
diff --git a/manifests/overlays/additional/rstudio-notebook-imagestream.yaml b/manifests/overlays/additional/rstudio-notebook-imagestream.yaml
deleted file mode 100644
index 22fd75445..000000000
--- a/manifests/overlays/additional/rstudio-notebook-imagestream.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-apiVersion: image.openshift.io/v1
-kind: ImageStream
-metadata:
-  labels:
-    opendatahub.io/notebook-image: "true"
-  annotations:
-    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/rstudio"
-    opendatahub.io/notebook-image-name: "R Studio"
-    opendatahub.io/notebook-image-desc: "R Studio workbench image, allows to integrated development environment for R, a programming language for statistical computing and graphics."
-    opendatahub.io/notebook-image-order: "9"
-  name: rstudio-notebook
-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