diff --git a/builds/incus.pkr.hcl b/builds/incus.pkr.hcl
index 84fc507..02c4646 100644
--- a/builds/incus.pkr.hcl
+++ b/builds/incus.pkr.hcl
@@ -50,11 +50,11 @@ build {
 
   post-processor "shell-local" {
     inline = [
-      "incus image alias delete local:${local.incus_base_name}/latest || true",
-      "incus image alias delete local:${local.incus_base_name}/${var.date} || true",
-      "incus image info local:${local.incus_output_image} | grep Fingerprint | awk '{print $2}'",
-      "incus image alias create local:${local.incus_base_name}/latest $(incus image info local:${local.incus_output_image} | grep Fingerprint | awk '{print $2}')",
-      "incus image alias create local:${local.incus_base_name}/${var.date} $(incus image info local:${local.incus_output_image} | grep Fingerprint | awk '{print $2}')"
+      "incus image alias delete $(incus remote get-default):${local.incus_base_name}/latest || true",
+      "incus image alias delete $(incus remote get-default):${local.incus_base_name}/${var.date} || true",
+      "incus image info $(incus remote get-default):${local.incus_output_image} | grep Fingerprint | awk '{print $2}'",
+      "incus image alias create $(incus remote get-default):${local.incus_base_name}/latest $(incus image info $(incus remote get-default):${local.incus_output_image} | grep Fingerprint | awk '{print $2}')",
+      "incus image alias create $(incus remote get-default):${local.incus_base_name}/${var.date} $(incus image info $(incus remote get-default):${local.incus_output_image} | grep Fingerprint | awk '{print $2}')"
     ]
   }
 }
diff --git a/ci/build.sh b/ci/build.sh
index c6523a2..1b5e6f4 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -12,7 +12,7 @@ fi
 # Run `make all` if there are changes in builds/
 if [ -n "$builds_changes" ]; then
   echo "Changes detected in builds/. Running 'make all'..."
-  make all
+  make all && exit 0 || exit 1
 fi
 
 # Run specific `make` commands for each changed file in images/
diff --git a/images/almalinux/8.10/base/variables.auto.pkrvars.hcl b/images/almalinux/8.10/base/variables.auto.pkrvars.hcl
index 0ed1359..f3dedea 100644
--- a/images/almalinux/8.10/base/variables.auto.pkrvars.hcl
+++ b/images/almalinux/8.10/base/variables.auto.pkrvars.hcl
@@ -1,7 +1,6 @@
 # almalinux/8.10/base
 deploy_files_from_image = true
 deploy_files_from_common = true
-use_incus = false
 packages = [
   "git",
   "jq",
@@ -10,6 +9,7 @@ packages = [
   "python3.11-pip",
   "python3.12",
   "python3.12-pip",
+  "unkin-ca-certificates",
   "uv",
   "wget",
 ]
diff --git a/images/almalinux/9.5/base/builds b/images/almalinux/9.5/base/builds
index bdb9670..4ff1840 100644
--- a/images/almalinux/9.5/base/builds
+++ b/images/almalinux/9.5/base/builds
@@ -1 +1,2 @@
 docker
+incus
diff --git a/images/almalinux/9.5/base/variables.auto.pkrvars.hcl b/images/almalinux/9.5/base/variables.auto.pkrvars.hcl
index 7178c73..927bb26 100644
--- a/images/almalinux/9.5/base/variables.auto.pkrvars.hcl
+++ b/images/almalinux/9.5/base/variables.auto.pkrvars.hcl
@@ -1,7 +1,7 @@
 # almalinux/9.5/base
 deploy_files_from_image = true
 deploy_files_from_common = true
-use_incus = false
+use_incus = true
 packages = [
   "git",
   "jq",
@@ -10,6 +10,7 @@ packages = [
   "python3.11-pip",
   "python3.12",
   "python3.12-pip",
+  "unkin-ca-certificates",
   "uv",
   "wget",
 ]
diff --git a/images/almalinux/9.5/puppet-base/builds b/images/almalinux/9.5/puppet-base/builds
new file mode 100644
index 0000000..3fdcd30
--- /dev/null
+++ b/images/almalinux/9.5/puppet-base/builds
@@ -0,0 +1 @@
+incus
diff --git a/images/almalinux/9.5/puppet-base/files/etc/yum.repos.d/puppet.repo b/images/almalinux/9.5/puppet-base/files/etc/yum.repos.d/puppet.repo
new file mode 100644
index 0000000..ebeb5be
--- /dev/null
+++ b/images/almalinux/9.5/puppet-base/files/etc/yum.repos.d/puppet.repo
@@ -0,0 +1,4 @@
+[puppet]
+name=puppet repository
+baseurl=https://packagerepo.service.consul/puppet7/el/9-daily/x86_64/os/
+gpgkey=https://packagerepo.service.consul/puppet7/el/9-daily/x86_64/os/RPM-GPG-KEY-puppet-20250406
diff --git a/images/almalinux/9.5/puppet-base/variables.auto.pkrvars.hcl b/images/almalinux/9.5/puppet-base/variables.auto.pkrvars.hcl
new file mode 100644
index 0000000..8265a10
--- /dev/null
+++ b/images/almalinux/9.5/puppet-base/variables.auto.pkrvars.hcl
@@ -0,0 +1,16 @@
+# almalinux/9.5/puppet-base
+incus_source = "almalinux9/base/latest"
+deploy_files_from_image = true
+use_incus = true
+packages = [
+  "puppet-agent",
+  "puppet-initial"
+]
+scripts_pre_packages = [
+  "dnf makecache",
+  "dnf update -y",
+]
+scripts_final = [
+  "dnf clean all",
+  "rm -rf /var/cache/dnf"
+]
diff --git a/library/sources.pkr.hcl b/library/sources.pkr.hcl
index b4cbb48..df5bea6 100644
--- a/library/sources.pkr.hcl
+++ b/library/sources.pkr.hcl
@@ -7,5 +7,5 @@ source "docker" "os" {
 source "incus" "os" {
   image = var.incus_source
   output_image = local.incus_output_image
-  publish_remote_name = "local"
+  profile = "build"
 }
diff --git a/library/variables.pkr.hcl b/library/variables.pkr.hcl
index 2839fad..2a08131 100644
--- a/library/variables.pkr.hcl
+++ b/library/variables.pkr.hcl
@@ -121,7 +121,6 @@ variable "git_branch" {
   type = string
   default = env("GIT_BRANCH")
 }
-
 variable "include_incus_client_certs" {
   type    = bool
   default = false