diff --git a/Makefile b/Makefile
index 97eedef..5c1bbdc 100644
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,7 @@ $(DIRS):
 	@echo "Building for $@"
 
 	# Export environment
-	export VAULT_ADDR=https://vault.query.consul:8200
+	export VAULT_ADDR=https://vault.service.consul:8200
 	export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
 	eval $$(vault kv get -format=json kv/service/packer/builder/env | jq -r '.data.data | to_entries[] | "export \(.key)=\(.value)"')
 
@@ -91,7 +91,7 @@ $(DIRS):
 	export SUFFIX=$(SUFFIX) && \
 	export GIT_COMMIT=$(GIT_COMMIT) && \
 	export GIT_BRANCH=$(GIT_BRANCH) && \
-	export VAULT_ADDR=https://vault.query.consul:8200
+	export VAULT_ADDR=https://vault.service.consul:8200
 	export VAULT_TOKEN=$$(vault write -field=token auth/approle/login role_id=$$VAULT_ROLEID) && \
 	/usr/bin/packer init . && \
 	/usr/bin/packer build . )
diff --git a/images/almalinux/9.5/base/builds b/images/almalinux/9.5/base/builds
index 4ff1840..bdb9670 100644
--- a/images/almalinux/9.5/base/builds
+++ b/images/almalinux/9.5/base/builds
@@ -1,2 +1 @@
 docker
-incus
diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo
index c0afc18..e5ba825 100644
--- a/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo
+++ b/images/almalinux/9.5/base/files/etc/yum.repos.d/appstream.repo
@@ -1,6 +1,6 @@
 [appstream]
 name=appstream repository
-baseurl=https://edgecache.query.consul/almalinux/9.5/AppStream/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://packagerepo.service.consul/almalinux/9.5/appstream-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/almalinux/9.5/appstream-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo
index 2fb52aa..77e69d5 100644
--- a/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo
+++ b/images/almalinux/9.5/base/files/etc/yum.repos.d/baseos.repo
@@ -1,6 +1,6 @@
 [baseos]
 name=baseos repository
-baseurl=https://edgecache.query.consul/almalinux/9.5/BaseOS/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://packagerepo.service.consul/almalinux/9.5/baseos-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/almalinux/9.5/baseos-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
 enabled=1
 gpgcheck=1
diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo
index 1bb4812..5a3dff5 100644
--- a/images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo
+++ b/images/almalinux/9.5/base/files/etc/yum.repos.d/crb.repo
@@ -1,5 +1,7 @@
 # new repo for EL9+, replaces PowerTools repo
 [crb]
 name=crb repository
-baseurl=https://edgecache.query.consul/almalinux/9.5/CRB/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/almalinux/9.5/crb-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+enabled=1
+gpgcheck=1
diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo
index e6f1e97..9cfec1c 100644
--- a/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo
+++ b/images/almalinux/9.5/base/files/etc/yum.repos.d/extras.repo
@@ -1,4 +1,6 @@
 [extras]
 name=extras repository
-baseurl=https://edgecache.query.consul/almalinux/9.5/extras/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9
+baseurl=https://packagerepo.service.consul/almalinux/9.5/extras-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/almalinux/9.5/extras-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
+enabled=1
+gpgcheck=1
diff --git a/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo b/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo
index 294796b..b3d77ad 100644
--- a/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo
+++ b/images/almalinux/9.5/base/files/etc/yum.repos.d/highavailability.repo
@@ -1,4 +1,4 @@
-[highavailability]
-name=highavailability repository
-baseurl=https://edgecache.query.consul/almalinux/9.5/HighAvailability/x86_64/os
-gpgkey=https://edgecache.query.consul/almalinux/RPM-GPG-KEY-AlmaLinux-9
+[ha]
+name=ha repository
+baseurl=https://packagerepo.service.consul/almalinux/9.5/ha-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/almalinux/9.5/ha-daily/x86_64/os/RPM-GPG-KEY-AlmaLinux-9
diff --git a/images/almalinux/9.5/puppet-base/builds b/images/almalinux/9.5/puppet-base/builds
index 3fdcd30..8b13789 100644
--- a/images/almalinux/9.5/puppet-base/builds
+++ b/images/almalinux/9.5/puppet-base/builds
@@ -1 +1 @@
-incus
+