diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f31cc8c9b0cdbf1931c666ed222b0db991fa013b_LmdpdGxhYi1jaS55bWw=..b33d117a8f7fbc903b401a15756c260a7a62bfc5_LmdpdGxhYi1jaS55bWw= 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,6 +18,7 @@
   - metrics
   - slow_jobs
   - raspbian-release
+  - aws-marketplace-release
   - notification_fail
 
 variables:
diff --git a/gitlab-ci-config/dev-gitlab-org.yml b/gitlab-ci-config/dev-gitlab-org.yml
index f31cc8c9b0cdbf1931c666ed222b0db991fa013b_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw=..b33d117a8f7fbc903b401a15756c260a7a62bfc5_Z2l0bGFiLWNpLWNvbmZpZy9kZXYtZ2l0bGFiLW9yZy55bWw= 100644
--- a/gitlab-ci-config/dev-gitlab-org.yml
+++ b/gitlab-ci-config/dev-gitlab-org.yml
@@ -551,3 +551,19 @@
   dependencies:
     - Raspberry-Pi-2-Stretch
   <<: *raspbian_release
+
+AWS-Marketplace-release:
+  image: "${BUILDER_IMAGE_REGISTRY}/ruby_docker:${BUILDER_IMAGE_REVISION}"
+  stage: aws-marketplace-release
+  when: manual
+  script:
+    - curl --request POST --form "token=$AWS_RELEASE_TRIGGER_TOKEN" --form ref=master
+        --form "variables[GITLAB_VERSION]=$CI_COMMIT_TAG"
+        https://dev.gitlab.org/api/v4/projects/1035/trigger/pipeline
+  only:
+    - tags@gitlab/omnibus-gitlab
+  except:
+    variables:
+      - $CI_COMMIT_TAG =~ /^.*\+rc.*/
+  dependencies:
+    - AWS