diff --git a/stacks/_templates/keycloak.yaml b/stacks/_templates/keycloak.yaml
index dca05cda..0ce30d4e 100644
--- a/stacks/_templates/keycloak.yaml
+++ b/stacks/_templates/keycloak.yaml
@@ -59,7 +59,7 @@ spec:
               while :
               do
                 echo "Determining Keycloak public reachable address"
-                KEYCLOAK_ADDRESS=$(kubectl get svc keycloak -o json | jq -r --argfile endpoints <(kubectl get endpoints keycloak -o json) --argfile nodes <(kubectl get nodes -o json) '($nodes.items[] | select(.metadata.name == $endpoints.subsets[].addresses[].nodeName) | .status.addresses | map(select(.type == "ExternalIP" or .type == "InternalIP")) | min_by(.type) | .address | tostring) + ":" + (.spec.ports[] | select(.name == "https") | .nodePort | tostring)')
+                KEYCLOAK_ADDRESS=$(kubectl get svc keycloak -o json | jq -r --slurpfile endpoints <(kubectl get endpoints keycloak -o json) --slurpfile nodes <(kubectl get nodes -o json) '($nodes[0].items[] | select(.metadata.name == $endpoints[0].subsets[].addresses[].nodeName) | .status.addresses | map(select(.type == "ExternalIP" or .type == "InternalIP")) | min_by(.type) | .address | tostring) + ":" + (.spec.ports[] | select(.name == "https") | .nodePort | tostring)')
                 echo "Found Keycloak running at $KEYCLOAK_ADDRESS"
 
                 if [ ! -z "$KEYCLOAK_ADDRESS" ]; then
diff --git a/stacks/airflow/hive-metastores.yaml b/stacks/airflow/hive-metastores.yaml
index a908c0c1..4a67bd13 100644
--- a/stacks/airflow/hive-metastores.yaml
+++ b/stacks/airflow/hive-metastores.yaml
@@ -5,7 +5,7 @@ metadata:
   name: hive-iceberg
 spec:
   image:
-    productVersion: 4.1.0
+    productVersion: 4.2.0
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive
diff --git a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml
index 2c485fa1..79172219 100644
--- a/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml
+++ b/stacks/data-lakehouse-iceberg-trino-spark/hive-metastores.yaml
@@ -24,6 +24,8 @@ metadata:
   name: hive-iceberg
 spec:
   image:
+    # Cannot upgrade to 4.0.1 because we run into the same problem
+    # as this https://github.com/apache/iceberg-python/issues/1222
     productVersion: 4.0.0
   clusterConfig:
     database:
diff --git a/stacks/end-to-end-security/hive-metastore.yaml b/stacks/end-to-end-security/hive-metastore.yaml
index a15b9962..7539cb1c 100644
--- a/stacks/end-to-end-security/hive-metastore.yaml
+++ b/stacks/end-to-end-security/hive-metastore.yaml
@@ -5,6 +5,8 @@ metadata:
   name: hive-iceberg
 spec:
   image:
+     # Cannot upgrade to 4.0.1 because we run into the same problem
+     # as this https://github.com/apache/iceberg-python/issues/1222
     productVersion: 4.0.0
   clusterConfig:
     authorization:
diff --git a/stacks/trino-iceberg/hive-metastores.yaml b/stacks/trino-iceberg/hive-metastores.yaml
index a908c0c1..4a67bd13 100644
--- a/stacks/trino-iceberg/hive-metastores.yaml
+++ b/stacks/trino-iceberg/hive-metastores.yaml
@@ -5,7 +5,7 @@ metadata:
   name: hive-iceberg
 spec:
   image:
-    productVersion: 4.1.0
+    productVersion: 4.2.0
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql-hive-iceberg:5432/hive
diff --git a/stacks/trino-superset-s3/hive-metastore.yaml b/stacks/trino-superset-s3/hive-metastore.yaml
index 3710eaa2..20ebd79d 100644
--- a/stacks/trino-superset-s3/hive-metastore.yaml
+++ b/stacks/trino-superset-s3/hive-metastore.yaml
@@ -5,7 +5,7 @@ metadata:
   name: hive
 spec:
   image:
-    productVersion: 4.1.0
+    productVersion: 4.2.0
   clusterConfig:
     database:
       connString: jdbc:postgresql://postgresql-hive:5432/hive