diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 82ec73778..d44223481 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
 stages:
   - init
   - rpmbuild
+  - containerbuild
   - test
   - finish
 
@@ -47,6 +48,18 @@ RPM:
           - aws/rhel-8.4-aarch64
         INTERNAL_NETWORK: ["true"]
 
+Container:
+  stage: containerbuild
+  extends: .terraform
+  variables:
+    EXTRA_REPO_PATH_SEGMENT: "gitlab/"
+  script:
+    - sh "schutzbot/containerbuild.sh"
+  parallel:
+    matrix:
+      - RUNNER:
+          - aws/fedora-33-x86_64
+
 Base:
   stage: test
   extends: .terraform