diff --git a/deploy-scripts/lib/adapter.sh b/deploy-scripts/lib/adapter.sh
index f152f60..bb4dfa4 100755
--- a/deploy-scripts/lib/adapter.sh
+++ b/deploy-scripts/lib/adapter.sh
@@ -179,12 +179,12 @@ install_adapter_instance() {
     --set "image.registry=${IMAGE_REGISTRY}"
     --set "image.repository=${ADAPTER_IMAGE_REPO}"
     --set "image.tag=${ADAPTER_IMAGE_TAG}"
-    --set "broker.googlepubsub.projectId=${GCP_PROJECT_ID}"
-    --set "broker.googlepubsub.createTopicIfMissing=${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}"
-    --set "broker.googlepubsub.createSubscriptionIfMissing=${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}"
-    --set "broker.googlepubsub.subscriptionId=${subscription_id}"
+    --set "broker.googlepubsub.project_id=${GCP_PROJECT_ID}"
+    --set "broker.googlepubsub.create_topic_if_missing=${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}"
+    --set "broker.googlepubsub.create_subscription_if_missing=${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}"
+    --set "broker.googlepubsub.subscription_id=${subscription_id}"
     --set "broker.googlepubsub.topic=${topic}"
-    --set "broker.googlepubsub.deadLetterTopic=${dead_letter_topic}"
+    --set "broker.googlepubsub.dead_letter_topic=${dead_letter_topic}"
   )
 
   log_info "Executing Helm command:"
diff --git a/testdata/adapter-configs/cl-deployment/values.yaml b/testdata/adapter-configs/cl-deployment/values.yaml
index c2fc9d5..2c4fcda 100644
--- a/testdata/adapter-configs/cl-deployment/values.yaml
+++ b/testdata/adapter-configs/cl-deployment/values.yaml
@@ -14,10 +14,10 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: CHANGE_ME
-    subscriptionId: CHANGE_ME
+    project_id: CHANGE_ME
+    subscription_id: CHANGE_ME
     topic: CHANGE_ME
-    deadLetterTopic: CHANGE_ME
+    dead_letter_topic: CHANGE_ME
 
 image:
   registry: CHANGE_ME
diff --git a/testdata/adapter-configs/cl-invalid-resource/values.yaml b/testdata/adapter-configs/cl-invalid-resource/values.yaml
index 849b340..dd757d8 100644
--- a/testdata/adapter-configs/cl-invalid-resource/values.yaml
+++ b/testdata/adapter-configs/cl-invalid-resource/values.yaml
@@ -13,18 +13,18 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: ${GCP_PROJECT_ID}
-    subscriptionId: ${NAMESPACE}-clusters-${ADAPTER_NAME}
+    project_id: ${GCP_PROJECT_ID}
+    subscription_id: ${NAMESPACE}-clusters-${ADAPTER_NAME}
     topic: ${NAMESPACE}-clusters
-    deadLetterTopic: ${NAMESPACE}-clusters-dlq
-    createTopicIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}
-    createSubscriptionIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}
+    dead_letter_topic: ${NAMESPACE}-clusters-dlq
+    create_topic_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}
+    create_subscription_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}
 
 image:
   registry: ${IMAGE_REGISTRY}
-  repository: ci/hyperfleet-adapter
+  repository: ${ADAPTER_IMAGE_REPO}
   pullPolicy: Always
-  tag: latest
+  tag: ${ADAPTER_IMAGE_TAG}
 
 rbac:
    resources:
diff --git a/testdata/adapter-configs/cl-job/values.yaml b/testdata/adapter-configs/cl-job/values.yaml
index 106cdbc..2fafdaa 100644
--- a/testdata/adapter-configs/cl-job/values.yaml
+++ b/testdata/adapter-configs/cl-job/values.yaml
@@ -17,10 +17,10 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: CHANGE_ME
-    subscriptionId: CHANGE_ME
+    project_id: CHANGE_ME
+    subscription_id: CHANGE_ME
     topic: CHANGE_ME
