diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml
index 23e74db736..883c52a476 100644
--- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml
+++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/cluster.yaml
@@ -53,7 +53,7 @@ spec:
 apiVersion: kops.k8s.io/v1alpha2
 kind: InstanceGroup
 metadata:
-  name: master-us-test-1a
+  name: apiserver-us-test-1a
   labels:
     kops.k8s.io/cluster: minimal.example.com
 spec:
@@ -62,6 +62,6 @@ spec:
   machineType: m3.medium
   maxSize: 1
   minSize: 1
-  role: Master
+  role: APIServer
   subnets:
   - us-test-1a
diff --git a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml
index 917e69ef52..d368426378 100644
--- a/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml
+++ b/nodeup/pkg/model/tests/golden/dedicated-apiserver/tasks-kube-apiserver.yaml
@@ -26,8 +26,8 @@ contents: |
       - --etcd-cafile=/etc/kubernetes/pki/kube-apiserver/etcd-ca.crt
       - --etcd-certfile=/etc/kubernetes/pki/kube-apiserver/etcd-client.crt
       - --etcd-keyfile=/etc/kubernetes/pki/kube-apiserver/etcd-client.key
-      - --etcd-servers-overrides=/events#https://127.0.0.1:4002
-      - --etcd-servers=https://127.0.0.1:4001
+      - --etcd-servers-overrides=/events#https://events.etcd.minimal.example.com:4002
+      - --etcd-servers=https://main.etcd.minimal.example.com:4001
       - --insecure-port=0
       - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt
       - --kubelet-client-key=/srv/kubernetes/kubelet-api.key
diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml
index 23e74db736..f2f2d84e98 100644
--- a/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml
+++ b/nodeup/pkg/model/tests/golden/without-etcd-events/cluster.yaml
@@ -18,15 +18,6 @@ spec:
     provider: Manager
     backups:
       backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-main
-  - cpuRequest: 100m
-    etcdMembers:
-    - instanceGroup: master-us-test-1a
-      name: us-test-1a
-    memoryRequest: 100Mi
-    name: events
-    provider: Manager
-    backups:
-      backupStore: memfs://clusters.example.com/minimal.example.com/backups/etcd-events
   iam: {}
   kubelet:
     anonymousAuth: false
diff --git a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml
index 917e69ef52..4c43f9a280 100644
--- a/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml
+++ b/nodeup/pkg/model/tests/golden/without-etcd-events/tasks-kube-apiserver.yaml
@@ -26,7 +26,6 @@ contents: |
       - --etcd-cafile=/etc/kubernetes/pki/kube-apiserver/etcd-ca.crt
       - --etcd-certfile=/etc/kubernetes/pki/kube-apiserver/etcd-client.crt
       - --etcd-keyfile=/etc/kubernetes/pki/kube-apiserver/etcd-client.key
-      - --etcd-servers-overrides=/events#https://127.0.0.1:4002
       - --etcd-servers=https://127.0.0.1:4001
       - --insecure-port=0
       - --kubelet-client-certificate=/srv/kubernetes/kubelet-api.crt