diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65b4d1e909..85c8652e21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@
 ########################################
 
 
-.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
   # Alpine container builder template
@@ -47,11 +47,11 @@ variables:
   #
   # This is done by running `ci-fairy generate-template` and possibly bump
   # ".default_tag".
-  FEDORA_TAG:  '2021-07-12.0-475202004c1a'
-  UBUNTU_TAG:  '2021-07-12.0-b77047ed62be'
-  DEBIAN_TAG:  '2021-07-12.0-b77047ed62be'
-  CENTOS_TAG:  '2021-07-12.0-475202004c1a'
-  ALPINE_TAG:  '2021-07-12.0-d7a8aea74089'
+  FEDORA_TAG:  '2022-01-04.0-ed7a83d49619'
+  UBUNTU_TAG:  '2022-01-04.0-bcc65b379852'
+  DEBIAN_TAG:  '2022-01-04.0-bcc65b379852'
+  CENTOS_TAG:  '2022-01-04.0-ed7a83d49619'
+  ALPINE_TAG:  '2022-01-04.0-3caa10046464'
 
   FEDORA_EXEC: 'bash .gitlab-ci/fedora-install.sh'
   UBUNTU_EXEC: 'bash .gitlab-ci/debian-install.sh'
@@ -84,26 +84,6 @@ variables:
 # Build a container for each distribution + version. The ci-templates
 # will re-use the containers if the tag doesn't change.
 
-fedora:28@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '28'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-
-fedora:29@container-prep:
-  extends:
-    - .fdo.container-build@fedora
-  stage: prep
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: '29'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-    FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
-
 fedora:30@container-prep:
   extends:
     - .fdo.container-build@fedora
@@ -154,13 +134,13 @@ fedora:34@container-prep:
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
 
-fedora:rawhide@container-prep:
+fedora:35@container-prep:
   extends:
     - .fdo.container-build@fedora
   stage: prep
   variables:
     GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
     FDO_DISTRIBUTION_EXEC: $FEDORA_EXEC
 
@@ -368,24 +348,6 @@ alpine:latest@container-prep:
   only:
     - schedules
 
-fedora:28@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '28'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
-fedora:29@container-clean:
-  extends:
-    - .container-clean
-  variables:
-    GIT_STRATEGY: none
-    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: '29'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-
 fedora:30@container-clean:
   extends:
     - .container-clean
@@ -431,13 +393,13 @@ fedora:34@container-clean:
     FDO_DISTRIBUTION_VERSION: '34'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
-fedora:rawhide@container-clean:
+fedora:35@container-clean:
   extends:
     - .container-clean
   variables:
     GIT_STRATEGY: none
     CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/fedora/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
-    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
 
 ubuntu:16.04@container-clean:
@@ -613,28 +575,6 @@ alpine:latest@container-clean:
 #################################################################
 
 
-t_fedora:28:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '28'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:28@container-prep"
-  when: manual
-
-t_fedora:29:
-  extends:
-    - .build@template
-    - .fdo.distribution-image@fedora
-  variables:
-    FDO_DISTRIBUTION_VERSION: '29'
-    FDO_DISTRIBUTION_TAG: $FEDORA_TAG
-  needs:
-    - "fedora:29@container-prep"
-  when: manual
-
 t_fedora:30:
   extends:
     - .build@template
@@ -690,15 +630,15 @@ t_fedora:34:
   needs:
     - "fedora:34@container-prep"
 
-t_fedora:rawhide:
+t_fedora:35:
   extends:
     - .build@template
     - .fdo.distribution-image@fedora
   variables:
-    FDO_DISTRIBUTION_VERSION: 'rawhide'
+    FDO_DISTRIBUTION_VERSION: '35'
     FDO_DISTRIBUTION_TAG: $FEDORA_TAG
   needs:
-    - "fedora:rawhide@container-prep"
+    - "fedora:35@container-prep"
   when: manual
 
 t_ubuntu:16.04:
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index ee28a32b07..04428d0f32 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -9,7 +9,7 @@
 ########################################
 
 
-.templates_sha: &template_sha b18e53bf67b9ed493a006d83dbadd1ecc0daa61a # see https://docs.gitlab.com/ee/ci/yaml/#includefile
+.templates_sha: &template_sha 14731f78c23c7b523a85a26a068ade9ac1ecd2f3 # see https://docs.gitlab.com/ee/ci/yaml/#includefile
 
 include:
 {% for distro in distributions|sort(attribute="name") %}
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index dc7cdbcec6..23a402da11 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -8,7 +8,7 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2021-07-12.0'
+.default_tag: &default_tag '2022-01-04.0'
 
 
 # The list of all distributions we want to create job for.
@@ -18,14 +18,12 @@ distributions:
     tag: *default_tag
     base_type: fedora
     versions:
-      - '28'
-      - '29'
       - '30'
       - '31'
       - '32'
       - '33'
       - '34'
-      - 'rawhide'
+      - '35'
     # always:
     #   - '33'
   - name: ubuntu
diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES
index ee2622de8d..112b01bd2a 100755
--- a/contrib/fedora/REQUIRED_PACKAGES
+++ b/contrib/fedora/REQUIRED_PACKAGES
@@ -81,8 +81,8 @@ install \
     systemd-devel \
     teamd-devel \
     util-linux \
+    vala \
     vala-devel \
-    vala-tools \
     valgrind \
     which \
     "${EXTRA_PACKAGES[@]}"