-    deadLetterTopic: CHANGE_ME
+    dead_letter_topic: CHANGE_ME
 
 image:
   registry: CHANGE_ME
diff --git a/testdata/adapter-configs/cl-maestro/values.yaml b/testdata/adapter-configs/cl-maestro/values.yaml
index a1f39d9..d5796d5 100644
--- a/testdata/adapter-configs/cl-maestro/values.yaml
+++ b/testdata/adapter-configs/cl-maestro/values.yaml
@@ -13,16 +13,16 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: CHANGE_ME
-    subscriptionId: CHANGE_ME
+    project_id: CHANGE_ME
+    subscription_id: CHANGE_ME
     topic: CHANGE_ME
-    deadLetterTopic: CHANGE_ME
+    dead_letter_topic: CHANGE_ME
 
 image:
-  registry: CHANGE_ME
-  repository: ci/hyperfleet-adapter
+  registry: ${IMAGE_REGISTRY}
+  repository: ${ADAPTER_IMAGE_REPO}
   pullPolicy: Always
-  tag: latest
+  tag: ${ADAPTER_IMAGE_TAG}
 
 rbac:
    resources:
diff --git a/testdata/adapter-configs/cl-namespace/values.yaml b/testdata/adapter-configs/cl-namespace/values.yaml
index 97efc14..5185ed8 100644
--- a/testdata/adapter-configs/cl-namespace/values.yaml
+++ b/testdata/adapter-configs/cl-namespace/values.yaml
@@ -13,10 +13,10 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: CHANGE_ME
-    subscriptionId: CHANGE_ME
+    project_id: CHANGE_ME
+    subscription_id: CHANGE_ME
     topic: CHANGE_ME
-    deadLetterTopic: CHANGE_ME
+    dead_letter_topic: CHANGE_ME
 
 image:
   registry: CHANGE_ME
diff --git a/testdata/adapter-configs/cl-precondition-error/values.yaml b/testdata/adapter-configs/cl-precondition-error/values.yaml
index 82996a7..cc270af 100644
--- a/testdata/adapter-configs/cl-precondition-error/values.yaml
+++ b/testdata/adapter-configs/cl-precondition-error/values.yaml
@@ -13,18 +13,18 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: ${GCP_PROJECT_ID}
-    subscriptionId: ${NAMESPACE}-clusters-${ADAPTER_NAME}
+    project_id: ${GCP_PROJECT_ID}
+    subscription_id: ${NAMESPACE}-clusters-${ADAPTER_NAME}
     topic: ${NAMESPACE}-clusters
-    deadLetterTopic: ${NAMESPACE}-clusters-dlq
-    createTopicIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}
-    createSubscriptionIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}
+    dead_letter_topic: ${NAMESPACE}-clusters-dlq
+    create_topic_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}
+    create_subscription_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}
 
 image:
   registry: ${IMAGE_REGISTRY}
-  repository: ci/hyperfleet-adapter
+  repository: ${ADAPTER_IMAGE_REPO}
   pullPolicy: Always
-  tag: latest
+  tag: ${ADAPTER_IMAGE_TAG}
 
 rbac:
    resources:
diff --git a/testdata/adapter-configs/np-configmap/values.yaml b/testdata/adapter-configs/np-configmap/values.yaml
index 877fbed..d5ab162 100644
--- a/testdata/adapter-configs/np-configmap/values.yaml
+++ b/testdata/adapter-configs/np-configmap/values.yaml
@@ -14,10 +14,10 @@ adapterTaskConfig:
 broker:
   create: true
   googlepubsub:
-    projectId: CHANGE_ME
-    subscriptionId: CHANGE_ME
+    project_id: CHANGE_ME
+    subscription_id: CHANGE_ME
     topic: CHANGE_ME
-    deadLetterTopic: CHANGE_ME
+    dead_letter_topic: CHANGE_ME
 
 image:
   registry: CHANGE_ME