diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 521e642f..7ad53942 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 include:
-  - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
-  - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml"
+  - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/fedora.yml'
+  - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/ci-fairy.yml"
   - component: gitlab.gnome.org/GNOME/citemplates/release-service@master
     inputs:
       job-stage: deploy
diff --git a/NEWS b/NEWS
index 64802596..ef2e6d02 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+47.4
+====
+* window-list: Fix regression in chrome tracking [Florian; !379]
+* Misc. bug fixes and cleanups [Florian; !376]
+
+Contributors:
+  Florian Müllner
+
 47.3
 ====
 * places-menu: Fix opening drives with mount operations [Florian; !361]
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index e78021fe..4d6e4d96 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -818,7 +818,7 @@ class WindowList extends St.Widget {
                 this._updateKeyboardAnchor();
             },
             'hidden', () => {
-                Main.layoutManager.trackChrome(this);
+                Main.layoutManager.trackChrome(this, chromeOptions);
                 this.visible = !this._monitor.inFullscreen;
                 this._updateKeyboardAnchor();
             }, this);
diff --git a/meson.build b/meson.build
index 7a64c2d8..27c04818 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@
 
 project(
   'gnome-shell-extensions',
-  version: '47.3',
+  version: '47.4',
   meson_version: '>= 1.1.0',
   license: 'GPL-2.0-or-later',
 )