diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-basic-manifest.yml b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-basic-manifest.yml
index 4c213932b0e..42095000dd3 100644
--- a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-basic-manifest.yml
+++ b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-basic-manifest.yml
@@ -1070,7 +1070,7 @@ Outputs:
       Name: !Sub ${AWS::StackName}-InternalLoadBalancerCanonicalHostedZoneID
   InternalWorkloadsHostedZone:
     Condition: CreateInternalALB
-    Value: !GetAtt InternalWorkloadsHostedZone.Id
+    Value: !Ref InternalWorkloadsHostedZone
     Export:
       Name: !Sub ${AWS::StackName}-InternalWorkloadsHostedZoneID
   InternalWorkloadsHostedZoneName:
diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-empty-security-group.yml b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-empty-security-group.yml
index 4c7fc5e7a93..669b4efd734 100644
--- a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-empty-security-group.yml
+++ b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-empty-security-group.yml
@@ -958,7 +958,7 @@ Outputs:
       Name: !Sub ${AWS::StackName}-InternalLoadBalancerCanonicalHostedZoneID
   InternalWorkloadsHostedZone:
     Condition: CreateInternalALB
-    Value: !GetAtt InternalWorkloadsHostedZone.Id
+    Value: !Ref InternalWorkloadsHostedZone
     Export:
       Name: !Sub ${AWS::StackName}-InternalWorkloadsHostedZoneID
   InternalWorkloadsHostedZoneName:
diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-security-group.yml b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-security-group.yml
index 21c1636e083..0673cbe29d9 100644
--- a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-security-group.yml
+++ b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-custom-security-group.yml
@@ -983,7 +983,7 @@ Outputs:
       Name: !Sub ${AWS::StackName}-InternalLoadBalancerCanonicalHostedZoneID
   InternalWorkloadsHostedZone:
     Condition: CreateInternalALB
-    Value: !GetAtt InternalWorkloadsHostedZone.Id
+    Value: !Ref InternalWorkloadsHostedZone
     Export:
       Name: !Sub ${AWS::StackName}-InternalWorkloadsHostedZoneID
   InternalWorkloadsHostedZoneName:
diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-default-access-log-config.yml b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-default-access-log-config.yml
index ea9083a87b6..3a051429693 100644
--- a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-default-access-log-config.yml
+++ b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-default-access-log-config.yml
@@ -1166,7 +1166,7 @@ Outputs:
       Name: !Sub ${AWS::StackName}-InternalLoadBalancerCanonicalHostedZoneID
   InternalWorkloadsHostedZone:
     Condition: CreateInternalALB
-    Value: !GetAtt InternalWorkloadsHostedZone.Id
+    Value: !Ref InternalWorkloadsHostedZone
     Export:
       Name: !Sub ${AWS::StackName}-InternalWorkloadsHostedZoneID
   InternalWorkloadsHostedZoneName:
diff --git a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-imported-certs-observability.yml b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-imported-certs-observability.yml
index 519a0b60d54..665ea595512 100644
--- a/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-imported-certs-observability.yml
+++ b/internal/pkg/deploy/cloudformation/stack/testdata/environments/template-with-imported-certs-observability.yml
@@ -1064,7 +1064,7 @@ Outputs:
       Name: !Sub ${AWS::StackName}-InternalLoadBalancerCanonicalHostedZoneID
   InternalWorkloadsHostedZone:
     Condition: CreateInternalALB
-    Value: !GetAtt InternalWorkloadsHostedZone.Id
+    Value: !Ref InternalWorkloadsHostedZone
     Export:
       Name: !Sub ${AWS::StackName}-InternalWorkloadsHostedZoneID
   InternalWorkloadsHostedZoneName:
diff --git a/internal/pkg/template/templates/environment/cf.yml b/internal/pkg/template/templates/environment/cf.yml
index 9d5df052db2..c994a31804c 100644
--- a/internal/pkg/template/templates/environment/cf.yml
+++ b/internal/pkg/template/templates/environment/cf.yml
@@ -663,7 +663,7 @@ Outputs:
   {{- if not .PrivateHTTPConfig.ImportedCertARNs}}
   InternalWorkloadsHostedZone:
     Condition: CreateInternalALB
-    Value: !GetAtt InternalWorkloadsHostedZone.Id
+    Value: !Ref InternalWorkloadsHostedZone
     Export:
       Name: !Sub ${AWS::StackName}-InternalWorkloadsHostedZoneID
   InternalWorkloadsHostedZoneName: