diff --git a/.gitlab-ci.jsonnet b/.gitlab-ci.jsonnet
index 27241dd07..a762896a6 100644
--- a/.gitlab-ci.jsonnet
+++ b/.gitlab-ci.jsonnet
@@ -29,7 +29,7 @@ local jobs = {
     except: ['master']
   },
 
-  'container-base-build': baseJob.dockerBuild + onlyMaster {
+  'container-base-build': baseJob.dockerBuild {
     // ! Only master/tags
     // Update the base container
     stage: stages.docker_base,
@@ -38,6 +38,7 @@ local jobs = {
       ' -t %s -f quay-base.dockerfile .' % images.base.name,
       'docker push %s' % images.base.name,
     ],
+    only: ["schedules"]
   },
 
   'container-build': baseJob.dockerBuild {
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18ffed59f..8f66e8101 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,7 @@ container-base-build:
   - docker login -u $DOCKER_USER -p $DOCKER_PASS quay.io
   image: docker:git
   only:
-  - master
-  - tags
+  - schedules
   script:
   - docker build --no-cache -t quay.io/quay/quay-base:latest -f quay-base.dockerfile .
   - docker push quay.io/quay/quay-base:latest