diff --git a/images/cilium/tests/cilium-install.sh b/images/cilium/tests/cilium-install.sh
index eb18968975..e6245f37f6 100755
--- a/images/cilium/tests/cilium-install.sh
+++ b/images/cilium/tests/cilium-install.sh
@@ -2,7 +2,11 @@
 
 set -o errexit -o errtrace -o pipefail -x -v
 
-apk add cilium-cli
+# Newer versions of the CLI requires some version symbols
+# that our binary is missing. Temporarily use the 0.16.14
+# version of the CLI to avoid this issue.
+apk add cilium-cli~0.16.14
+
 cilium status --wait --wait-duration 2m
 
 QUAY_IMAGES=$(cilium status -o json | grep quay.io || true)
diff --git a/images/cluster-proportional-autoscaler/tests/main.tf b/images/cluster-proportional-autoscaler/tests/main.tf
index 3b23926e48..effa0f3517 100644
--- a/images/cluster-proportional-autoscaler/tests/main.tf
+++ b/images/cluster-proportional-autoscaler/tests/main.tf
@@ -27,12 +27,15 @@ module "cluster_harness" {
 module "helm" {
   source = "../../../tflib/imagetest/helm"
 
+  name  = "cpa"
   repo  = "https://kubernetes-sigs.github.io/cluster-proportional-autoscaler"
   chart = "cluster-proportional-autoscaler"
+  wait  = true
 
   values = {
     options = {
-      target = "deployment/"
+      target   = "deployment/nginx-autoscale-example"
+      logLevel = 2
     }
 
     config = {
@@ -40,7 +43,7 @@ module "helm" {
         coresPerReplica           = 2
         nodesPerReplica           = 1
         min                       = 1
-        max                       = 100
+        max                       = 3
         preventSinglePointFailure = true
         includeUnschedulableNodes = true
       }
@@ -59,13 +62,80 @@ resource "imagetest_feature" "basic" {
   harness     = module.cluster_harness.harness
 
   steps = [
+    {
+      name = "Deploy nginx-autoscale-example"
+      cmd  = <<EOF
+        kubectl create deployment nginx-autoscale-example --image=cgr.dev/chainguard/nginx --replicas=1
+        kubectl wait --for=condition=available deployment/nginx-autoscale-example
+      EOF
+    },
     {
       name = "Helm Install"
       cmd  = module.helm.install_cmd
-    }
+    },
+    {
+      name  = "Check the replica count"
+      cmd   = <<EOF
+        REPLICAS=$(kubectl get deployment nginx-autoscale-example -o jsonpath='{.spec.replicas}')
+        if [ "$REPLICAS" -eq 3 ]; then
+          echo "Replica count is 3!"
+        else
+          echo "Expected replica count is not 3. Actual: $REPLICAS"
+          exit 1
+        fi
+      EOF
+      retry = { attempts = 3, delay = "5s", factor = 3 }
+    },
+    {
+      name = "Check expected logs"
+      cmd  = <<EOF
+        logs_to_expect="
+        Scaling Namespace: default, Target: deployment/nginx-autoscale-example
+        updating replicas from 1 to 3
+        "
+
+        logs=$(kubectl logs deployment/cpa-cluster-proportional-autoscaler)
+
+        echo "$logs_to_expect" | while IFS= read -r log; do
+          log=$(echo "$log" | xargs)
+          if [ -z "$log" ]; then
+            continue
+          fi
+          if ! echo "$logs" | grep -F -i "$log" > /dev/null; then
+            echo "Current logs: $logs"
+            echo "Expected log not found: $log"
+            exit 1
+          fi
+        done
+      EOF
+    },
+    {
+      name = "Check unexpected logs"
+      cmd  = <<EOF
+        logs_to_not_expect="
+        Update failure
+        connection refused
+        unable to load
+        "
+
+        logs=$(kubectl logs deployment/cpa-cluster-proportional-autoscaler)
+
+        echo "$logs_to_not_expect" | while IFS= read -r log; do
+          log=$(echo "$log" | xargs)
+          if [ -z "$log" ]; then
+            continue
+          fi
+          if echo "$logs" | grep -F -i "$log"; then
+            echo "Current logs: $logs"
+            echo "Unexpected log found: $log"
+            exit 1
+          fi
+        done
+      EOF
+    },
   ]
 
   labels = {
     type = "k8s"
   }
-}
\ No newline at end of file
+}
diff --git a/images/gitlab-pages/config/main.tf b/images/gitlab-pages/config/main.tf
index 272d3b480b..1a37c07e6c 100644
--- a/images/gitlab-pages/config/main.tf
+++ b/images/gitlab-pages/config/main.tf
@@ -26,6 +26,7 @@ output "config" {
     entrypoint = {
       command = "/scripts/entrypoint.sh"
     }
+    cmd = "/scripts/start-pages"
     paths = [{
       path        = "/etc/gitlab-pages"
       type        = "directory"
diff --git a/images/management-api-for-apache-cassandra/tests/main.tf b/images/management-api-for-apache-cassandra/tests/main.tf
index 2ddb74c5ea..43ce58a28b 100644
--- a/images/management-api-for-apache-cassandra/tests/main.tf
+++ b/images/management-api-for-apache-cassandra/tests/main.tf
@@ -65,7 +65,7 @@ module "helm_cert_manager" {
         tag        = "latest"
       }
     }
-    installCRDs = "true"
+    installCRDs = true
   }
 }
 
diff --git a/images/mariadb/tests/02-runs.sh b/images/mariadb/tests/02-runs.sh
index ab94a14d44..8db90ef828 100755
--- a/images/mariadb/tests/02-runs.sh
+++ b/images/mariadb/tests/02-runs.sh
@@ -4,10 +4,10 @@ set -o errexit -o nounset -o errtrace -o pipefail -x
 
 # Start up the mariadb container in the background
 name=mariadb-${RANDOM}
-docker run -d --name $name -e MYSQL_ROOT_PASSWORD=secret "${IMAGE_NAME}"
+docker run -d --name $name -e MARIADB_ROOT_PASSWORD=secret "${IMAGE_NAME}"
 sleep 5
 
 # Exec into the container and run the mysql command
-docker exec $name mysql -u root -psecret -e "SHOW status;" | grep Uptime
+docker exec $name mariadb -uroot -psecret -e "SHOW status;" | grep Uptime
 
 docker kill $name
diff --git a/images/php-fpm_exporter/tests/main.tf b/images/php-fpm_exporter/tests/main.tf
index 7ecd03589e..9dace1613b 100644
--- a/images/php-fpm_exporter/tests/main.tf
+++ b/images/php-fpm_exporter/tests/main.tf
@@ -85,7 +85,6 @@ spec:
       args: ["--phpfpm.scrape-uri=http://127.0.0.1:9000/status"]
       ports:
         - containerPort: 9103
-
     - name: prometheus
       image: cgr.dev/chainguard/prometheus:latest
       args: ["--config.file=/etc/prometheus/prometheus.yml"]
@@ -93,12 +92,17 @@ spec:
         - name: prometheus-config-volume
           mountPath: /etc/prometheus/prometheus.yml
           subPath: prometheus.yml
+        - name: data
+          mountPath: /data
       ports:
         - containerPort: 9090
   volumes:
     - name: prometheus-config-volume
       configMap:
         name: prometheus-config
+    - name: data
+      emptyDir:
+        sizeLimit: 200Mi
 ---
 apiVersion: batch/v1
 kind: Job