diff --git a/changelogs/unreleased/share-ami-aws-marketplace-account.yml b/changelogs/unreleased/share-ami-aws-marketplace-account.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f31cc8c9b0cdbf1931c666ed222b0db991fa013b_Y2hhbmdlbG9ncy91bnJlbGVhc2VkL3NoYXJlLWFtaS1hd3MtbWFya2V0cGxhY2UtYWNjb3VudC55bWw=
--- /dev/null
+++ b/changelogs/unreleased/share-ami-aws-marketplace-account.yml
@@ -0,0 +1,5 @@
+---
+title: Share AWS AMIs with the Marketplace account
+merge_request: 3190
+author:
+type: other
diff --git a/support/packer/ce.json b/support/packer/ce.json
index 7974cb61ea3eacdbd9cb683f98cc6dc784008025_c3VwcG9ydC9wYWNrZXIvY2UuanNvbg==..f31cc8c9b0cdbf1931c666ed222b0db991fa013b_c3VwcG9ydC9wYWNrZXIvY2UuanNvbg== 100644
--- a/support/packer/ce.json
+++ b/support/packer/ce.json
@@ -16,6 +16,8 @@
     "ami_name": "GitLab CE {{user `version`}}",
     "ami_description": "Official GitLab CE {{user `version`}} AMI. https://about.gitlab.com/",
     "ami_groups": ["all"],
+    "ami_users": ["684062674729", "679593333241"],
+    "snapshot_users": ["684062674729", "679593333241"],
     "tags": {
         "Type": "GitLab Community Edition",
         "Version": "{{user `version`}}"
diff --git a/support/packer/ee.json b/support/packer/ee.json
index 7974cb61ea3eacdbd9cb683f98cc6dc784008025_c3VwcG9ydC9wYWNrZXIvZWUuanNvbg==..f31cc8c9b0cdbf1931c666ed222b0db991fa013b_c3VwcG9ydC9wYWNrZXIvZWUuanNvbg== 100644
--- a/support/packer/ee.json
+++ b/support/packer/ee.json
@@ -14,6 +14,8 @@
     "instance_type": "m3.medium",
     "ssh_username": "ubuntu",
     "ami_name": "GitLab EE {{user `version`}}",
+    "ami_users": ["684062674729", "679593333241"],
+    "snapshot_users": ["684062674729", "679593333241"],
     "ami_description": "Official GitLab EE {{user `version`}} AMI. https://about.gitlab.com/",
     "ami_groups": ["all"],
     "tags": {