diff --git a/daisy_workflows/image_build/accelerator_images/build_ubuntu_2204_accelerated.sh b/daisy_workflows/image_build/accelerator_images/build_ubuntu_2204_accelerated.sh
index bd664ae4f..b5212c08e 100755
--- a/daisy_workflows/image_build/accelerator_images/build_ubuntu_2204_accelerated.sh
+++ b/daisy_workflows/image_build/accelerator_images/build_ubuntu_2204_accelerated.sh
@@ -4,9 +4,9 @@ export DEBIAN_FRONTEND=noninteractive
 apt update -y || echo "BuildFailure"
 apt upgrade -y || echo "BuildFailure"
 # DKMS - not suitable for prod
-apt -y install nvidia-utils-550-server linux-modules-nvidia-550-server-gcp rdma-core || echo "BuildFailure"
+apt -y install nvidia-utils-550 linux-modules-nvidia-550-open-gcp rdma-core || echo "BuildFailure"
 # This is only for mlx5_ib - once that's in the main package stop including it
-apt -y install linux-modules-extra-$(uname -r) || echo "BuildFailure"
+apt -y install linux-modules-extra-gcp || echo "BuildFailure"
 tee /usr/bin/add-nvidia-repositories << EOF
 #!/bin/bash
 set -e
diff --git a/daisy_workflows/image_build/accelerator_images/build_ubuntu_2404_accelerated.sh b/daisy_workflows/image_build/accelerator_images/build_ubuntu_2404_accelerated.sh
index 8902ed208..e0758dfa1 100755
--- a/daisy_workflows/image_build/accelerator_images/build_ubuntu_2404_accelerated.sh
+++ b/daisy_workflows/image_build/accelerator_images/build_ubuntu_2404_accelerated.sh
@@ -4,9 +4,9 @@ export DEBIAN_FRONTEND=noninteractive
 apt update -y || echo "BuildFailure"
 apt upgrade -y || echo "BuildFailure"
 # DKMS - not suitable for prod
-apt -y install nvidia-utils-550-server linux-modules-nvidia-550-server-gcp rdma-core || echo "BuildFailure"
+apt -y install nvidia-utils-550 linux-modules-nvidia-550-open-gcp rdma-core || echo "BuildFailure"
 # This is only for mlx5_ib - once that's in the main package stop including it
-apt -y install linux-modules-extra-$(uname -r) || echo "BuildFailure"
+apt -y install linux-modules-extra-cp || echo "BuildFailure"
 tee /usr/bin/add-nvidia-repositories << EOF
 #!/bin/bash
 set -e