diff --git a/.github/workflows/latest.yml b/.github/workflows/latest.yml
index 17e5d348..ea746657 100644
--- a/.github/workflows/latest.yml
+++ b/.github/workflows/latest.yml
@@ -114,7 +114,7 @@ jobs:
             image: quay.io/ramalama/ramalama
             tags: latest
             containerfiles: |
-              container-images/ramalama/latest/Containerfile
+              container-images/cpuonly/Containerfile
             platforms: linux/amd64, linux/arm64
 
         - name: push images to registry
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e468d388..4928865d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -77,7 +77,7 @@ jobs:
             image: quay.io/ramalama/ramalama
             tags: nightly
             containerfiles: |
-              container-images/ramalama/latest/Containerfile
+              container-images/cpuonly/Containerfile
             platforms: linux/amd64, linux/arm64
 
         - name: push images to registry
diff --git a/container-images/ramalama/latest/Containerfile b/container-images/cpuonly/Containerfile
similarity index 100%
rename from container-images/ramalama/latest/Containerfile
rename to container-images/cpuonly/Containerfile
diff --git a/container-images/ramalama/latest-cuda/Containerfile b/container-images/cuda/Containerfile
similarity index 100%
rename from container-images/ramalama/latest-cuda/Containerfile
rename to container-images/cuda/Containerfile
diff --git a/container_build.sh b/container_build.sh
index 5a2fbcc0..5979ac03 100755
--- a/container_build.sh
+++ b/container_build.sh
@@ -53,7 +53,7 @@ main() {
     platform="linux/arm64"
   fi
 
-  for i in container-images/*/*; do
+  for i in container-images/*; do
     build "$i" "$@"
   done
 }