diff --git a/org/base/buildpack-deps-scm/Dockerfile.template b/org/base/buildpack-deps-scm/Dockerfile.template
index 83c24c3..bdad950 100644
--- a/org/base/buildpack-deps-scm/Dockerfile.template
+++ b/org/base/buildpack-deps-scm/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps-curl:{{ branch }}
+FROM {{ registry }}base/buildpack-deps-curl:{{ branch }}
 
 MAINTAINER alt-cloud
 
diff --git a/org/base/buildpack-deps/Dockerfile.template b/org/base/buildpack-deps/Dockerfile.template
index 39805e3..3a157d6 100644
--- a/org/base/buildpack-deps/Dockerfile.template
+++ b/org/base/buildpack-deps/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps-scm:{{ branch }}
+FROM {{ registry }}base/buildpack-deps-scm:{{ branch }}
 
 MAINTAINER alt-cloud
 
diff --git a/org/base/devel/Dockerfile.template b/org/base/devel/Dockerfile.template
index a8e0c66..8e43b0a 100644
--- a/org/base/devel/Dockerfile.template
+++ b/org/base/devel/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}base/base:{{ branch }}
 
 MAINTAINER alt-cloud
 
diff --git a/org/base/distroless-base/distroless.toml b/org/base/distroless-base/distroless.toml
index 38c6156..ea5ba5f 100644
--- a/org/base/distroless-base/distroless.toml
+++ b/org/base/distroless-base/distroless.toml
@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
+from = "{{ registry }}base/distroless-static:{{ branch }}"
 builder-install-packages = [
     "glibc-core",
     '{{if_branches(["p10"], "glibc-nss")}}',
diff --git a/org/base/distroless-devel/distroless.toml b/org/base/distroless-devel/distroless.toml
index 058714e..a1072a5 100644
--- a/org/base/distroless-devel/distroless.toml
+++ b/org/base/distroless-devel/distroless.toml
@@ -1,4 +1,4 @@
-from = "{{ registry }}{{ organization }}/distroless-base:{{ branch }}"
+from = "{{ registry }}base/distroless-base:{{ branch }}"
 builder-install-packages = [
     "coreutils",
     "findutils",
diff --git a/org/base/distroless-gotop/distroless.toml b/org/base/distroless-gotop/distroless.toml
index 9c1c44b..ce08120 100644
--- a/org/base/distroless-gotop/distroless.toml
+++ b/org/base/distroless-gotop/distroless.toml
@@ -1,3 +1,3 @@
-from = "{{ registry }}{{ organization }}/distroless-base:{{ branch }}"
+from = "{{ registry }}base/distroless-base:{{ branch }}"
 full-files = ["/usr/bin/gotop"]
 entrypoint = ["/usr/bin/gotop"]
diff --git a/org/base/distroless-true/distroless.toml b/org/base/distroless-true/distroless.toml
index 6d2a840..5196ba5 100644
--- a/org/base/distroless-true/distroless.toml
+++ b/org/base/distroless-true/distroless.toml
@@ -1,3 +1,3 @@
-from = "{{ registry }}{{ organization }}/distroless-static:{{ branch }}"
+from = "{{ registry }}base/distroless-static:{{ branch }}"
 files = ["/bin/true"]
 cmd = ["/bin/true"]
diff --git a/org/other/node/Dockerfile.template b/org/other/node/Dockerfile.template
index a781d1b..a8445b9 100644
--- a/org/other/node/Dockerfile.template
+++ b/org/other/node/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/buildpack-deps:{{ branch }}
+FROM {{ registry }}base/buildpack-deps:{{ branch }}
 
 MAINTAINER alt-cloud
 
diff --git a/org/other/python/Dockerfile.template b/org/other/python/Dockerfile.template
index 435470e..ee0ec81 100644
--- a/org/other/python/Dockerfile.template
+++ b/org/other/python/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}/base:{{ branch }}
+FROM {{ registry }}base/base:{{ branch }}
 
 MAINTAINER alt-cloud
 
diff --git a/org/other/systemd/Dockerfile.template b/org/other/systemd/Dockerfile.template
index 65542c0..598e572 100644
--- a/org/other/systemd/Dockerfile.template
+++ b/org/other/systemd/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{ registry }}{{ organization }}/base:{{ branch }}
+FROM {{ registry }}base/base:{{ branch }}
 
 MAINTAINER alt-cloud