diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml
index c72f2046cb..8afd780fd5 100644
--- a/.github/workflows/docker-build-test-upload.yml
+++ b/.github/workflows/docker-build-test-upload.yml
@@ -60,7 +60,7 @@ jobs:
         shell: bash
 
       - name: Build image 🛠
-        run: docker build --rm --force-rm --tag ${{ env.OWNER }}/${{ inputs.image }} ${{ inputs.image }}/
+        run: docker build --rm --force-rm --tag ${{ env.OWNER }}/${{ inputs.image }} images/${{ inputs.image }}/
         env:
           DOCKER_BUILDKIT: 1
           # Full logs for CI build
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 8d6a05f496..7b3f16385f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -20,17 +20,7 @@ on:
       - ".github/actions/download-manifests/action.yml"
       - ".github/actions/load-image/action.yml"
 
-      - "all-spark-notebook/**"
-      - "base-notebook/**"
-      - "datascience-notebook/**"
-      - "docker-stacks-foundation/**"
-      - "julia-notebook/**"
-      - "minimal-notebook/**"
-      - "pyspark-notebook/**"
-      - "r-notebook/**"
-      - "scipy-notebook/**"
-      - "tensorflow-notebook/**"
-
+      - "images/**"
       - "tagging/**"
       - "tests/**"
       - "requirements-dev.txt"
@@ -48,17 +38,7 @@ on:
       - ".github/actions/download-manifests/action.yml"
       - ".github/actions/load-image/action.yml"
 
-      - "all-spark-notebook/**"
-      - "base-notebook/**"
-      - "datascience-notebook/**"
-      - "docker-stacks-foundation/**"
-      - "julia-notebook/**"
-      - "minimal-notebook/**"
-      - "pyspark-notebook/**"
-      - "r-notebook/**"
-      - "scipy-notebook/**"
-      - "tensorflow-notebook/**"
-
+      - "images/**"
       - "tagging/**"
       - "tests/**"
       - "requirements-dev.txt"
diff --git a/.github/workflows/hub-overview.yml b/.github/workflows/hub-overview.yml
index aef107f274..85bc769483 100644
--- a/.github/workflows/hub-overview.yml
+++ b/.github/workflows/hub-overview.yml
@@ -10,16 +10,7 @@ on:
     paths:
       - ".github/workflows/hub-overview.yml"
 
-      - "all-spark-notebook/README.md"
-      - "base-notebook/README.md"
-      - "datascience-notebook/README.md"
-      - "docker-stacks-foundation/README.md"
-      - "julia-notebook/README.md"
-      - "minimal-notebook/README.md"
-      - "pyspark-notebook/README.md"
-      - "r-notebook/README.md"
-      - "scipy-notebook/README.md"
-      - "tensorflow-notebook/README.md"
+      - "images/*/README.md"
 
 jobs:
   update-dockerhub-overview:
@@ -40,7 +31,7 @@ jobs:
           destination_container_repo: ${{ env.OWNER }}/${{ matrix.image }}
           provider: dockerhub
           short_description: ${{ matrix.description }}
-          readme_file: ${{ matrix.image }}/README.md
+          readme_file: images/${{ matrix.image }}/README.md
 
     strategy:
       matrix:
diff --git a/Makefile b/Makefile
index 483522a1c1..3af508cba2 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ help:
 
 build/%: DOCKER_BUILD_ARGS?=
 build/%: ## build the latest image for a stack using the system's architecture
-	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm --tag "$(OWNER)/$(notdir $@):latest" "./$(notdir $@)" --build-arg OWNER="$(OWNER)"
+	docker build $(DOCKER_BUILD_ARGS) --rm --force-rm --tag "$(OWNER)/$(notdir $@):latest" "./images/$(notdir $@)" --build-arg OWNER="$(OWNER)"
 	@echo -n "Built image size: "
 	@docker images "$(OWNER)/$(notdir $@):latest" --format "{{.Size}}"
 build-all: $(foreach I, $(ALL_IMAGES), build/$(I)) ## build all stacks
diff --git a/all-spark-notebook/.dockerignore b/images/all-spark-notebook/.dockerignore
similarity index 100%
rename from all-spark-notebook/.dockerignore
rename to images/all-spark-notebook/.dockerignore
diff --git a/all-spark-notebook/Dockerfile b/images/all-spark-notebook/Dockerfile
similarity index 100%
rename from all-spark-notebook/Dockerfile
rename to images/all-spark-notebook/Dockerfile
diff --git a/all-spark-notebook/README.md b/images/all-spark-notebook/README.md
similarity index 100%
rename from all-spark-notebook/README.md
rename to images/all-spark-notebook/README.md
diff --git a/base-notebook/.dockerignore b/images/base-notebook/.dockerignore
similarity index 100%
rename from base-notebook/.dockerignore
rename to images/base-notebook/.dockerignore
diff --git a/base-notebook/Dockerfile b/images/base-notebook/Dockerfile
similarity index 100%
rename from base-notebook/Dockerfile
rename to images/base-notebook/Dockerfile
diff --git a/base-notebook/README.md b/images/base-notebook/README.md
similarity index 100%
rename from base-notebook/README.md
rename to images/base-notebook/README.md
diff --git a/base-notebook/docker_healthcheck.py b/images/base-notebook/docker_healthcheck.py
similarity index 100%
rename from base-notebook/docker_healthcheck.py
rename to images/base-notebook/docker_healthcheck.py
diff --git a/base-notebook/jupyter_server_config.py b/images/base-notebook/jupyter_server_config.py
similarity index 100%
rename from base-notebook/jupyter_server_config.py
rename to images/base-notebook/jupyter_server_config.py
diff --git a/base-notebook/start-notebook.sh b/images/base-notebook/start-notebook.sh
similarity index 100%
rename from base-notebook/start-notebook.sh
rename to images/base-notebook/start-notebook.sh
diff --git a/base-notebook/start-singleuser.sh b/images/base-notebook/start-singleuser.sh
similarity index 100%
rename from base-notebook/start-singleuser.sh
rename to images/base-notebook/start-singleuser.sh
diff --git a/datascience-notebook/.dockerignore b/images/datascience-notebook/.dockerignore
similarity index 100%
rename from datascience-notebook/.dockerignore
rename to images/datascience-notebook/.dockerignore
diff --git a/datascience-notebook/Dockerfile b/images/datascience-notebook/Dockerfile
similarity index 100%
rename from datascience-notebook/Dockerfile
rename to images/datascience-notebook/Dockerfile
diff --git a/datascience-notebook/README.md b/images/datascience-notebook/README.md
similarity index 100%
rename from datascience-notebook/README.md
rename to images/datascience-notebook/README.md
diff --git a/docker-stacks-foundation/.dockerignore b/images/docker-stacks-foundation/.dockerignore
similarity index 100%
rename from docker-stacks-foundation/.dockerignore
rename to images/docker-stacks-foundation/.dockerignore
diff --git a/docker-stacks-foundation/Dockerfile b/images/docker-stacks-foundation/Dockerfile
similarity index 100%
rename from docker-stacks-foundation/Dockerfile
rename to images/docker-stacks-foundation/Dockerfile
diff --git a/docker-stacks-foundation/README.md b/images/docker-stacks-foundation/README.md
similarity index 100%
rename from docker-stacks-foundation/README.md
rename to images/docker-stacks-foundation/README.md
diff --git a/docker-stacks-foundation/fix-permissions b/images/docker-stacks-foundation/fix-permissions
similarity index 100%
rename from docker-stacks-foundation/fix-permissions
rename to images/docker-stacks-foundation/fix-permissions
diff --git a/docker-stacks-foundation/initial-condarc b/images/docker-stacks-foundation/initial-condarc
similarity index 100%
rename from docker-stacks-foundation/initial-condarc
rename to images/docker-stacks-foundation/initial-condarc
diff --git a/docker-stacks-foundation/start.sh b/images/docker-stacks-foundation/start.sh
similarity index 100%
rename from docker-stacks-foundation/start.sh
rename to images/docker-stacks-foundation/start.sh
diff --git a/julia-notebook/.dockerignore b/images/julia-notebook/.dockerignore
similarity index 100%
rename from julia-notebook/.dockerignore
rename to images/julia-notebook/.dockerignore
diff --git a/julia-notebook/Dockerfile b/images/julia-notebook/Dockerfile
similarity index 100%
rename from julia-notebook/Dockerfile
rename to images/julia-notebook/Dockerfile
diff --git a/julia-notebook/README.md b/images/julia-notebook/README.md
similarity index 100%
rename from julia-notebook/README.md
rename to images/julia-notebook/README.md
diff --git a/minimal-notebook/.dockerignore b/images/minimal-notebook/.dockerignore
similarity index 100%
rename from minimal-notebook/.dockerignore
rename to images/minimal-notebook/.dockerignore
diff --git a/minimal-notebook/Dockerfile b/images/minimal-notebook/Dockerfile
similarity index 100%
rename from minimal-notebook/Dockerfile
rename to images/minimal-notebook/Dockerfile
diff --git a/minimal-notebook/README.md b/images/minimal-notebook/README.md
similarity index 100%
rename from minimal-notebook/README.md
rename to images/minimal-notebook/README.md
diff --git a/minimal-notebook/Rprofile.site b/images/minimal-notebook/Rprofile.site
similarity index 100%
rename from minimal-notebook/Rprofile.site
rename to images/minimal-notebook/Rprofile.site
diff --git a/minimal-notebook/setup-scripts/setup-julia-packages.bash b/images/minimal-notebook/setup-scripts/setup-julia-packages.bash
similarity index 100%
rename from minimal-notebook/setup-scripts/setup-julia-packages.bash
rename to images/minimal-notebook/setup-scripts/setup-julia-packages.bash
diff --git a/minimal-notebook/setup-scripts/setup-julia.bash b/images/minimal-notebook/setup-scripts/setup-julia.bash
similarity index 100%
rename from minimal-notebook/setup-scripts/setup-julia.bash
rename to images/minimal-notebook/setup-scripts/setup-julia.bash
diff --git a/pyspark-notebook/.dockerignore b/images/pyspark-notebook/.dockerignore
similarity index 100%
rename from pyspark-notebook/.dockerignore
rename to images/pyspark-notebook/.dockerignore
diff --git a/pyspark-notebook/Dockerfile b/images/pyspark-notebook/Dockerfile
similarity index 100%
rename from pyspark-notebook/Dockerfile
rename to images/pyspark-notebook/Dockerfile
diff --git a/pyspark-notebook/README.md b/images/pyspark-notebook/README.md
similarity index 100%
rename from pyspark-notebook/README.md
rename to images/pyspark-notebook/README.md
diff --git a/pyspark-notebook/ipython_kernel_config.py b/images/pyspark-notebook/ipython_kernel_config.py
similarity index 100%
rename from pyspark-notebook/ipython_kernel_config.py
rename to images/pyspark-notebook/ipython_kernel_config.py
diff --git a/r-notebook/.dockerignore b/images/r-notebook/.dockerignore
similarity index 100%
rename from r-notebook/.dockerignore
rename to images/r-notebook/.dockerignore
diff --git a/r-notebook/Dockerfile b/images/r-notebook/Dockerfile
similarity index 100%
rename from r-notebook/Dockerfile
rename to images/r-notebook/Dockerfile
diff --git a/r-notebook/README.md b/images/r-notebook/README.md
similarity index 100%
rename from r-notebook/README.md
rename to images/r-notebook/README.md
diff --git a/scipy-notebook/.dockerignore b/images/scipy-notebook/.dockerignore
similarity index 100%
rename from scipy-notebook/.dockerignore
rename to images/scipy-notebook/.dockerignore
diff --git a/scipy-notebook/Dockerfile b/images/scipy-notebook/Dockerfile
similarity index 100%
rename from scipy-notebook/Dockerfile
rename to images/scipy-notebook/Dockerfile
diff --git a/scipy-notebook/README.md b/images/scipy-notebook/README.md
similarity index 100%
rename from scipy-notebook/README.md
rename to images/scipy-notebook/README.md
diff --git a/tensorflow-notebook/.dockerignore b/images/tensorflow-notebook/.dockerignore
similarity index 100%
rename from tensorflow-notebook/.dockerignore
rename to images/tensorflow-notebook/.dockerignore
diff --git a/tensorflow-notebook/Dockerfile b/images/tensorflow-notebook/Dockerfile
similarity index 100%
rename from tensorflow-notebook/Dockerfile
rename to images/tensorflow-notebook/Dockerfile
diff --git a/tensorflow-notebook/README.md b/images/tensorflow-notebook/README.md
similarity index 100%
rename from tensorflow-notebook/README.md
rename to images/tensorflow-notebook/README.md
diff --git a/tagging/write_manifest.py b/tagging/write_manifest.py
index f81e021335..14a01a15a9 100755
--- a/tagging/write_manifest.py
+++ b/tagging/write_manifest.py
@@ -38,7 +38,7 @@ def write_build_history_line(
     links_column = MARKDOWN_LINE_BREAK.join(
         [
             f"[Git diff](https://github.com/jupyter/docker-stacks/commit/{commit_hash})",
-            f"[Dockerfile](https://github.com/jupyter/docker-stacks/blob/{commit_hash}/{short_image_name}/Dockerfile)",
+            f"[Dockerfile](https://github.com/jupyter/docker-stacks/blob/{commit_hash}/images/{short_image_name}/Dockerfile)",
             f"[Build manifest](./{filename})",
         ]
     )