diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/saml.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/saml.yaml
index 1aa43de..45ee799 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/saml.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk11-sh-saml/saml.yaml
@@ -1,3 +1,4 @@
+---
 aem:
   enable_saml: true
   # Parameters for managing AEM Authorizable Keystore
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-consolidated-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk11/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-amazon-linux2-aem65-jdk8/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11-sh/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk11/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-nb/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8-sh/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/full-set-preview.yaml b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/full-set-preview.yaml
+++ b/aem-aws-stack-builder/aem-full-set-preview-rhel7-aem65-jdk8/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8-nb/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/aem-full-set-rhel7-aem65-jdk8/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/src/apps/aem/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml b/aem-aws-stack-builder/src/apps/aem/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
index 1925f12..0c0cfae 100644
--- a/aem-aws-stack-builder/src/apps/aem/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
+++ b/aem-aws-stack-builder/src/apps/aem/aem65_sp13-rhel7-jdk8-stack-builder-ami-ids.yaml
@@ -2,12 +2,12 @@
 # Generated by Packer AEM
 # AMI IDs for AEM profile aem65_sp3 on OS type rhel7 with Java version jdk8
 ami_ids:
-  author: ami-0e7eaa99a80ff975f
-  author_dispatcher: ami-05836a044f68d933b
+  author: ami-00d71b1c1f1dfe898
+  author_dispatcher: ami-0ee62b7eef1457ae1
   author_publish_dispatcher: ami-036a3ca8420b552fb
-  chaos_monkey: ami-01b25ff35f82e8dbb
-  orchestrator: ami-01b25ff35f82e8dbb
-  publish: ami-0cb9fef33584bf34f
-  publish_dispatcher: ami-05836a044f68d933b
-  preview_publish: ami-0cb9fef33584bf34f
-  preview_publish_dispatcher: ami-05836a044f68d933b
+  chaos_monkey: ami-0e6aa47f8feb742fd
+  orchestrator: ami-0e6aa47f8feb742fd
+  publish: ami-0630f7afc18e23160
+  publish_dispatcher: ami-0ee62b7eef1457ae1
+  preview_publish: ami-0630f7afc18e23160
+  preview_publish_dispatcher: ami-0ee62b7eef1457ae1
\ No newline at end of file
diff --git a/aem-aws-stack-builder/src/apps/aem/full-set-preview.yaml b/aem-aws-stack-builder/src/apps/aem/full-set-preview.yaml
index 05e42ec..31a56f5 100644
--- a/aem-aws-stack-builder/src/apps/aem/full-set-preview.yaml
+++ b/aem-aws-stack-builder/src/apps/aem/full-set-preview.yaml
@@ -21,9 +21,6 @@ security_groups:
       # Forward proxy access security group (from instances outbound to forward proxy)
       # Jumphost access security group (from jumphost inbound to instances)
       - sg-02e02c0ecfe95b2f4
-dns_records:
-  preview_publish_dispatcher:
-    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
 
 snapshots:
   preview_publish:
@@ -80,7 +77,9 @@ system_users:
       name: replicator
       path: /home/users/r
 
+
 dns_records:
   preview_publish_dispatcher:
-    record_set_name: preview-publish-dispatcher
+    record_set_name: "{{ stack_prefix }}-preview-publish-dispatcher"
+#    record_set_name: preview-publish-dispatcher
     ttl: 300