diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d7bfb4..4471bc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ stages:
   - manifest
   - readme
   - test
+  - linktests
 
 variables:
   DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG}
@@ -537,6 +538,47 @@ manifest_dev:
           - core-oracle-8-private
           - core-opensuse-15-private
 
+link_tests_single_arch_dev:
+  stage: linktests
+  image:
+    name: amazon/aws-cli
+    entrypoint: [""]
+  script:
+    - yum install -y curl
+    - STATUS=$(curl -sL https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/x86_64/kasmweb/${KASM_IMAGE}/${SANITIZED_BRANCH}/ci-status.yml | awk -F'"' '{print $2}')
+    - if [[ "${STATUS}" == "PASS" ]]; then STATE=success; else STATE=failed; fi;
+    - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=${STATE}&name=${KASM_IMAGE}_x86_64&target_url=https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/x86_64/kasmweb/${KASM_IMAGE}/${SANITIZED_BRANCH}/index.html"
+  parallel:
+    matrix:
+      - KASM_IMAGE:
+          - core-cuda-bionic-private
+          - core-cuda-focal-private
+          - core-remnux-bionic-private
+          - core-remnux-focal-private
+          - core-centos-7-private
+          - core-oracle-7-private
+
+link_tests_multi_arch_dev:
+  stage: linktests
+  image:
+    name: amazon/aws-cli
+    entrypoint: [""]
+  script:
+    - yum install -y curl
+    - STATUS=$(curl -sL https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/${KASM_IMAGE}/${ARCH}-${SANITIZED_BRANCH}/ci-status.yml | awk -F'"' '{print $2}')
+    - if [[ "${STATUS}" == "PASS" ]]; then STATE=success; else STATE=failed; fi;
+    - curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=${STATE}&name=${KASM_IMAGE}_${ARCH}&target_url=https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/${KASM_IMAGE}/${ARCH}-${SANITIZED_BRANCH}/index.html"
+  parallel:
+    matrix:
+      - ARCH: [ aarch64, x86_64 ]
+        KASM_IMAGE:
+          - core-ubuntu-bionic-private
+          - core-ubuntu-focal-private
+          - core-nvidia-focal-private
+          - core-kali-rolling-private
+          - core-oracle-8-private
+          - core-opensuse-15-private
+
 # These jobs are for the "rolling" release of the images. They should only run for scheduled jobs and should only push the rolling tags
 build_ubuntu_bionic_scheduled:
   stage: build