diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c812da7..1a0f21d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -171,7 +171,8 @@ stages:
       docker manifest create \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:amd64-${REF}" \
-        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:armhf-${REF}"
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:armhf-${REF}" \
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:i386-${REF}"
     - |
       docker manifest annotate \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \
@@ -185,6 +186,12 @@ stages:
         --os=linux \
         --arch=arm \
         --variant=v6
+    - |
+      docker manifest annotate \
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}" \
+        "${DOCKER_HUB_ORG}/${ADDON_SLUG}:i386-${REF}" \
+        --os=linux \
+        --arch=386
     - |
       docker manifest push \
         "${DOCKER_HUB_ORG}/${ADDON_SLUG}:${TAG}"
@@ -299,14 +306,14 @@ build:armhf:
 #     - build
 #     - aarch64
 
-# build:i386:
-#   <<: *build
-#   variables:
-#     ADDON_ARCH: i386
-#     FROM: hassioaddons/base-i386:2.0.0
-#   tags:
-#     - build
-#     - i386
+build:i386:
+  <<: *build
+  variables:
+    ADDON_ARCH: i386
+    FROM: hassioaddons/base-i386:2.0.0
+  tags:
+    - build
+    - i386
 
 build:amd64:
   <<: *build
@@ -328,10 +335,10 @@ clair:armhf:
 #   variables:
 #     ADDON_ARCH: aarch64
 
-# clair:i386:
-#   <<: *scan
-#   variables:
-#     ADDON_ARCH: i386
+clair:i386:
+  <<: *scan
+  variables:
+    ADDON_ARCH: i386
 
 clair:amd64:
   <<: *scan
@@ -349,10 +356,10 @@ deploy:armhf:
 #   variables:
 #     ADDON_ARCH: aarch64
 
-# deploy:i386:
-#   <<: *deploy
-#   variables:
-#     ADDON_ARCH: i386
+deploy:i386:
+  <<: *deploy
+  variables:
+    ADDON_ARCH: i386
 
 deploy:amd64:
   <<: *deploy