diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a0f21d..f5fce8a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -170,9 +170,17 @@ stages:
     - |
       docker manifest create \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:aarch64-${REF}" \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:amd64-${REF}" \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:armhf-${REF}" \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:i386-${REF}"
+    - |
+      docker manifest annotate \
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:aarch64-${REF}" \
+        --os=linux \
+        --arch=arm64 \
+        --variant=v8
     - |
       docker manifest annotate \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \
@@ -297,14 +305,14 @@ build:armhf:
     - build
     - armhf
 
-# build:aarch64:
-#   <<: *build
-#   variables:
-#     ADDON_ARCH: aarch64
-#     FROM: hassioaddons/base-aarch64:2.0.0
-#   tags:
-#     - build
-#     - aarch64
+build:aarch64:
+  <<: *build
+  variables:
+    ADDON_ARCH: aarch64
+    FROM: hassioaddons/base-aarch64:2.0.0
+  tags:
+    - build
+    - aarch64
 
 build:i386:
   <<: *build
@@ -330,10 +338,10 @@ clair:armhf:
   variables:
     ADDON_ARCH: armhf
 
-# clair:aarch64:
-#   <<: *scan
-#   variables:
-#     ADDON_ARCH: aarch64
+clair:aarch64:
+  <<: *scan
+  variables:
+    ADDON_ARCH: aarch64
 
 clair:i386:
   <<: *scan
@@ -351,10 +359,10 @@ deploy:armhf:
   variables:
     ADDON_ARCH: armhf
 
-# deploy:aarch64:
-#   <<: *deploy
-#   variables:
-#     ADDON_ARCH: aarch64
+deploy:aarch64:
+  <<: *deploy
+  variables:
+    ADDON_ARCH: aarch64
 
 deploy:i386:
   <<: *deploy