[gnome-build-meta/abderrahim/mirrors: 5/5] cleanup aliases in preparation for mirrors




commit 068e0d0ce6cf0966e4781ed49a9232afe736ee28
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Wed Dec 22 09:17:08 2021 +0100

    cleanup aliases in preparation for mirrors
    
    * use shorter, cleaner aliases
    * try to match the aliases used by freedesktop-sdk
    * drop unused aliases
    * use separate git and tarball aliases for github/gitlab
    * use a single alias for sourceforge
    * try to use tarballs from github/fdo gitlab rather than people.fd.o
    * stop using tarballs_needing_help, we're getting new mirrors

 .../boards/pinebook-pro/arm-trusted-firmware.bst   |  2 +-
 elements/boards/pinebook-pro/keyboard-updater.bst  |  2 +-
 elements/boards/pinebook-pro/vim.bst               |  2 +-
 elements/boards/raspberrypi-4/bsp/firmware.bst     |  2 +-
 elements/boards/raspberrypi-4/bsp/linux.bst        |  2 +-
 elements/boards/raspberrypi-4/bsp/rpi-userland.bst |  2 +-
 elements/boards/rock64/arm-trusted-firmware.bst    |  2 +-
 elements/core-deps/LibVNCServer.bst                |  2 +-
 elements/core-deps/atkmm-1.6.bst                   |  2 +-
 elements/core-deps/cairomm-1.0.bst                 |  2 +-
 elements/core-deps/callaudiod.bst                  |  2 +-
 elements/core-deps/cmark.bst                       |  2 +-
 elements/core-deps/cogl.bst                        |  2 +-
 elements/core-deps/colord-gtk.bst                  |  2 +-
 elements/core-deps/dconf.bst                       |  2 +-
 elements/core-deps/dotconf.bst                     |  2 +-
 elements/core-deps/eos-updater.bst                 |  2 +-
 elements/core-deps/evolution-data-server.bst       |  2 +-
 elements/core-deps/exiv2.bst                       |  2 +-
 elements/core-deps/flatpak-builder.bst             |  2 +-
 elements/core-deps/flatpak.bst                     |  2 +-
 elements/core-deps/folks.bst                       |  2 +-
 elements/core-deps/fwupd-efi.bst                   |  2 +-
 elements/core-deps/fwupd.bst                       |  2 +-
 elements/core-deps/geocode-glib.bst                |  2 +-
 elements/core-deps/gfbgraph.bst                    |  2 +-
 elements/core-deps/glibmm-2.4.bst                  |  2 +-
 elements/core-deps/gmime.bst                       |  2 +-
 elements/core-deps/gnome-autoar.bst                |  2 +-
 elements/core-deps/gnome-online-accounts.bst       |  2 +-
 elements/core-deps/gnome-video-effects.bst         |  2 +-
 elements/core-deps/gom.bst                         |  2 +-
 elements/core-deps/graphviz.bst                    |  2 +-
 elements/core-deps/grilo-plugins.bst               |  2 +-
 elements/core-deps/grilo.bst                       |  2 +-
 elements/core-deps/gsound.bst                      |  2 +-
 elements/core-deps/gspell.bst                      |  2 +-
 elements/core-deps/gssdp.bst                       |  2 +-
 elements/core-deps/gtk-vnc.bst                     |  4 +-
 elements/core-deps/gtkmm-3.bst                     |  2 +-
 elements/core-deps/gupnp-av.bst                    |  2 +-
 elements/core-deps/gupnp-dlna.bst                  |  2 +-
 elements/core-deps/gupnp.bst                       |  2 +-
 elements/core-deps/jsonrpc-glib.bst                |  2 +-
 elements/core-deps/libcacard.bst                   |  2 +-
 elements/core-deps/libcanberra.bst                 |  7 +++-
 elements/core-deps/libchamplain.bst                |  2 +-
 elements/core-deps/libcue.bst                      |  2 +-
 elements/core-deps/libdazzle.bst                   |  2 +-
 elements/core-deps/libgdata.bst                    |  2 +-
 elements/core-deps/libgit2-glib.bst                |  2 +-
 elements/core-deps/libgit2.bst                     |  2 +-
 elements/core-deps/libgnomekbd.bst                 |  2 +-
 elements/core-deps/libgphoto2.bst                  |  2 +-
 elements/core-deps/libgsf.bst                      |  2 +-
 elements/core-deps/libgtop.bst                     |  2 +-
 elements/core-deps/libgusb.bst                     |  5 ++-
 elements/core-deps/libgxps.bst                     |  2 +-
 elements/core-deps/libimobiledevice.bst            |  2 +-
 elements/core-deps/libjcat.bst                     |  2 +-
 elements/core-deps/libmediaart.bst                 |  2 +-
 elements/core-deps/libmtp.bst                      |  5 ++-
 elements/core-deps/libnma.bst                      |  2 +-
 elements/core-deps/liboauth.bst                    |  6 ++-
 elements/core-deps/libostree.bst                   |  2 +-
 elements/core-deps/libpeas.bst                     |  2 +-
 elements/core-deps/librest.bst                     |  2 +-
 elements/core-deps/libsigcplusplus-2.0.bst         |  2 +-
 elements/core-deps/libssh2.bst                     |  2 +-
 elements/core-deps/libusbmuxd.bst                  |  2 +-
 elements/core-deps/libxcvt.bst                     |  2 +-
 elements/core-deps/libxklavier.bst                 |  2 +-
 elements/core-deps/lmdb.bst                        |  2 +-
 elements/core-deps/mm-common.bst                   |  2 +-
 .../core-deps/mobile-broadband-provider-info.bst   |  2 +-
 elements/core-deps/mogwai.bst                      |  2 +-
 elements/core-deps/pangomm-1.4.bst                 |  2 +-
 elements/core-deps/phodav.bst                      |  2 +-
 elements/core-deps/plist.bst                       |  2 +-
 elements/core-deps/power-profiles-daemon.bst       |  2 +-
 elements/core-deps/protobuf-c.bst                  |  2 +-
 elements/core-deps/protobuf.bst                    |  2 +-
 elements/core-deps/pyatspi.bst                     |  2 +-
 elements/core-deps/rpcsvc-proto.bst                |  2 +-
 elements/core-deps/sane-backends.bst               |  2 +-
 elements/core-deps/sofia-sip.bst                   |  2 +-
 elements/core-deps/speech-dispatcher.bst           |  2 +-
 elements/core-deps/system-config-printer.bst       |  2 +-
 elements/core-deps/template-glib.bst               |  2 +-
 elements/core-deps/totem-pl-parser.bst             |  2 +-
 elements/core-deps/tracker-miners.bst              |  2 +-
 elements/core-deps/udisks2.bst                     |  2 +-
 elements/core-deps/upower.bst                      |  2 +-
 elements/core-deps/virglrenderer.bst               |  2 +-
 elements/core-deps/vte.bst                         |  2 +-
 elements/core-deps/xdg-desktop-portal-gnome.bst    |  2 +-
 elements/core-deps/xdg-desktop-portal-gtk.bst      |  2 +-
 elements/core-deps/xdg-sound-theme.bst             |  6 +--
 elements/core-deps/xmlb.bst                        |  2 +-
 elements/core-deps/zenity.bst                      |  2 +-
 elements/core/baobab.bst                           |  2 +-
 elements/core/calls.bst                            |  2 +-
 elements/core/cheese.bst                           |  2 +-
 elements/core/dconf-editor.bst                     |  2 +-
 elements/core/devhelp.bst                          |  2 +-
 elements/core/eog.bst                              |  2 +-
 elements/core/epiphany.bst                         |  2 +-
 elements/core/evince.bst                           |  2 +-
 elements/core/gdm.bst                              |  2 +-
 elements/core/gnome-backgrounds.bst                |  2 +-
 elements/core/gnome-bluetooth-1.0.bst              |  2 +-
 elements/core/gnome-bluetooth.bst                  |  2 +-
 elements/core/gnome-boxes.bst                      |  6 +--
 elements/core/gnome-builder.bst                    |  2 +-
 elements/core/gnome-calculator.bst                 |  2 +-
 elements/core/gnome-calendar.bst                   |  2 +-
 elements/core/gnome-characters.bst                 |  2 +-
 elements/core/gnome-clocks.bst                     |  2 +-
 elements/core/gnome-color-manager.bst              |  2 +-
 elements/core/gnome-connections.bst                |  4 +-
 elements/core/gnome-console.bst                    |  2 +-
 elements/core/gnome-contacts.bst                   |  2 +-
 elements/core/gnome-control-center.bst             |  4 +-
 elements/core/gnome-desktop.bst                    |  2 +-
 elements/core/gnome-disk-utility.bst               |  2 +-
 elements/core/gnome-font-viewer.bst                |  2 +-
 elements/core/gnome-initial-setup.bst              |  2 +-
 elements/core/gnome-keyring.bst                    |  2 +-
 elements/core/gnome-logs.bst                       |  2 +-
 elements/core/gnome-maps.bst                       |  2 +-
 elements/core/gnome-menus.bst                      |  2 +-
 elements/core/gnome-music.bst                      |  6 +--
 elements/core/gnome-photos.bst                     |  4 +-
 elements/core/gnome-remote-desktop.bst             |  2 +-
 elements/core/gnome-screenshot.bst                 |  2 +-
 elements/core/gnome-session.bst                    |  2 +-
 elements/core/gnome-settings-daemon.bst            |  4 +-
 elements/core/gnome-shell-extensions.bst           |  2 +-
 elements/core/gnome-shell.bst                      |  4 +-
 elements/core/gnome-software.bst                   |  2 +-
 elements/core/gnome-system-monitor.bst             |  2 +-
 elements/core/gnome-text-editor.bst                |  2 +-
 elements/core/gnome-tour.bst                       |  2 +-
 elements/core/gnome-user-docs.bst                  |  2 +-
 elements/core/gnome-user-share.bst                 |  2 +-
 elements/core/gnome-weather.bst                    |  2 +-
 elements/core/mutter.bst                           |  2 +-
 elements/core/nautilus.bst                         |  4 +-
 elements/core/orca.bst                             |  2 +-
 elements/core/rygel.bst                            |  2 +-
 elements/core/simple-scan.bst                      |  2 +-
 elements/core/sushi.bst                            |  2 +-
 elements/core/sysprof.inc                          |  2 +-
 elements/core/totem.bst                            |  6 +--
 elements/freedesktop-sdk.bst                       |  2 +-
 elements/iso/eos-installer.bst                     |  4 +-
 elements/iso/isomd5sum.bst                         |  2 +-
 elements/sdk-deps/bubblewrap.bst                   |  2 +-
 elements/sdk-deps/gi-docgen.bst                    |  2 +-
 elements/sdk-deps/gvfs.bst                         |  2 +-
 elements/sdk-deps/ibus.bst                         |  2 +-
 elements/sdk-deps/libsass.bst                      |  2 +-
 elements/sdk-deps/python-smartypants.bst           |  2 +-
 elements/sdk-deps/sassc.bst                        |  2 +-
 elements/sdk-deps/xdg-dbus-proxy.bst               |  2 +-
 elements/sdk/adobe-source-code-pro-fonts.bst       |  2 +-
 elements/sdk/adwaita-icon-theme.bst                |  2 +-
 elements/sdk/appstream-glib.bst                    |  2 +-
 elements/sdk/at-spi2-atk.bst                       |  2 +-
 elements/sdk/at-spi2-core.bst                      |  2 +-
 elements/sdk/atk.bst                               |  2 +-
 elements/sdk/enchant-2.bst                         |  2 +-
 elements/sdk/fcitx.bst                             |  2 +-
 elements/sdk/gcab.bst                              |  2 +-
 elements/sdk/gcr.bst                               |  2 +-
 elements/sdk/gdk-pixbuf.bst                        |  2 +-
 elements/sdk/geoclue.bst                           |  2 +-
 elements/sdk/gjs.bst                               |  2 +-
 elements/sdk/glib-networking.bst                   |  2 +-
 elements/sdk/glib.bst                              |  2 +-
 elements/sdk/gobject-introspection.bst             |  2 +-
 elements/sdk/graphene.bst                          |  2 +-
 elements/sdk/gsettings-desktop-schemas.bst         |  2 +-
 elements/sdk/gtk+-3.bst                            |  2 +-
 elements/sdk/gtk-doc.bst                           |  2 +-
 elements/sdk/gtk.bst                               |  2 +-
 elements/sdk/gtksourceview-4.bst                   |  2 +-
 elements/sdk/gtksourceview.bst                     |  2 +-
 elements/sdk/json-glib.bst                         |  2 +-
 elements/sdk/libadwaita.bst                        |  2 +-
 elements/sdk/libgee.bst                            |  2 +-
 elements/sdk/libhandy.bst                          |  2 +-
 elements/sdk/libmanette.bst                        |  2 +-
 elements/sdk/libnotify.bst                         |  2 +-
 elements/sdk/librsvg.bst                           |  2 +-
 elements/sdk/libsecret.bst                         |  2 +-
 elements/sdk/libsoup-2.4.bst                       |  2 +-
 elements/sdk/libsoup.bst                           |  2 +-
 elements/sdk/nuspell.bst                           |  2 +-
 elements/sdk/pango.bst                             |  2 +-
 elements/sdk/pygobject.bst                         |  2 +-
 elements/sdk/tracker.bst                           |  2 +-
 elements/sdk/vala.bst                              |  2 +-
 elements/sdk/webkitgtk.inc                         |  2 +-
 elements/sdk/woff2.bst                             |  2 +-
 elements/sdk/yelp-tools.bst                        |  2 +-
 elements/sdk/yelp-xsl.bst                          |  2 +-
 elements/sdk/yelp.bst                              |  2 +-
 elements/vm/android-udev-rules.bst                 |  2 +-
 elements/vm/buildstream/bst-external.bst           |  2 +-
 elements/vm/buildstream/buildstream.bst            |  2 +-
 elements/vm/eos-repartition.bst                    |  2 +-
 elements/vm/fish.bst                               |  2 +-
 elements/vm/git-lfs.bst                            |  2 +-
 elements/vm/ibus-anthy.bst                         |  2 +-
 elements/vm/ibus-hangul.bst                        |  2 +-
 elements/vm/ibus-libpinyin.bst                     |  2 +-
 elements/vm/libpinyin.bst                          |  8 +++-
 elements/vm/nss-mdns.bst                           |  2 +-
 elements/vm/ntfs-3g.bst                            |  2 +-
 elements/vm/openfortivpn.bst                       |  2 +-
 elements/vm/opensc.bst                             |  2 +-
 elements/vm/toolbox.bst                            | 34 +++++++--------
 elements/vm/uresourced.bst                         |  2 +-
 elements/vm/vpnc.bst                               |  2 +-
 elements/world/accerciser.bst                      |  2 +-
 elements/world/atkmm.bst                           |  2 +-
 elements/world/bijiben.bst                         |  4 +-
 elements/world/cairomm.bst                         |  2 +-
 elements/world/evolution.bst                       |  2 +-
 elements/world/file-roller.bst                     |  2 +-
 elements/world/five-or-more.bst                    |  2 +-
 elements/world/four-in-a-row.bst                   |  2 +-
 elements/world/geary.bst                           |  2 +-
 elements/world/gedit.bst                           |  4 +-
 elements/world/ghex.bst                            |  2 +-
 elements/world/gitg.bst                            |  2 +-
 elements/world/glade.bst                           |  2 +-
 elements/world/glibmm.bst                          |  2 +-
 elements/world/gnome-2048.bst                      |  2 +-
 elements/world/gnome-chess.bst                     |  2 +-
 elements/world/gnome-code-assistance.bst           |  2 +-
 elements/world/gnome-devel-docs.bst                |  2 +-
 elements/world/gnome-dictionary.bst                |  2 +-
 elements/world/gnome-documents.bst                 |  4 +-
 elements/world/gnome-games.bst                     |  2 +-
 elements/world/gnome-klotski.bst                   |  2 +-
 elements/world/gnome-mahjongg.bst                  |  2 +-
 elements/world/gnome-mines.bst                     |  2 +-
 elements/world/gnome-multi-writer.bst              |  2 +-
 elements/world/gnome-nibbles.bst                   |  2 +-
 elements/world/gnome-online-miners.bst             |  2 +-
 elements/world/gnome-recipes.bst                   |  4 +-
 elements/world/gnome-robots.bst                    |  2 +-
 elements/world/gnome-sound-recorder.bst            |  2 +-
 elements/world/gnome-sudoku.bst                    |  2 +-
 elements/world/gnome-taquin.bst                    |  2 +-
 elements/world/gnome-terminal.bst                  |  2 +-
 elements/world/gnome-tetravex.bst                  |  2 +-
 elements/world/gnome-themes-extra.bst              |  2 +-
 elements/world/gnome-todo.bst                      |  2 +-
 elements/world/gnome-tweaks.bst                    |  2 +-
 elements/world/gtkmm.bst                           |  2 +-
 elements/world/gupnp-igd.bst                       |  2 +-
 elements/world/hitori.bst                          |  2 +-
 elements/world/iagno.bst                           |  2 +-
 elements/world/libaperture.bst                     |  2 +-
 elements/world/libgepub.bst                        |  2 +-
 elements/world/libgnome-games-support.bst          |  2 +-
 elements/world/libgrss.bst                         |  2 +-
 elements/world/libshumate.bst                      |  2 +-
 elements/world/libsigcplusplus.bst                 |  2 +-
 elements/world/libzapojit.bst                      |  2 +-
 elements/world/lightsoff.bst                       |  2 +-
 elements/world/network-manager-applet.bst          |  2 +-
 elements/world/pangomm.bst                         |  2 +-
 elements/world/phoc.bst                            |  2 +-
 elements/world/phosh.bst                           |  6 +--
 elements/world/pinhole.bst                         |  2 +-
 elements/world/polari.bst                          |  2 +-
 elements/world/qqwing.bst                          |  4 +-
 elements/world/quadrapassel.bst                    |  2 +-
 elements/world/retro-gtk.bst                       |  2 +-
 elements/world/seahorse.bst                        |  2 +-
 elements/world/swell-foop.bst                      |  2 +-
 elements/world/tali.bst                            |  2 +-
 elements/world/telepathy-glib.bst                  |  2 +-
 elements/world/telepathy-logger.bst                |  2 +-
 elements/world/telepathy-mission-control.bst       |  2 +-
 elements/world/tracker-2.bst                       |  2 +-
 elements/world/tracker-miners-2.bst                |  2 +-
 include/aliases.yml                                | 26 ++++++++++++
 include/mirrors.yml                                | 13 ++++++
 project.conf                                       | 49 +---------------------
 294 files changed, 392 insertions(+), 377 deletions(-)
---
diff --git a/elements/boards/pinebook-pro/arm-trusted-firmware.bst 
b/elements/boards/pinebook-pro/arm-trusted-firmware.bst
index 60a1d4445..4175be28f 100644
--- a/elements/boards/pinebook-pro/arm-trusted-firmware.bst
+++ b/elements/boards/pinebook-pro/arm-trusted-firmware.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: https://github.com/ARM-software/arm-trusted-firmware.git
+  url: github:ARM-software/arm-trusted-firmware.git
   track: 22d12c4148c373932a7a81e5d1c59a767e143ac2
   track-tags: false
 
diff --git a/elements/boards/pinebook-pro/keyboard-updater.bst 
b/elements/boards/pinebook-pro/keyboard-updater.bst
index dde5dbd8f..5ca36c359 100644
--- a/elements/boards/pinebook-pro/keyboard-updater.bst
+++ b/elements/boards/pinebook-pro/keyboard-updater.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: https://github.com/ayufan-rock64/pinebook-pro-keyboard-updater.git
+  url: github:ayufan-rock64/pinebook-pro-keyboard-updater.git
   track: 089ddceaca34cc835d8114900c24db6dcdf121c3
 
 depends:
diff --git a/elements/boards/pinebook-pro/vim.bst b/elements/boards/pinebook-pro/vim.bst
index 81f2ad2fa..9a0d0af89 100644
--- a/elements/boards/pinebook-pro/vim.bst
+++ b/elements/boards/pinebook-pro/vim.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:vim/vim/archive/v8.2.0737.tar.gz
+  url: github_files:vim/vim/archive/v8.2.0737.tar.gz
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/boards/raspberrypi-4/bsp/firmware.bst b/elements/boards/raspberrypi-4/bsp/firmware.bst
index 2e9779ac2..1e7819240 100644
--- a/elements/boards/raspberrypi-4/bsp/firmware.bst
+++ b/elements/boards/raspberrypi-4/bsp/firmware.bst
@@ -7,7 +7,7 @@ build-depends:
 
 sources:
 - kind: git_tag
-  url: https://github.com/raspberrypi/firmware
+  url: github:raspberrypi/firmware.git
   track: 20354bebcc2a8448128f2348e19e155910d25122
   track-tags: false
 
diff --git a/elements/boards/raspberrypi-4/bsp/linux.bst b/elements/boards/raspberrypi-4/bsp/linux.bst
index f3df5b4cd..d93049057 100644
--- a/elements/boards/raspberrypi-4/bsp/linux.bst
+++ b/elements/boards/raspberrypi-4/bsp/linux.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: git_tag
-  url: github_com:raspberrypi/linux.git
+  url: github:raspberrypi/linux.git
   # Aim to track 5.4 LTS work for vc4-kms etc
   # track: 5.4.y
   track: a98ba9221895e03b8736312ce6666005da5968a1
diff --git a/elements/boards/raspberrypi-4/bsp/rpi-userland.bst 
b/elements/boards/raspberrypi-4/bsp/rpi-userland.bst
index f9512f115..6a717cd1d 100644
--- a/elements/boards/raspberrypi-4/bsp/rpi-userland.bst
+++ b/elements/boards/raspberrypi-4/bsp/rpi-userland.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: git_tag
-  url: https://github.com/raspberrypi/userland/
+  url: github:raspberrypi/userland.git
   track: f97b1af1b3e653f9da2c1a3643479bfd469e3b74
 - kind: patch
   path: files/boards/raspberrypi-4/0021-cmake-Disable-format-overflow-warning-as-error.patch
diff --git a/elements/boards/rock64/arm-trusted-firmware.bst b/elements/boards/rock64/arm-trusted-firmware.bst
index b3465522a..b838cdda2 100644
--- a/elements/boards/rock64/arm-trusted-firmware.bst
+++ b/elements/boards/rock64/arm-trusted-firmware.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: https://github.com/ARM-software/arm-trusted-firmware/archive/v2.3.tar.gz
+  url: github_files:ARM-software/arm-trusted-firmware/archive/v2.3.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/LibVNCServer.bst b/elements/core-deps/LibVNCServer.bst
index f5eeb7f13..fffa7ad50 100644
--- a/elements/core-deps/LibVNCServer.bst
+++ b/elements/core-deps/LibVNCServer.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
+  url: github_files:LibVNC/libvncserver/archive/LibVNCServer-0.9.13.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/core-deps/atkmm-1.6.bst b/elements/core-deps/atkmm-1.6.bst
index 9f484b1cc..38ce79c61 100644
--- a/elements/core-deps/atkmm-1.6.bst
+++ b/elements/core-deps/atkmm-1.6.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/atkmm.git
+  url: gnome:atkmm.git
   track: atkmm-2-28
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/core-deps/cairomm-1.0.bst b/elements/core-deps/cairomm-1.0.bst
index 81d9f8727..11c9bb3ae 100644
--- a/elements/core-deps/cairomm-1.0.bst
+++ b/elements/core-deps/cairomm-1.0.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: cairo_org:releases/cairomm-1.14.3.tar.xz
+  url: cairo:releases/cairomm-1.14.3.tar.xz
 build-depends:
 - core-deps/mm-common.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/callaudiod.bst b/elements/core-deps/callaudiod.bst
index ce9bb6b30..b26006261 100644
--- a/elements/core-deps/callaudiod.bst
+++ b/elements/core-deps/callaudiod.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: gitlab_com:mobian1/callaudiod/-/archive/0.1.0/callaudiod-0.1.0.tar.bz2
+  url: gitlab_files:mobian1/callaudiod/-/archive/0.1.0/callaudiod-0.1.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/cmark.bst b/elements/core-deps/cmark.bst
index e403630c9..9a1b914de 100644
--- a/elements/core-deps/cmark.bst
+++ b/elements/core-deps/cmark.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:commonmark/cmark/archive/refs/tags/0.30.1.tar.gz
+  url: github_files:commonmark/cmark/archive/refs/tags/0.30.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/core-deps/cogl.bst b/elements/core-deps/cogl.bst
index 1ca6d1b03..4a3a03ac2 100644
--- a/elements/core-deps/cogl.bst
+++ b/elements/core-deps/cogl.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/cogl.git
+  url: gnome:cogl.git
   track: cogl-1.22
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/colord-gtk.bst b/elements/core-deps/colord-gtk.bst
index 569262894..1cfb32d11 100644
--- a/elements/core-deps/colord-gtk.bst
+++ b/elements/core-deps/colord-gtk.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git
-  url: github_com:hughsie/colord-gtk.git
+  url: github:hughsie/colord-gtk.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/dconf.bst b/elements/core-deps/dconf.bst
index ce7ca304d..159f90ec4 100644
--- a/elements/core-deps/dconf.bst
+++ b/elements/core-deps/dconf.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/dconf.git
+  url: gnome:dconf.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/dotconf.bst b/elements/core-deps/dotconf.bst
index 7b69cb37e..2a5a625d1 100644
--- a/elements/core-deps/dotconf.bst
+++ b/elements/core-deps/dotconf.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:williamh/dotconf/archive/v1.3.tar.gz
+  url: github_files:williamh/dotconf/archive/v1.3.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/eos-updater.bst b/elements/core-deps/eos-updater.bst
index 645d41201..cbb82dfe2 100644
--- a/elements/core-deps/eos-updater.bst
+++ b/elements/core-deps/eos-updater.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:endlessm/eos-updater/archive/Release_3.9.4.tar.gz
+  url: github_files:endlessm/eos-updater/archive/Release_3.9.4.tar.gz
 
 depends:
 - core-deps/NetworkManager.bst
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index fa6292c39..a8646d333 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/evolution-data-server.git
+  url: gnome:evolution-data-server.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/exiv2.bst b/elements/core-deps/exiv2.bst
index 2a8692087..427939a95 100644
--- a/elements/core-deps/exiv2.bst
+++ b/elements/core-deps/exiv2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:Exiv2/exiv2/archive/v0.27.3.tar.gz
+  url: github_files:Exiv2/exiv2/archive/v0.27.3.tar.gz
 - kind: patch
   path: files/exiv2/disable-protection-flags.patch
 build-depends:
diff --git a/elements/core-deps/flatpak-builder.bst b/elements/core-deps/flatpak-builder.bst
index b83735804..86b5f4ae2 100644
--- a/elements/core-deps/flatpak-builder.bst
+++ b/elements/core-deps/flatpak-builder.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:flatpak/flatpak-builder/releases/download/1.2.0/flatpak-builder-1.2.0.tar.xz
+  url: github_files:flatpak/flatpak-builder/releases/download/1.2.0/flatpak-builder-1.2.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:components/docbook-xsl.bst
diff --git a/elements/core-deps/flatpak.bst b/elements/core-deps/flatpak.bst
index 1c31fa896..5e2231233 100644
--- a/elements/core-deps/flatpak.bst
+++ b/elements/core-deps/flatpak.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:flatpak/flatpak/releases/download/1.12.1/flatpak-1.12.1.tar.xz
+  url: github_files:flatpak/flatpak/releases/download/1.12.1/flatpak-1.12.1.tar.xz
 
 build-depends:
 - core-deps/python-pyparsing.bst
diff --git a/elements/core-deps/folks.bst b/elements/core-deps/folks.bst
index dd53d17b1..cbfd3e230 100644
--- a/elements/core-deps/folks.bst
+++ b/elements/core-deps/folks.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/folks.git
+  url: gnome:folks.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/fwupd-efi.bst b/elements/core-deps/fwupd-efi.bst
index 231b75bed..0ab4b7ac6 100644
--- a/elements/core-deps/fwupd-efi.bst
+++ b/elements/core-deps/fwupd-efi.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:fwupd/fwupd-efi/archive/1.0.tar.gz
+  url: github_files:fwupd/fwupd-efi/archive/1.0.tar.gz
 - kind: patch
   path: files/fwupd/riscv64.patch
 
diff --git a/elements/core-deps/fwupd.bst b/elements/core-deps/fwupd.bst
index 2f8799b2d..73ff58dae 100644
--- a/elements/core-deps/fwupd.bst
+++ b/elements/core-deps/fwupd.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:fwupd/fwupd/releases/download/1.7.2/fwupd-1.7.2.tar.xz
+  url: github_files:fwupd/fwupd/releases/download/1.7.2/fwupd-1.7.2.tar.xz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/geocode-glib.bst b/elements/core-deps/geocode-glib.bst
index f956e83f7..e2e5e6cef 100644
--- a/elements/core-deps/geocode-glib.bst
+++ b/elements/core-deps/geocode-glib.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/geocode-glib.git
+  url: gnome:geocode-glib.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/gfbgraph.bst b/elements/core-deps/gfbgraph.bst
index 7857d5e87..4e6b3fabe 100644
--- a/elements/core-deps/gfbgraph.bst
+++ b/elements/core-deps/gfbgraph.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgfbgraph.git
+  url: gnome:libgfbgraph.git
   track: stable-0.2.x
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/glibmm-2.4.bst b/elements/core-deps/glibmm-2.4.bst
index 85a2e7cac..e8fd0b841 100644
--- a/elements/core-deps/glibmm-2.4.bst
+++ b/elements/core-deps/glibmm-2.4.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/glibmm.git
+  url: gnome:glibmm.git
   track: glibmm-2-66
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/core-deps/gmime.bst b/elements/core-deps/gmime.bst
index 2a2702aef..bd4d4ef23 100644
--- a/elements/core-deps/gmime.bst
+++ b/elements/core-deps/gmime.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gmime.git
+  url: gnome:gmime.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gnome-autoar.bst b/elements/core-deps/gnome-autoar.bst
index e269584e8..e5dbd39a8 100644
--- a/elements/core-deps/gnome-autoar.bst
+++ b/elements/core-deps/gnome-autoar.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-autoar.git
+  url: gnome:gnome-autoar.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gnome-online-accounts.bst b/elements/core-deps/gnome-online-accounts.bst
index eb19148ac..8faea13b6 100644
--- a/elements/core-deps/gnome-online-accounts.bst
+++ b/elements/core-deps/gnome-online-accounts.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-online-accounts.git
+  url: gnome:gnome-online-accounts.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/gnome-video-effects.bst b/elements/core-deps/gnome-video-effects.bst
index a973f048c..73b246714 100644
--- a/elements/core-deps/gnome-video-effects.bst
+++ b/elements/core-deps/gnome-video-effects.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-video-effects.git
+  url: gnome:gnome-video-effects.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/perl-xml-parser.bst
diff --git a/elements/core-deps/gom.bst b/elements/core-deps/gom.bst
index d04659cb0..1e2d90d69 100644
--- a/elements/core-deps/gom.bst
+++ b/elements/core-deps/gom.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gom.git
+  url: gnome:gom.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/graphviz.bst b/elements/core-deps/graphviz.bst
index 384dcb3cd..7991a5ebe 100644
--- a/elements/core-deps/graphviz.bst
+++ b/elements/core-deps/graphviz.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gitlab_com:graphviz/graphviz/-/archive/2.47.1/graphviz-2.47.1.tar.gz
+  url: gitlab_files:graphviz/graphviz/-/archive/2.47.1/graphviz-2.47.1.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/grilo-plugins.bst b/elements/core-deps/grilo-plugins.bst
index 2918aa6ab..8913d4949 100644
--- a/elements/core-deps/grilo-plugins.bst
+++ b/elements/core-deps/grilo-plugins.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/grilo-plugins.git
+  url: gnome:grilo-plugins.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/core-deps/grilo.bst b/elements/core-deps/grilo.bst
index e2c32d1fe..772f086de 100644
--- a/elements/core-deps/grilo.bst
+++ b/elements/core-deps/grilo.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/grilo.git
+  url: gnome:grilo.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gsound.bst b/elements/core-deps/gsound.bst
index d9aa6d051..e61c22bcc 100644
--- a/elements/core-deps/gsound.bst
+++ b/elements/core-deps/gsound.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gsound.git
+  url: gnome:gsound.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gspell.bst b/elements/core-deps/gspell.bst
index a78fd63e7..634e64ac1 100644
--- a/elements/core-deps/gspell.bst
+++ b/elements/core-deps/gspell.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gspell.git
+  url: gnome:gspell.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/gssdp.bst b/elements/core-deps/gssdp.bst
index c16651e66..5c84b267d 100644
--- a/elements/core-deps/gssdp.bst
+++ b/elements/core-deps/gssdp.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gssdp.git
+  url: gnome:gssdp.git
   track: gssdp-1.4
 
 build-depends:
diff --git a/elements/core-deps/gtk-vnc.bst b/elements/core-deps/gtk-vnc.bst
index 776a869ff..19620f413 100644
--- a/elements/core-deps/gtk-vnc.bst
+++ b/elements/core-deps/gtk-vnc.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtk-vnc.git
+  url: gnome:gtk-vnc.git
   track: master
   submodules:
     subprojects/keycodemapdb:
       checkout: true
-      url: gitlab_com:keycodemap/keycodemapdb.git
+      url: gitlab:keycodemap/keycodemapdb.git
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/gtkmm-3.bst b/elements/core-deps/gtkmm-3.bst
index 28f5ff19d..40dba67d9 100644
--- a/elements/core-deps/gtkmm-3.bst
+++ b/elements/core-deps/gtkmm-3.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtkmm.git
+  url: gnome:gtkmm.git
   track: gtkmm-3-24
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/core-deps/gupnp-av.bst b/elements/core-deps/gupnp-av.bst
index 54d98f69f..6cb47afb3 100644
--- a/elements/core-deps/gupnp-av.bst
+++ b/elements/core-deps/gupnp-av.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gupnp-av.git
+  url: gnome:gupnp-av.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/gupnp-dlna.bst b/elements/core-deps/gupnp-dlna.bst
index 86f988709..f19205440 100644
--- a/elements/core-deps/gupnp-dlna.bst
+++ b/elements/core-deps/gupnp-dlna.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gupnp-dlna.git
+  url: gnome:gupnp-dlna.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/gupnp.bst b/elements/core-deps/gupnp.bst
index 3b8e2f210..d26712f49 100644
--- a/elements/core-deps/gupnp.bst
+++ b/elements/core-deps/gupnp.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gupnp.git
+  url: gnome:gupnp.git
   track: gupnp-1.4
 
 build-depends:
diff --git a/elements/core-deps/jsonrpc-glib.bst b/elements/core-deps/jsonrpc-glib.bst
index 1075890f4..c9d3d7286 100644
--- a/elements/core-deps/jsonrpc-glib.bst
+++ b/elements/core-deps/jsonrpc-glib.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/jsonrpc-glib.git
+  url: gnome:jsonrpc-glib.git
   track: main
 
 build-depends:
diff --git a/elements/core-deps/libcacard.bst b/elements/core-deps/libcacard.bst
index 897163b0d..07ce42aab 100644
--- a/elements/core-deps/libcacard.bst
+++ b/elements/core-deps/libcacard.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: tar
-  url: 
https://gitlab.freedesktop.org/spice/libcacard/uploads/9d8f24b131bcbbd7846727ea92952cb5/libcacard-2.8.0.tar.xz
+  url: freedesktop_files:spice/libcacard/uploads/9d8f24b131bcbbd7846727ea92952cb5/libcacard-2.8.0.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
diff --git a/elements/core-deps/libcanberra.bst b/elements/core-deps/libcanberra.bst
index 30fc4f106..4d6d3377a 100644
--- a/elements/core-deps/libcanberra.bst
+++ b/elements/core-deps/libcanberra.bst
@@ -1,16 +1,21 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: tarballs_needing_help:libcanberra-0.30.tar.xz
+  url: http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - sdk/gtk+-3.bst
 - freedesktop-sdk.bst:components/libpulse.bst
 - freedesktop-sdk.bst:components/libtool.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
 runtime-depends:
 - core-deps/xdg-sound-theme.bst
+
 public:
   bst:
     split-rules:
diff --git a/elements/core-deps/libchamplain.bst b/elements/core-deps/libchamplain.bst
index d88b5e91f..76880d56f 100644
--- a/elements/core-deps/libchamplain.bst
+++ b/elements/core-deps/libchamplain.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libchamplain.git
+  url: gnome:libchamplain.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/libcue.bst b/elements/core-deps/libcue.bst
index cf5bdb0b1..09d26f9ad 100644
--- a/elements/core-deps/libcue.bst
+++ b/elements/core-deps/libcue.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: https://github.com/lipnitsk/libcue/archive/v2.2.1.tar.gz
+  url: github_files:lipnitsk/libcue/archive/v2.2.1.tar.gz
 build-depends:
 - freedesktop-sdk.bst:components/bison.bst
 - freedesktop-sdk.bst:components/flex.bst
diff --git a/elements/core-deps/libdazzle.bst b/elements/core-deps/libdazzle.bst
index 4c5e58442..d58c384d7 100644
--- a/elements/core-deps/libdazzle.bst
+++ b/elements/core-deps/libdazzle.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libdazzle.git
+  url: gnome:libdazzle.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libgdata.bst b/elements/core-deps/libgdata.bst
index 77b9af029..65cde10ec 100644
--- a/elements/core-deps/libgdata.bst
+++ b/elements/core-deps/libgdata.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgdata.git
+  url: gnome:libgdata.git
   track: libgdata-0-18
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libgit2-glib.bst b/elements/core-deps/libgit2-glib.bst
index 2a4a3612e..b73536a49 100644
--- a/elements/core-deps/libgit2-glib.bst
+++ b/elements/core-deps/libgit2-glib.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgit2-glib.git
+  url: gnome:libgit2-glib.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libgit2.bst b/elements/core-deps/libgit2.bst
index 98ea1839a..e02c073ef 100644
--- a/elements/core-deps/libgit2.bst
+++ b/elements/core-deps/libgit2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:libgit2/libgit2/archive/v1.1.0.tar.gz
+  url: github_files:libgit2/libgit2/archive/v1.1.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/core-deps/libgnomekbd.bst b/elements/core-deps/libgnomekbd.bst
index 7814b067e..8488bd900 100644
--- a/elements/core-deps/libgnomekbd.bst
+++ b/elements/core-deps/libgnomekbd.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgnomekbd.git
+  url: gnome:libgnomekbd.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/libgphoto2.bst b/elements/core-deps/libgphoto2.bst
index a9a61d35e..e1549386b 100644
--- a/elements/core-deps/libgphoto2.bst
+++ b/elements/core-deps/libgphoto2.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz
+  url: github_files:gphoto/libgphoto2/releases/download/v2.5.27/libgphoto2-2.5.27.tar.xz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/libgsf.bst b/elements/core-deps/libgsf.bst
index 6711c337b..9e0035e39 100644
--- a/elements/core-deps/libgsf.bst
+++ b/elements/core-deps/libgsf.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgsf.git
+  url: gnome:libgsf.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libgtop.bst b/elements/core-deps/libgtop.bst
index 87b966f2c..47be265ea 100644
--- a/elements/core-deps/libgtop.bst
+++ b/elements/core-deps/libgtop.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgtop.git
+  url: gnome:libgtop.git
   track: master
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/libgusb.bst b/elements/core-deps/libgusb.bst
index 2a6b68efd..5c0f740c9 100644
--- a/elements/core-deps/libgusb.bst
+++ b/elements/core-deps/libgusb.bst
@@ -1,12 +1,15 @@
 kind: meson
+
 sources:
 - kind: tar
-  url: people_freedesktop_org:~hughsient/releases/libgusb-0.3.8.tar.xz
+  url: github_files:hughsie/libgusb/archive/refs/tags/0.3.9.tar.gz
+
 build-depends:
 - sdk/gobject-introspection.bst
 - sdk/gtk-doc.bst
 - sdk/vala.bst
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
+
 depends:
 - sdk/glib.bst
 - freedesktop-sdk.bst:components/libusb.bst
diff --git a/elements/core-deps/libgxps.bst b/elements/core-deps/libgxps.bst
index cfc1a7271..ce4ca0f21 100644
--- a/elements/core-deps/libgxps.bst
+++ b/elements/core-deps/libgxps.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgxps.git
+  url: gnome:libgxps.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/libimobiledevice.bst b/elements/core-deps/libimobiledevice.bst
index 9666d50a8..1c7e43dcc 100644
--- a/elements/core-deps/libimobiledevice.bst
+++ b/elements/core-deps/libimobiledevice.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
+  url: github_files:libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libjcat.bst b/elements/core-deps/libjcat.bst
index 565523c05..2b99c4a22 100644
--- a/elements/core-deps/libjcat.bst
+++ b/elements/core-deps/libjcat.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:hughsie/libjcat/archive/0.1.6.tar.gz
+  url: github_files:hughsie/libjcat/archive/0.1.6.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libmediaart.bst b/elements/core-deps/libmediaart.bst
index 868606c6a..2852375cc 100644
--- a/elements/core-deps/libmediaart.bst
+++ b/elements/core-deps/libmediaart.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libmediaart.git
+  url: gnome:libmediaart.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libmtp.bst b/elements/core-deps/libmtp.bst
index 4be1b7e5f..3d565881b 100644
--- a/elements/core-deps/libmtp.bst
+++ b/elements/core-deps/libmtp.bst
@@ -1,9 +1,12 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: downloads.sourceforge.net:libmtp/libmtp/1.1.18/libmtp-1.1.18.tar.gz
+  url: sourceforge:libmtp/libmtp/1.1.18/libmtp-1.1.18.tar.gz
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - freedesktop-sdk.bst:components/libusb.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/core-deps/libnma.bst b/elements/core-deps/libnma.bst
index e8bcb788a..4a0af8346 100644
--- a/elements/core-deps/libnma.bst
+++ b/elements/core-deps/libnma.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libnma.git
+  url: gnome:libnma.git
   track: main
 
 build-depends:
diff --git a/elements/core-deps/liboauth.bst b/elements/core-deps/liboauth.bst
index 8541c7019..baaee7ad5 100644
--- a/elements/core-deps/liboauth.bst
+++ b/elements/core-deps/liboauth.bst
@@ -1,12 +1,16 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: downloads.sourceforge.net:liboauth/liboauth-1.0.3.tar.gz
+  url: sourceforge:liboauth/liboauth-1.0.3.tar.gz
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - freedesktop-sdk.bst:components/nss.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
 variables:
   conf-local: >-
     --enable-nss
diff --git a/elements/core-deps/libostree.bst b/elements/core-deps/libostree.bst
index a1fd476c8..a5b2b8ec8 100644
--- a/elements/core-deps/libostree.bst
+++ b/elements/core-deps/libostree.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:ostreedev/ostree/releases/download/v2021.5/libostree-2021.5.tar.xz
+  url: github_files:ostreedev/ostree/releases/download/v2021.5/libostree-2021.5.tar.xz
 - kind: patch
   path: files/ostree/no-boot-symlink.patch
 - kind: patch
diff --git a/elements/core-deps/libpeas.bst b/elements/core-deps/libpeas.bst
index def4671d5..0c590067e 100644
--- a/elements/core-deps/libpeas.bst
+++ b/elements/core-deps/libpeas.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libpeas.git
+  url: gnome:libpeas.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/librest.bst b/elements/core-deps/librest.bst
index aa0a216dd..726f4ce31 100644
--- a/elements/core-deps/librest.bst
+++ b/elements/core-deps/librest.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/librest.git
+  url: gnome:librest.git
   track: librest-0-7
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/libsigcplusplus-2.0.bst b/elements/core-deps/libsigcplusplus-2.0.bst
index 620d64bb4..aef97c612 100644
--- a/elements/core-deps/libsigcplusplus-2.0.bst
+++ b/elements/core-deps/libsigcplusplus-2.0.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: github_com:libsigcplusplus/libsigcplusplus.git
+  url: github:libsigcplusplus/libsigcplusplus.git
   track: libsigc++-2-10
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/core-deps/libssh2.bst b/elements/core-deps/libssh2.bst
index 4b5e0c7a3..e3a525a2e 100644
--- a/elements/core-deps/libssh2.bst
+++ b/elements/core-deps/libssh2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:libssh2/libssh2/archive/libssh2-1.9.0.tar.gz
+  url: github_files:libssh2/libssh2/archive/libssh2-1.9.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/core-deps/libusbmuxd.bst b/elements/core-deps/libusbmuxd.bst
index a197d4d21..553b3e465 100644
--- a/elements/core-deps/libusbmuxd.bst
+++ b/elements/core-deps/libusbmuxd.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://github.com/libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2
+  url: github_files:libimobiledevice/libusbmuxd/releases/download/2.0.2/libusbmuxd-2.0.2.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/libxcvt.bst b/elements/core-deps/libxcvt.bst
index 9ab8484ed..af87a1370 100644
--- a/elements/core-deps/libxcvt.bst
+++ b/elements/core-deps/libxcvt.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: git_freedesktop_org:xorg/lib/libxcvt/-/archive/libxcvt-0.1.1/libxcvt-libxcvt-0.1.1.tar.bz2
+  url: freedesktop_files:xorg/lib/libxcvt/-/archive/libxcvt-0.1.1/libxcvt-libxcvt-0.1.1.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/libxklavier.bst b/elements/core-deps/libxklavier.bst
index e1000118c..4154986dd 100644
--- a/elements/core-deps/libxklavier.bst
+++ b/elements/core-deps/libxklavier.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: people_freedesktop_org:~svu/libxklavier-5.4.tar.bz2
+  url: 
freedesktop_files:archived-projects/libxklavier/-/archive/libxklavier-5.4/libxklavier-libxklavier-5.4.tar.bz2
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/lmdb.bst b/elements/core-deps/lmdb.bst
index 667a524c4..aafa77b88 100644
--- a/elements/core-deps/lmdb.bst
+++ b/elements/core-deps/lmdb.bst
@@ -15,4 +15,4 @@ config:
 
 sources:
 - kind: tar
-  url: github_com:LMDB/lmdb/archive/LMDB_0.9.28.tar.gz
+  url: github_files:LMDB/lmdb/archive/LMDB_0.9.28.tar.gz
diff --git a/elements/core-deps/mm-common.bst b/elements/core-deps/mm-common.bst
index 9d65886f1..62b9ae8ed 100644
--- a/elements/core-deps/mm-common.bst
+++ b/elements/core-deps/mm-common.bst
@@ -18,7 +18,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/mm-common.git
+  url: gnome:mm-common.git
   track: master
 - kind: local
   path: files/mm-common/libstdc++.tag
diff --git a/elements/core-deps/mobile-broadband-provider-info.bst 
b/elements/core-deps/mobile-broadband-provider-info.bst
index 7ef489521..c1008699c 100644
--- a/elements/core-deps/mobile-broadband-provider-info.bst
+++ b/elements/core-deps/mobile-broadband-provider-info.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/mobile-broadband-provider-info.git
+  url: gnome:mobile-broadband-provider-info.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/libxslt.bst
diff --git a/elements/core-deps/mogwai.bst b/elements/core-deps/mogwai.bst
index 3c2a58143..d4e45c714 100644
--- a/elements/core-deps/mogwai.bst
+++ b/elements/core-deps/mogwai.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: github_com:endlessm/mogwai/archive/Release_3.9.4.tar.gz
+  url: github_files:endlessm/mogwai/archive/Release_3.9.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/pangomm-1.4.bst b/elements/core-deps/pangomm-1.4.bst
index 66c837cb5..54eece7a6 100644
--- a/elements/core-deps/pangomm-1.4.bst
+++ b/elements/core-deps/pangomm-1.4.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/pangomm.git
+  url: gnome:pangomm.git
   track: pangomm-2-46
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/core-deps/phodav.bst b/elements/core-deps/phodav.bst
index 454b83cc9..cbb9c2c12 100644
--- a/elements/core-deps/phodav.bst
+++ b/elements/core-deps/phodav.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/phodav.git
+  url: gnome:phodav.git
   track: master
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/plist.bst b/elements/core-deps/plist.bst
index 33bcdc1bf..521811de5 100644
--- a/elements/core-deps/plist.bst
+++ b/elements/core-deps/plist.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://github.com/libimobiledevice/libplist/releases/download/2.2.0/libplist-2.2.0.tar.bz2
+  url: github_files:libimobiledevice/libplist/releases/download/2.2.0/libplist-2.2.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/power-profiles-daemon.bst b/elements/core-deps/power-profiles-daemon.bst
index b71a482b9..877f64e95 100644
--- a/elements/core-deps/power-profiles-daemon.bst
+++ b/elements/core-deps/power-profiles-daemon.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: 
git_freedesktop_org:hadess/power-profiles-daemon/uploads/329f1ed3b068f6c59b8441f01a4e711a/power-profiles-daemon-0.8.1.tar.xz
+  url: 
freedesktop_files:hadess/power-profiles-daemon/uploads/329f1ed3b068f6c59b8441f01a4e711a/power-profiles-daemon-0.8.1.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/protobuf-c.bst b/elements/core-deps/protobuf-c.bst
index e3fe5aee2..5723a184a 100644
--- a/elements/core-deps/protobuf-c.bst
+++ b/elements/core-deps/protobuf-c.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz
+  url: github_files:protobuf-c/protobuf-c/releases/download/v1.4.0/protobuf-c-1.4.0.tar.gz
 
 depends:
 - core-deps/protobuf.bst
diff --git a/elements/core-deps/protobuf.bst b/elements/core-deps/protobuf.bst
index 7f6ef8287..4d94601df 100644
--- a/elements/core-deps/protobuf.bst
+++ b/elements/core-deps/protobuf.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz
+  url: github_files:protocolbuffers/protobuf/releases/download/v3.15.8/protobuf-all-3.15.8.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-setuptools.bst
diff --git a/elements/core-deps/pyatspi.bst b/elements/core-deps/pyatspi.bst
index e5218a6c9..9b8bae722 100644
--- a/elements/core-deps/pyatspi.bst
+++ b/elements/core-deps/pyatspi.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/pyatspi2.git
+  url: gnome:pyatspi2.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/python3.bst
diff --git a/elements/core-deps/rpcsvc-proto.bst b/elements/core-deps/rpcsvc-proto.bst
index 68fff49a7..0dc1cec94 100644
--- a/elements/core-deps/rpcsvc-proto.bst
+++ b/elements/core-deps/rpcsvc-proto.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:thkukuk/rpcsvc-proto/archive/v1.4.2.tar.gz
+  url: github_files:thkukuk/rpcsvc-proto/archive/v1.4.2.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/core-deps/sane-backends.bst b/elements/core-deps/sane-backends.bst
index 874effeee..2b224c53f 100644
--- a/elements/core-deps/sane-backends.bst
+++ b/elements/core-deps/sane-backends.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz
+  url: 
gitlab_files:sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/sane-backends-1.0.32.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3.bst
diff --git a/elements/core-deps/sofia-sip.bst b/elements/core-deps/sofia-sip.bst
index ae0aaad53..0fa58f926 100644
--- a/elements/core-deps/sofia-sip.bst
+++ b/elements/core-deps/sofia-sip.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:freeswitch/sofia-sip/archive/refs/tags/v1.13.4.tar.gz
+  url: github_files:freeswitch/sofia-sip/archive/refs/tags/v1.13.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/speech-dispatcher.bst b/elements/core-deps/speech-dispatcher.bst
index b4f2d8db5..323c4f9eb 100644
--- a/elements/core-deps/speech-dispatcher.bst
+++ b/elements/core-deps/speech-dispatcher.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:brailcom/speechd/releases/download/0.11.0/speech-dispatcher-0.11.0.tar.gz
+  url: github_files:brailcom/speechd/releases/download/0.11.0/speech-dispatcher-0.11.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/texinfo.bst
diff --git a/elements/core-deps/system-config-printer.bst b/elements/core-deps/system-config-printer.bst
index 56b7c9183..8a425b4ee 100644
--- a/elements/core-deps/system-config-printer.bst
+++ b/elements/core-deps/system-config-printer.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://github.com/OpenPrinting/system-config-printer/releases/download/v1.5.15/system-config-printer-1.5.15.tar.xz
+  url: 
github_files:OpenPrinting/system-config-printer/releases/download/v1.5.15/system-config-printer-1.5.15.tar.xz
 
 build-depends:
 - core-deps/intltool.bst
diff --git a/elements/core-deps/template-glib.bst b/elements/core-deps/template-glib.bst
index 4950c14ad..12c900350 100644
--- a/elements/core-deps/template-glib.bst
+++ b/elements/core-deps/template-glib.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/template-glib.git
+  url: gnome:template-glib.git
   track: main
 
 build-depends:
diff --git a/elements/core-deps/totem-pl-parser.bst b/elements/core-deps/totem-pl-parser.bst
index 546664994..5ccc161b5 100644
--- a/elements/core-deps/totem-pl-parser.bst
+++ b/elements/core-deps/totem-pl-parser.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/totem-pl-parser.git
+  url: gnome:totem-pl-parser.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/tracker-miners.bst b/elements/core-deps/tracker-miners.bst
index 68bae8d65..99c394ec3 100644
--- a/elements/core-deps/tracker-miners.bst
+++ b/elements/core-deps/tracker-miners.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/tracker-miners.git
+  url: gnome:tracker-miners.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/asciidoc.bst
diff --git a/elements/core-deps/udisks2.bst b/elements/core-deps/udisks2.bst
index 8d7ab43e2..c5cb78ff1 100644
--- a/elements/core-deps/udisks2.bst
+++ b/elements/core-deps/udisks2.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
+  url: github_files:storaged-project/udisks/releases/download/udisks-2.9.2/udisks-2.9.2.tar.bz2
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/upower.bst b/elements/core-deps/upower.bst
index 5e9375446..4bc5aa3b4 100644
--- a/elements/core-deps/upower.bst
+++ b/elements/core-deps/upower.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
https://gitlab.freedesktop.org/upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz
+  url: freedesktop_files:upower/upower/uploads/177df5b9f9b76f25a2ad9da41aa0c1fa/upower-0.99.13.tar.xz
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core-deps/virglrenderer.bst b/elements/core-deps/virglrenderer.bst
index 714064c21..0eb2658e7 100644
--- a/elements/core-deps/virglrenderer.bst
+++ b/elements/core-deps/virglrenderer.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: 
https://gitlab.freedesktop.org/virgl/virglrenderer/-/archive/virglrenderer-0.9.1/virglrenderer-virglrenderer-0.9.1.tar.bz2
+  url: 
freedesktop_files:virgl/virglrenderer/-/archive/virglrenderer-0.9.1/virglrenderer-virglrenderer-0.9.1.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core-deps/vte.bst b/elements/core-deps/vte.bst
index 75b61dc5a..a06f04cdb 100644
--- a/elements/core-deps/vte.bst
+++ b/elements/core-deps/vte.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/vte.git
+  url: gnome:vte.git
   track: master
 
 build-depends:
diff --git a/elements/core-deps/xdg-desktop-portal-gnome.bst b/elements/core-deps/xdg-desktop-portal-gnome.bst
index c8da5d213..475eb8a07 100644
--- a/elements/core-deps/xdg-desktop-portal-gnome.bst
+++ b/elements/core-deps/xdg-desktop-portal-gnome.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git
-  url: gitlab_gnome_org:GNOME/xdg-desktop-portal-gnome.git
+  url: gnome:xdg-desktop-portal-gnome.git
   track: main
 
 build-depends:
diff --git a/elements/core-deps/xdg-desktop-portal-gtk.bst b/elements/core-deps/xdg-desktop-portal-gtk.bst
index e723e11eb..8cfd636ce 100644
--- a/elements/core-deps/xdg-desktop-portal-gtk.bst
+++ b/elements/core-deps/xdg-desktop-portal-gtk.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: 
github_com:flatpak/xdg-desktop-portal-gtk/releases/download/1.10.0/xdg-desktop-portal-gtk-1.10.0.tar.xz
+  url: 
github_files:flatpak/xdg-desktop-portal-gtk/releases/download/1.10.0/xdg-desktop-portal-gtk-1.10.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/xdg-sound-theme.bst b/elements/core-deps/xdg-sound-theme.bst
index f162f55ed..78be880c9 100644
--- a/elements/core-deps/xdg-sound-theme.bst
+++ b/elements/core-deps/xdg-sound-theme.bst
@@ -2,9 +2,9 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: people_freedesktop_org:~mccann/dist/sound-theme-freedesktop-0.8.tar.bz2
+  url: freedesktop_files:xdg/xdg-sound-theme/-/archive/0.8/xdg-sound-theme-0.8.tar.bz2
 
 build-depends:
-- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
-- sdk/glib.bst
 - core-deps/intltool.bst
+- sdk/glib.bst
+- freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core-deps/xmlb.bst b/elements/core-deps/xmlb.bst
index 48d444409..6b2e9d95d 100644
--- a/elements/core-deps/xmlb.bst
+++ b/elements/core-deps/xmlb.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://github.com/hughsie/libxmlb/archive/0.3.2.tar.gz
+  url: github_files:hughsie/libxmlb/archive/0.3.2.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core-deps/zenity.bst b/elements/core-deps/zenity.bst
index f5fff50ff..94444bc1e 100644
--- a/elements/core-deps/zenity.bst
+++ b/elements/core-deps/zenity.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/zenity.git
+  url: gnome:zenity.git
   track: master
 build-depends:
 - sdk/yelp-tools.bst
diff --git a/elements/core/baobab.bst b/elements/core/baobab.bst
index 19455f8f7..c0dc88664 100644
--- a/elements/core/baobab.bst
+++ b/elements/core/baobab.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/baobab.git
+  url: gnome:baobab.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/calls.bst b/elements/core/calls.bst
index 31fd5296a..04131ce45 100644
--- a/elements/core/calls.bst
+++ b/elements/core/calls.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git
-  url: gitlab_gnome_org:GNOME/calls.git
+  url: gnome:calls.git
   track: master
 
 build-depends:
diff --git a/elements/core/cheese.bst b/elements/core/cheese.bst
index 7baef4c1b..dce159ea9 100644
--- a/elements/core/cheese.bst
+++ b/elements/core/cheese.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/cheese.git
+  url: gnome:cheese.git
   track: master
 
 build-depends:
diff --git a/elements/core/dconf-editor.bst b/elements/core/dconf-editor.bst
index 43b281b30..299b53dd7 100644
--- a/elements/core/dconf-editor.bst
+++ b/elements/core/dconf-editor.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/dconf-editor.git
+  url: gnome:dconf-editor.git
   track: master
 
 build-depends:
diff --git a/elements/core/devhelp.bst b/elements/core/devhelp.bst
index 3140e9b65..7fa48251f 100644
--- a/elements/core/devhelp.bst
+++ b/elements/core/devhelp.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/devhelp.git
+  url: gnome:devhelp.git
   track: main
 
 build-depends:
diff --git a/elements/core/eog.bst b/elements/core/eog.bst
index b813cdacb..1a1771432 100644
--- a/elements/core/eog.bst
+++ b/elements/core/eog.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/eog.git
+  url: gnome:eog.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/core/epiphany.bst b/elements/core/epiphany.bst
index 13144ac11..150c2e516 100644
--- a/elements/core/epiphany.bst
+++ b/elements/core/epiphany.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/epiphany.git
+  url: gnome:epiphany.git
   track: master
 
 build-depends:
diff --git a/elements/core/evince.bst b/elements/core/evince.bst
index fdb9672fc..6f15ee6a4 100644
--- a/elements/core/evince.bst
+++ b/elements/core/evince.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/evince.git
+  url: gnome:evince.git
   track: main
 
 build-depends:
diff --git a/elements/core/gdm.bst b/elements/core/gdm.bst
index e22af4c03..f6ab2cd33 100644
--- a/elements/core/gdm.bst
+++ b/elements/core/gdm.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gdm.git
+  url: gnome:gdm.git
   track: main
 - kind: local
   path: files/gdm
diff --git a/elements/core/gnome-backgrounds.bst b/elements/core/gnome-backgrounds.bst
index 2bc4f3b4a..ea05a2c9a 100644
--- a/elements/core/gnome-backgrounds.bst
+++ b/elements/core/gnome-backgrounds.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-backgrounds.git
+  url: gnome:gnome-backgrounds.git
   track: main
 
 build-depends:
diff --git a/elements/core/gnome-bluetooth-1.0.bst b/elements/core/gnome-bluetooth-1.0.bst
index bf75edfc5..fd9f1f0b3 100644
--- a/elements/core/gnome-bluetooth-1.0.bst
+++ b/elements/core/gnome-bluetooth-1.0.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-bluetooth.git
+  url: gnome:gnome-bluetooth.git
   track: gnome-3-34
 
 build-depends:
diff --git a/elements/core/gnome-bluetooth.bst b/elements/core/gnome-bluetooth.bst
index f38b2b8b7..e9a0a77f5 100644
--- a/elements/core/gnome-bluetooth.bst
+++ b/elements/core/gnome-bluetooth.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-bluetooth.git
+  url: gnome:gnome-bluetooth.git
   track: master
 - kind: patch
   path: files/gnome-bluetooth/0001-docs-use-gnomebt_api_name-for-the-gtk-doc-module-nam.patch
diff --git a/elements/core/gnome-boxes.bst b/elements/core/gnome-boxes.bst
index cab98a661..bce87763d 100644
--- a/elements/core/gnome-boxes.bst
+++ b/elements/core/gnome-boxes.bst
@@ -2,15 +2,15 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-boxes.git
+  url: gnome:gnome-boxes.git
   track: master
   submodules:
     subprojects/gtk-frdp:
       checkout: true
-      url: gitlab_gnome_org:GNOME/gtk-frdp.git
+      url: gnome:gtk-frdp.git
     subprojects/libovf-glib:
       checkout: true
-      url: gitlab_gnome_org:felipeborges/libovf-glib.git
+      url: gnome_gitlab:felipeborges/libovf-glib.git
 - kind: patch
   path: files/gnome-boxes/re-order-recommended.patch
 
diff --git a/elements/core/gnome-builder.bst b/elements/core/gnome-builder.bst
index c6ca4f5bc..1cb35e3c6 100644
--- a/elements/core/gnome-builder.bst
+++ b/elements/core/gnome-builder.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-builder.git
+  url: gnome:gnome-builder.git
   track: main
 
 build-depends:
diff --git a/elements/core/gnome-calculator.bst b/elements/core/gnome-calculator.bst
index 6b29d290d..edaadbfc8 100644
--- a/elements/core/gnome-calculator.bst
+++ b/elements/core/gnome-calculator.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-calculator.git
+  url: gnome:gnome-calculator.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/gnome-calendar.bst b/elements/core/gnome-calendar.bst
index 94ce356f0..1e92cafa8 100644
--- a/elements/core/gnome-calendar.bst
+++ b/elements/core/gnome-calendar.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-calendar.git
+  url: gnome:gnome-calendar.git
   track: master
 
 build-depends:
diff --git a/elements/core/gnome-characters.bst b/elements/core/gnome-characters.bst
index e0fd07494..89e1f7b9b 100644
--- a/elements/core/gnome-characters.bst
+++ b/elements/core/gnome-characters.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-characters.git
+  url: gnome:gnome-characters.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/gnome-clocks.bst b/elements/core/gnome-clocks.bst
index e47563cb8..fbe7b0bdb 100644
--- a/elements/core/gnome-clocks.bst
+++ b/elements/core/gnome-clocks.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-clocks.git
+  url: gnome:gnome-clocks.git
   track: master
 build-depends:
 - sdk/vala.bst
diff --git a/elements/core/gnome-color-manager.bst b/elements/core/gnome-color-manager.bst
index 319a1e606..5d97366f9 100644
--- a/elements/core/gnome-color-manager.bst
+++ b/elements/core/gnome-color-manager.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-color-manager.git
+  url: gnome:gnome-color-manager.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/gnome-connections.bst b/elements/core/gnome-connections.bst
index 1e1bd2a8d..f99a8316e 100644
--- a/elements/core/gnome-connections.bst
+++ b/elements/core/gnome-connections.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/connections.git
+  url: gnome:connections.git
   track: master
   submodules:
     subprojects/gtk-frdp:
       checkout: true
-      url: gitlab_gnome_org:GNOME/gtk-frdp.git
+      url: gnome:gtk-frdp.git
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/core/gnome-console.bst b/elements/core/gnome-console.bst
index c3c36d423..afe216bfe 100644
--- a/elements/core/gnome-console.bst
+++ b/elements/core/gnome-console.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/console.git
+  url: gnome:console.git
   track: main
 
 build-depends:
diff --git a/elements/core/gnome-contacts.bst b/elements/core/gnome-contacts.bst
index df27aac1f..1c8e2eea9 100644
--- a/elements/core/gnome-contacts.bst
+++ b/elements/core/gnome-contacts.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-contacts.git
+  url: gnome:gnome-contacts.git
   track: master
 build-depends:
 - sdk/vala.bst
diff --git a/elements/core/gnome-control-center.bst b/elements/core/gnome-control-center.bst
index cbc2697c5..e3d336d60 100644
--- a/elements/core/gnome-control-center.bst
+++ b/elements/core/gnome-control-center.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-control-center.git
+  url: gnome:gnome-control-center.git
   track: master
   submodules:
     subprojects/gvc:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgnome-volume-control.git
+      url: gnome:libgnome-volume-control.git
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/core/gnome-desktop.bst b/elements/core/gnome-desktop.bst
index cac2db608..4bad36094 100644
--- a/elements/core/gnome-desktop.bst
+++ b/elements/core/gnome-desktop.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-desktop.git
+  url: gnome:gnome-desktop.git
   track: master
 
 build-depends:
diff --git a/elements/core/gnome-disk-utility.bst b/elements/core/gnome-disk-utility.bst
index c1490065a..922aa219f 100644
--- a/elements/core/gnome-disk-utility.bst
+++ b/elements/core/gnome-disk-utility.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-disk-utility.git
+  url: gnome:gnome-disk-utility.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/gnome-font-viewer.bst b/elements/core/gnome-font-viewer.bst
index bf1d29eb0..6ee2cccd7 100644
--- a/elements/core/gnome-font-viewer.bst
+++ b/elements/core/gnome-font-viewer.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-font-viewer.git
+  url: gnome:gnome-font-viewer.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core/gnome-initial-setup.bst b/elements/core/gnome-initial-setup.bst
index d008e4077..9e930700a 100644
--- a/elements/core/gnome-initial-setup.bst
+++ b/elements/core/gnome-initial-setup.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-initial-setup.git
+  url: gnome:gnome-initial-setup.git
   track: master
 - kind: local
   path: files/gnome-initial-setup
diff --git a/elements/core/gnome-keyring.bst b/elements/core/gnome-keyring.bst
index 47169a173..442aa033d 100644
--- a/elements/core/gnome-keyring.bst
+++ b/elements/core/gnome-keyring.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-keyring.git
+  url: gnome:gnome-keyring.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/docbook-xsl.bst
diff --git a/elements/core/gnome-logs.bst b/elements/core/gnome-logs.bst
index 1c02fed16..8a7945bf0 100644
--- a/elements/core/gnome-logs.bst
+++ b/elements/core/gnome-logs.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-logs.git
+  url: gnome:gnome-logs.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/gnome-maps.bst b/elements/core/gnome-maps.bst
index c149b5f9e..31c8e8fa6 100644
--- a/elements/core/gnome-maps.bst
+++ b/elements/core/gnome-maps.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-maps.git
+  url: gnome:gnome-maps.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core/gnome-menus.bst b/elements/core/gnome-menus.bst
index 20bd3b11e..9bc7cb094 100644
--- a/elements/core/gnome-menus.bst
+++ b/elements/core/gnome-menus.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-menus.git
+  url: gnome:gnome-menus.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core/gnome-music.bst b/elements/core/gnome-music.bst
index 920f5b370..e947b32ac 100644
--- a/elements/core/gnome-music.bst
+++ b/elements/core/gnome-music.bst
@@ -2,15 +2,15 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-music.git
+  url: gnome:gnome-music.git
   track: master
   submodules:
     subprojects/gfm:
       checkout: true
-      url: gitlab_gnome_org:mschraal/gfm.git
+      url: gnome_gitlab:mschraal/gfm.git
     subprojects/shared-modules:
       checkout: false
-      url: github_com:flathub/shared-modules.git
+      url: github:flathub/shared-modules.git
 
 build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/core/gnome-photos.bst b/elements/core/gnome-photos.bst
index 39dfc5700..bc76761fd 100644
--- a/elements/core/gnome-photos.bst
+++ b/elements/core/gnome-photos.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-photos.git
+  url: gnome:gnome-photos.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
 
 build-depends:
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
diff --git a/elements/core/gnome-remote-desktop.bst b/elements/core/gnome-remote-desktop.bst
index 8a4c508d9..d3722d3f9 100644
--- a/elements/core/gnome-remote-desktop.bst
+++ b/elements/core/gnome-remote-desktop.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-remote-desktop.git
+  url: gnome:gnome-remote-desktop.git
   track: master
 
 build-depends:
diff --git a/elements/core/gnome-screenshot.bst b/elements/core/gnome-screenshot.bst
index 093ad7f0d..b52f95120 100644
--- a/elements/core/gnome-screenshot.bst
+++ b/elements/core/gnome-screenshot.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-screenshot.git
+  url: gnome:gnome-screenshot.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/gnome-session.bst b/elements/core/gnome-session.bst
index 1705cc9ac..bb51d21cf 100644
--- a/elements/core/gnome-session.bst
+++ b/elements/core/gnome-session.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-session.git
+  url: gnome:gnome-session.git
   track: main
 
 build-depends:
diff --git a/elements/core/gnome-settings-daemon.bst b/elements/core/gnome-settings-daemon.bst
index 3f9113014..43e9332cd 100644
--- a/elements/core/gnome-settings-daemon.bst
+++ b/elements/core/gnome-settings-daemon.bst
@@ -1,12 +1,12 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-settings-daemon.git
+  url: gnome:gnome-settings-daemon.git
   track: master
   submodules:
     subprojects/gvc:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgnome-volume-control.git
+      url: gnome:libgnome-volume-control.git
 
 build-depends:
 - freedesktop-sdk.bst:components/perl.bst
diff --git a/elements/core/gnome-shell-extensions.bst b/elements/core/gnome-shell-extensions.bst
index 16054b9b0..6f32f10c7 100644
--- a/elements/core/gnome-shell-extensions.bst
+++ b/elements/core/gnome-shell-extensions.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-shell-extensions.git
+  url: gnome:gnome-shell-extensions.git
   track: main
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/core/gnome-shell.bst b/elements/core/gnome-shell.bst
index 30b0625c7..7da5dd641 100644
--- a/elements/core/gnome-shell.bst
+++ b/elements/core/gnome-shell.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-shell.git
+  url: gnome:gnome-shell.git
   track: main
   submodules:
     subprojects/gvc:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgnome-volume-control.git
+      url: gnome:libgnome-volume-control.git
 
 build-depends:
 - sdk-deps/sassc.bst
diff --git a/elements/core/gnome-software.bst b/elements/core/gnome-software.bst
index dd635cf78..5a15f8864 100644
--- a/elements/core/gnome-software.bst
+++ b/elements/core/gnome-software.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-software.git
+  url: gnome:gnome-software.git
   track: main
 
 build-depends:
diff --git a/elements/core/gnome-system-monitor.bst b/elements/core/gnome-system-monitor.bst
index 516e79360..a649e3787 100644
--- a/elements/core/gnome-system-monitor.bst
+++ b/elements/core/gnome-system-monitor.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-system-monitor.git
+  url: gnome:gnome-system-monitor.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/core/gnome-text-editor.bst b/elements/core/gnome-text-editor.bst
index 94406016c..fef2a6c35 100644
--- a/elements/core/gnome-text-editor.bst
+++ b/elements/core/gnome-text-editor.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-text-editor.git
+  url: gnome:gnome-text-editor.git
   track: main
 
 build-depends:
diff --git a/elements/core/gnome-tour.bst b/elements/core/gnome-tour.bst
index f87cb4c0c..be42903f4 100644
--- a/elements/core/gnome-tour.bst
+++ b/elements/core/gnome-tour.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-tour.git
+  url: gnome:gnome-tour.git
   track: master
 - kind: cargo
 build-depends:
diff --git a/elements/core/gnome-user-docs.bst b/elements/core/gnome-user-docs.bst
index a937ff573..8e7882f1e 100644
--- a/elements/core/gnome-user-docs.bst
+++ b/elements/core/gnome-user-docs.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-user-docs.git
+  url: gnome:gnome-user-docs.git
   track: master
 build-depends:
 - sdk/yelp-tools.bst
diff --git a/elements/core/gnome-user-share.bst b/elements/core/gnome-user-share.bst
index 046655f0e..6d0c43b95 100644
--- a/elements/core/gnome-user-share.bst
+++ b/elements/core/gnome-user-share.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-user-share.git
+  url: gnome:gnome-user-share.git
   track: master
 
 build-depends:
diff --git a/elements/core/gnome-weather.bst b/elements/core/gnome-weather.bst
index 68fbe7d42..323f3bcdd 100644
--- a/elements/core/gnome-weather.bst
+++ b/elements/core/gnome-weather.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-weather.git
+  url: gnome:gnome-weather.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/core/mutter.bst b/elements/core/mutter.bst
index 75e3c52c4..eca7e3be9 100644
--- a/elements/core/mutter.bst
+++ b/elements/core/mutter.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/mutter.git
+  url: gnome:mutter.git
   track: main
 
 build-depends:
diff --git a/elements/core/nautilus.bst b/elements/core/nautilus.bst
index 875862698..4913dd020 100644
--- a/elements/core/nautilus.bst
+++ b/elements/core/nautilus.bst
@@ -1,12 +1,12 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/nautilus.git
+  url: gnome:nautilus.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
 depends:
diff --git a/elements/core/orca.bst b/elements/core/orca.bst
index e184c6bb9..28ff7289c 100644
--- a/elements/core/orca.bst
+++ b/elements/core/orca.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/orca.git
+  url: gnome:orca.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/core/rygel.bst b/elements/core/rygel.bst
index 965331b6b..fb582677c 100644
--- a/elements/core/rygel.bst
+++ b/elements/core/rygel.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/rygel.git
+  url: gnome:rygel.git
   track: master
 
 build-depends:
diff --git a/elements/core/simple-scan.bst b/elements/core/simple-scan.bst
index 03d4cc60d..66d40c926 100644
--- a/elements/core/simple-scan.bst
+++ b/elements/core/simple-scan.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/simple-scan.git
+  url: gnome:simple-scan.git
   track: master
 build-depends:
 - sdk/vala.bst
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 3c870052a..faeb36edc 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/sushi.git
+  url: gnome:sushi.git
   track: master
 
 build-depends:
diff --git a/elements/core/sysprof.inc b/elements/core/sysprof.inc
index 4d3137738..9c995f77b 100644
--- a/elements/core/sysprof.inc
+++ b/elements/core/sysprof.inc
@@ -1,4 +1,4 @@
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/sysprof.git
+  url: gnome:sysprof.git
   track: master
diff --git a/elements/core/totem.bst b/elements/core/totem.bst
index 34059b5ef..bf3cf0be6 100644
--- a/elements/core/totem.bst
+++ b/elements/core/totem.bst
@@ -1,15 +1,15 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/totem.git
+  url: gnome:totem.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
     flatpak/shared-modules:
       checkout: false
-      url: github_com:flathub/shared-modules.git
+      url: github:flathub/shared-modules.git
 build-depends:
 - sdk/appstream-glib.bst
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 28626d767..2f8e879aa 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -1,7 +1,7 @@
 kind: junction
 sources:
 - kind: git_tag
-  url: https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
+  url: gitlab:freedesktop-sdk/freedesktop-sdk.git
   track: release/21.08
   track-tags: true
 config:
diff --git a/elements/iso/eos-installer.bst b/elements/iso/eos-installer.bst
index 628eb4960..c0d9e5779 100644
--- a/elements/iso/eos-installer.bst
+++ b/elements/iso/eos-installer.bst
@@ -6,12 +6,12 @@ sources:
 # submodules.
 # There is no tarball release of libglnx.
 - kind: git_tag
-  url: github_com:endlessm/eos-installer.git
+  url: github:endlessm/eos-installer.git
   track-tags: true
   track: Release_3.9.5
   submodules:
     ext/libglnx:
-      url: gitlab_gnome_org:GNOME/libglnx.git
+      url: gnome:libglnx.git
       checkout: true
 - kind: patch
   path: files/eos-installer/vfat-eosimages.patch
diff --git a/elements/iso/isomd5sum.bst b/elements/iso/isomd5sum.bst
index 8a08975aa..f5a839687 100644
--- a/elements/iso/isomd5sum.bst
+++ b/elements/iso/isomd5sum.bst
@@ -2,7 +2,7 @@ kind: make
 
 sources:
 - kind: tar
-  url: github_com:rhinstaller/isomd5sum/archive/1.2.3.tar.gz
+  url: github_files:rhinstaller/isomd5sum/archive/1.2.3.tar.gz
 
 depends:
 - freedesktop-sdk.bst:components/popt.bst
diff --git a/elements/sdk-deps/bubblewrap.bst b/elements/sdk-deps/bubblewrap.bst
index e46cadca1..8c2ca216f 100644
--- a/elements/sdk-deps/bubblewrap.bst
+++ b/elements/sdk-deps/bubblewrap.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
+  url: github_files:containers/bubblewrap/releases/download/v0.5.0/bubblewrap-0.5.0.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/gi-docgen.bst b/elements/sdk-deps/gi-docgen.bst
index b17a0b63f..1178a17b6 100644
--- a/elements/sdk-deps/gi-docgen.bst
+++ b/elements/sdk-deps/gi-docgen.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gi-docgen.git
+  url: gnome:gi-docgen.git
   track: main
 
 build-depends:
diff --git a/elements/sdk-deps/gvfs.bst b/elements/sdk-deps/gvfs.bst
index 253b5a00a..ae4bf15b2 100644
--- a/elements/sdk-deps/gvfs.bst
+++ b/elements/sdk-deps/gvfs.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gvfs.git
+  url: gnome:gvfs.git
   track: master
 
 build-depends:
diff --git a/elements/sdk-deps/ibus.bst b/elements/sdk-deps/ibus.bst
index 84aa48725..6ab6e97c5 100644
--- a/elements/sdk-deps/ibus.bst
+++ b/elements/sdk-deps/ibus.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:ibus/ibus/releases/download/1.5.25/ibus-1.5.25.tar.gz
+  url: github_files:ibus/ibus/releases/download/1.5.25/ibus-1.5.25.tar.gz
 
 build-depends:
 - sdk/vala.bst
diff --git a/elements/sdk-deps/libsass.bst b/elements/sdk-deps/libsass.bst
index 000c7308c..df1716500 100644
--- a/elements/sdk-deps/libsass.bst
+++ b/elements/sdk-deps/libsass.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: https://github.com/sass/libsass/archive/3.6.4.tar.gz
+  url: github_files:sass/libsass/archive/3.6.4.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/python-smartypants.bst b/elements/sdk-deps/python-smartypants.bst
index fad3d8f34..d90ad292d 100644
--- a/elements/sdk-deps/python-smartypants.bst
+++ b/elements/sdk-deps/python-smartypants.bst
@@ -2,7 +2,7 @@ kind: pip
 
 sources:
 - kind: tar
-  url: github_com:leohemsted/smartypants.py/archive/refs/tags/v2.0.1.tar.gz
+  url: github_files:leohemsted/smartypants.py/archive/refs/tags/v2.0.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/python3-pip.bst
diff --git a/elements/sdk-deps/sassc.bst b/elements/sdk-deps/sassc.bst
index 46e768abd..c65cbe786 100644
--- a/elements/sdk-deps/sassc.bst
+++ b/elements/sdk-deps/sassc.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:sass/sassc/archive/refs/tags/3.6.1.tar.gz
+  url: github_files:sass/sassc/archive/refs/tags/3.6.1.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk-deps/xdg-dbus-proxy.bst b/elements/sdk-deps/xdg-dbus-proxy.bst
index 6638c56c6..72b7a5ab3 100644
--- a/elements/sdk-deps/xdg-dbus-proxy.bst
+++ b/elements/sdk-deps/xdg-dbus-proxy.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
+  url: github_files:flatpak/xdg-dbus-proxy/releases/download/0.1.2/xdg-dbus-proxy-0.1.2.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk/adobe-source-code-pro-fonts.bst b/elements/sdk/adobe-source-code-pro-fonts.bst
index 329900094..9869a9305 100644
--- a/elements/sdk/adobe-source-code-pro-fonts.bst
+++ b/elements/sdk/adobe-source-code-pro-fonts.bst
@@ -17,7 +17,7 @@ config:
 
 sources:
 - kind: tar
-  url: github_com:adobe-fonts/source-code-pro/archive/2.010R-ro/1.030R-it.tar.gz
+  url: github_files:adobe-fonts/source-code-pro/archive/2.010R-ro/1.030R-it.tar.gz
 - kind: local
   path: files/font-conf/adobe-source-code-pro.conf
   directory: config
diff --git a/elements/sdk/adwaita-icon-theme.bst b/elements/sdk/adwaita-icon-theme.bst
index 660485f22..890e07859 100644
--- a/elements/sdk/adwaita-icon-theme.bst
+++ b/elements/sdk/adwaita-icon-theme.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/adwaita-icon-theme.git
+  url: gnome:adwaita-icon-theme.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk/appstream-glib.bst b/elements/sdk/appstream-glib.bst
index e829ef05e..102c12504 100644
--- a/elements/sdk/appstream-glib.bst
+++ b/elements/sdk/appstream-glib.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: github_com:hughsie/appstream-glib.git
+  url: github:hughsie/appstream-glib.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/at-spi2-atk.bst b/elements/sdk/at-spi2-atk.bst
index 143ed4242..c59fd6876 100644
--- a/elements/sdk/at-spi2-atk.bst
+++ b/elements/sdk/at-spi2-atk.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/at-spi2-atk.git
+  url: gnome:at-spi2-atk.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/libxml2.bst
diff --git a/elements/sdk/at-spi2-core.bst b/elements/sdk/at-spi2-core.bst
index f7279096c..0144dc3c7 100644
--- a/elements/sdk/at-spi2-core.bst
+++ b/elements/sdk/at-spi2-core.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/at-spi2-core.git
+  url: gnome:at-spi2-core.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/atk.bst b/elements/sdk/atk.bst
index d99da0259..567515811 100644
--- a/elements/sdk/atk.bst
+++ b/elements/sdk/atk.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/atk.git
+  url: gnome:atk.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/enchant-2.bst b/elements/sdk/enchant-2.bst
index 9bc37ae81..d0053f4d3 100644
--- a/elements/sdk/enchant-2.bst
+++ b/elements/sdk/enchant-2.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz
+  url: github_files:AbiWord/enchant/releases/download/v2.2.15/enchant-2.2.15.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/sdk/fcitx.bst b/elements/sdk/fcitx.bst
index e00be2895..55c783a7e 100644
--- a/elements/sdk/fcitx.bst
+++ b/elements/sdk/fcitx.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:fcitx/fcitx5-gtk/archive/5.0.10.tar.gz
+  url: github_files:fcitx/fcitx5-gtk/archive/5.0.10.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/extra-cmake-modules.bst
diff --git a/elements/sdk/gcab.bst b/elements/sdk/gcab.bst
index db67d407d..3f5ad5c5c 100644
--- a/elements/sdk/gcab.bst
+++ b/elements/sdk/gcab.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gcab.git
+  url: gnome:gcab.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/gcr.bst b/elements/sdk/gcr.bst
index 5ad6791ee..cc7fa48a5 100644
--- a/elements/sdk/gcr.bst
+++ b/elements/sdk/gcr.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gcr.git
+  url: gnome:gcr.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/gdk-pixbuf.bst b/elements/sdk/gdk-pixbuf.bst
index ce5e82bac..65731c41f 100644
--- a/elements/sdk/gdk-pixbuf.bst
+++ b/elements/sdk/gdk-pixbuf.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gdk-pixbuf.git
+  url: gnome:gdk-pixbuf.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/geoclue.bst b/elements/sdk/geoclue.bst
index cd978156e..6b0933c1f 100644
--- a/elements/sdk/geoclue.bst
+++ b/elements/sdk/geoclue.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.gz
+  url: freedesktop_files:geoclue/geoclue/-/archive/2.5.7/geoclue-2.5.7.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/gjs.bst b/elements/sdk/gjs.bst
index 191a45c3d..d0299457e 100644
--- a/elements/sdk/gjs.bst
+++ b/elements/sdk/gjs.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gjs.git
+  url: gnome:gjs.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/glib-networking.bst b/elements/sdk/glib-networking.bst
index 2655da7bb..3afc6aa60 100644
--- a/elements/sdk/glib-networking.bst
+++ b/elements/sdk/glib-networking.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/glib-networking.git
+  url: gnome:glib-networking.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/sdk/glib.bst b/elements/sdk/glib.bst
index b2f59d146..6b1f140ff 100644
--- a/elements/sdk/glib.bst
+++ b/elements/sdk/glib.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/glib.git
+  url: gnome:glib.git
   track: main
 
 build-depends:
diff --git a/elements/sdk/gobject-introspection.bst b/elements/sdk/gobject-introspection.bst
index 343b28106..1f7cd9558 100644
--- a/elements/sdk/gobject-introspection.bst
+++ b/elements/sdk/gobject-introspection.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gobject-introspection.git
+  url: gnome:gobject-introspection.git
   track: master
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/sdk/graphene.bst b/elements/sdk/graphene.bst
index 1421b2f58..953bc80f8 100644
--- a/elements/sdk/graphene.bst
+++ b/elements/sdk/graphene.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: github_com:ebassi/graphene.git
+  url: github:ebassi/graphene.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/gsettings-desktop-schemas.bst b/elements/sdk/gsettings-desktop-schemas.bst
index ffae7691f..b7155e554 100644
--- a/elements/sdk/gsettings-desktop-schemas.bst
+++ b/elements/sdk/gsettings-desktop-schemas.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gsettings-desktop-schemas.git
+  url: gnome:gsettings-desktop-schemas.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/gtk+-3.bst b/elements/sdk/gtk+-3.bst
index 6dd22765b..b421978c3 100644
--- a/elements/sdk/gtk+-3.bst
+++ b/elements/sdk/gtk+-3.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtk.git
+  url: gnome:gtk.git
   track: gtk-3-24
 - kind: patch
   path: files/gtk3-werror.patch
diff --git a/elements/sdk/gtk-doc.bst b/elements/sdk/gtk-doc.bst
index ac03b2724..38be2d699 100644
--- a/elements/sdk/gtk-doc.bst
+++ b/elements/sdk/gtk-doc.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtk-doc.git
+  url: gnome:gtk-doc.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/sdk/gtk.bst b/elements/sdk/gtk.bst
index fdf811940..e83508745 100644
--- a/elements/sdk/gtk.bst
+++ b/elements/sdk/gtk.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtk.git
+  url: gnome:gtk.git
   track: main
 
 build-depends:
diff --git a/elements/sdk/gtksourceview-4.bst b/elements/sdk/gtksourceview-4.bst
index 7bd93d5c1..dd7f6dcfd 100644
--- a/elements/sdk/gtksourceview-4.bst
+++ b/elements/sdk/gtksourceview-4.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtksourceview.git
+  url: gnome:gtksourceview.git
   track: 'gtksourceview-4-8'
 
 build-depends:
diff --git a/elements/sdk/gtksourceview.bst b/elements/sdk/gtksourceview.bst
index 3ef8c3749..f3437593f 100644
--- a/elements/sdk/gtksourceview.bst
+++ b/elements/sdk/gtksourceview.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtksourceview.git
+  url: gnome:gtksourceview.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/json-glib.bst b/elements/sdk/json-glib.bst
index f12cbfc34..380ca6b86 100644
--- a/elements/sdk/json-glib.bst
+++ b/elements/sdk/json-glib.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/json-glib.git
+  url: gnome:json-glib.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/libadwaita.bst b/elements/sdk/libadwaita.bst
index 1d002c20b..cd3f65e94 100644
--- a/elements/sdk/libadwaita.bst
+++ b/elements/sdk/libadwaita.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libadwaita.git
+  url: gnome:libadwaita.git
   track: main
 
 build-depends:
diff --git a/elements/sdk/libgee.bst b/elements/sdk/libgee.bst
index 04a65e85d..da480b14b 100644
--- a/elements/sdk/libgee.bst
+++ b/elements/sdk/libgee.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgee.git
+  url: gnome:libgee.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/libhandy.bst b/elements/sdk/libhandy.bst
index a6ee525cd..f70cb3a6e 100644
--- a/elements/sdk/libhandy.bst
+++ b/elements/sdk/libhandy.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libhandy.git
+  url: gnome:libhandy.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/libmanette.bst b/elements/sdk/libmanette.bst
index 7a7755d64..c1acfe703 100644
--- a/elements/sdk/libmanette.bst
+++ b/elements/sdk/libmanette.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libmanette.git
+  url: gnome:libmanette.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/libnotify.bst b/elements/sdk/libnotify.bst
index d535a60fd..f7537eb02 100644
--- a/elements/sdk/libnotify.bst
+++ b/elements/sdk/libnotify.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libnotify.git
+  url: gnome:libnotify.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/librsvg.bst b/elements/sdk/librsvg.bst
index 1b8fd1eeb..499879e2a 100644
--- a/elements/sdk/librsvg.bst
+++ b/elements/sdk/librsvg.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/librsvg.git
+  url: gnome:librsvg.git
   track: main
 - kind: cargo
 build-depends:
diff --git a/elements/sdk/libsecret.bst b/elements/sdk/libsecret.bst
index f527630a2..2a69aff2a 100644
--- a/elements/sdk/libsecret.bst
+++ b/elements/sdk/libsecret.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libsecret.git
+  url: gnome:libsecret.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/libsoup-2.4.bst b/elements/sdk/libsoup-2.4.bst
index fae5b5e59..e13d602fd 100644
--- a/elements/sdk/libsoup-2.4.bst
+++ b/elements/sdk/libsoup-2.4.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libsoup.git
+  url: gnome:libsoup.git
   track: gnome-3-38
 
 build-depends:
diff --git a/elements/sdk/libsoup.bst b/elements/sdk/libsoup.bst
index 6179dbe3a..f8de1e1f4 100644
--- a/elements/sdk/libsoup.bst
+++ b/elements/sdk/libsoup.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libsoup.git
+  url: gnome:libsoup.git
   track: master
 
 build-depends:
diff --git a/elements/sdk/nuspell.bst b/elements/sdk/nuspell.bst
index e66786a89..6d3af25c8 100644
--- a/elements/sdk/nuspell.bst
+++ b/elements/sdk/nuspell.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: https://github.com/nuspell/nuspell/archive/refs/tags/v5.0.1.tar.gz
+  url: github_files:nuspell/nuspell/archive/refs/tags/v5.0.1.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/sdk/pango.bst b/elements/sdk/pango.bst
index 8d1b40c2e..dd2f4efa0 100644
--- a/elements/sdk/pango.bst
+++ b/elements/sdk/pango.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/pango.git
+  url: gnome:pango.git
   track: main
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/pygobject.bst b/elements/sdk/pygobject.bst
index e5abb0beb..8a13e05b7 100644
--- a/elements/sdk/pygobject.bst
+++ b/elements/sdk/pygobject.bst
@@ -1,7 +1,7 @@
 kind: distutils
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/pygobject.git
+  url: gnome:pygobject.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/pkg-config.bst
diff --git a/elements/sdk/tracker.bst b/elements/sdk/tracker.bst
index 4b1b90396..582942433 100644
--- a/elements/sdk/tracker.bst
+++ b/elements/sdk/tracker.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/tracker.git
+  url: gnome:tracker.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/sdk/vala.bst b/elements/sdk/vala.bst
index b6f27cb02..450929263 100644
--- a/elements/sdk/vala.bst
+++ b/elements/sdk/vala.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/vala.git
+  url: gnome:vala.git
   track: master
 build-depends:
 - sdk/vala-tarball.bst
diff --git a/elements/sdk/webkitgtk.inc b/elements/sdk/webkitgtk.inc
index 42507caaf..6cb9d0b30 100644
--- a/elements/sdk/webkitgtk.inc
+++ b/elements/sdk/webkitgtk.inc
@@ -1,7 +1,7 @@
 sources:
 - kind: tar
   #FIXME: re-enable gtk-doc for webkit2gtk-5.0.bst when fixed upstream
-  url: webkitgtk_org:webkitgtk-2.35.1.tar.xz
+  url: webkitgtk:webkitgtk-2.35.1.tar.xz
 - kind: local
   path: files/webkitgtk/toolchain.i686
 - kind: local
diff --git a/elements/sdk/woff2.bst b/elements/sdk/woff2.bst
index 85b36ced6..a13fa2532 100644
--- a/elements/sdk/woff2.bst
+++ b/elements/sdk/woff2.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: tar
-  url: github_com:google/woff2/archive/v1.0.2.tar.gz
+  url: github_files:google/woff2/archive/v1.0.2.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
 depends:
diff --git a/elements/sdk/yelp-tools.bst b/elements/sdk/yelp-tools.bst
index 88ace901c..2591b3806 100644
--- a/elements/sdk/yelp-tools.bst
+++ b/elements/sdk/yelp-tools.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/yelp-tools.git
+  url: gnome:yelp-tools.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:components/m4.bst
diff --git a/elements/sdk/yelp-xsl.bst b/elements/sdk/yelp-xsl.bst
index 4abcee4ec..c76a81819 100644
--- a/elements/sdk/yelp-xsl.bst
+++ b/elements/sdk/yelp-xsl.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/yelp-xsl.git
+  url: gnome:yelp-xsl.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/sdk/yelp.bst b/elements/sdk/yelp.bst
index cd1ef7897..5acbeaed5 100644
--- a/elements/sdk/yelp.bst
+++ b/elements/sdk/yelp.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/yelp.git
+  url: gnome:yelp.git
   track: master
 
 build-depends:
diff --git a/elements/vm/android-udev-rules.bst b/elements/vm/android-udev-rules.bst
index 84992415c..a20dcbaae 100644
--- a/elements/vm/android-udev-rules.bst
+++ b/elements/vm/android-udev-rules.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: github_com:M0Rf30/android-udev-rules/archive/20210425.tar.gz
+  url: github_files:M0Rf30/android-udev-rules/archive/20210425.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/pkg-config.bst
diff --git a/elements/vm/buildstream/bst-external.bst b/elements/vm/buildstream/bst-external.bst
index 2b7a5f179..fddb83ad7 100644
--- a/elements/vm/buildstream/bst-external.bst
+++ b/elements/vm/buildstream/bst-external.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: git_tag
-  url: https://gitlab.com/BuildStream/bst-external.git
+  url: gitlab:BuildStream/bst-external.git
   track: 0.25.0
 
 build-depends:
diff --git a/elements/vm/buildstream/buildstream.bst b/elements/vm/buildstream/buildstream.bst
index c52f8e904..4cf8ae817 100644
--- a/elements/vm/buildstream/buildstream.bst
+++ b/elements/vm/buildstream/buildstream.bst
@@ -2,7 +2,7 @@ kind: distutils
 
 sources:
 - kind: tar
-  url: https://github.com/apache/buildstream/archive/refs/tags/1.6.3.tar.gz
+  url: github_files:apache/buildstream/archive/refs/tags/1.6.3.tar.gz
 
 depends:
 - sdk-deps/bubblewrap.bst
diff --git a/elements/vm/eos-repartition.bst b/elements/vm/eos-repartition.bst
index 0ff1877b8..b6eb26969 100644
--- a/elements/vm/eos-repartition.bst
+++ b/elements/vm/eos-repartition.bst
@@ -2,7 +2,7 @@ kind: manual
 
 sources:
 - kind: tar
-  url: github_com:endlessm/eos-boot-helper/archive/Release_3.9.4.tar.gz
+  url: github_files:endlessm/eos-boot-helper/archive/Release_3.9.4.tar.gz
 - kind: patch
   path: files/vm/eos-repartition/fix-sector-size-issue.patch
 
diff --git a/elements/vm/fish.bst b/elements/vm/fish.bst
index f31427f7b..16a9413e2 100644
--- a/elements/vm/fish.bst
+++ b/elements/vm/fish.bst
@@ -2,7 +2,7 @@ kind: cmake
 
 sources:
 - kind: tar
-  url: github_com:fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
+  url: github_files:fish-shell/fish-shell/releases/download/3.3.1/fish-3.3.1.tar.xz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/elements/vm/git-lfs.bst b/elements/vm/git-lfs.bst
index c6e8372f7..313c22bea 100644
--- a/elements/vm/git-lfs.bst
+++ b/elements/vm/git-lfs.bst
@@ -2,7 +2,7 @@ kind: make
 
 sources:
 - kind: tar
-  url: github_com:git-lfs/git-lfs/releases/download/v2.13.3/git-lfs-v2.13.3.tar.gz
+  url: github_files:git-lfs/git-lfs/releases/download/v2.13.3/git-lfs-v2.13.3.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:components/go.bst
diff --git a/elements/vm/ibus-anthy.bst b/elements/vm/ibus-anthy.bst
index 938c43ede..653167a46 100644
--- a/elements/vm/ibus-anthy.bst
+++ b/elements/vm/ibus-anthy.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:ibus/ibus-anthy/releases/download/1.5.12/ibus-anthy-1.5.12.tar.gz
+  url: github_files:ibus/ibus-anthy/releases/download/1.5.12/ibus-anthy-1.5.12.tar.gz
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/vm/ibus-hangul.bst b/elements/vm/ibus-hangul.bst
index fe8487d45..69a9cc842 100644
--- a/elements/vm/ibus-hangul.bst
+++ b/elements/vm/ibus-hangul.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
+  url: github_files:libhangul/ibus-hangul/releases/download/1.5.4/ibus-hangul-1.5.4.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/ibus-libpinyin.bst b/elements/vm/ibus-libpinyin.bst
index f794b2bad..725d7d5de 100644
--- a/elements/vm/ibus-libpinyin.bst
+++ b/elements/vm/ibus-libpinyin.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:libpinyin/ibus-libpinyin/releases/download/1.12.1/ibus-libpinyin-1.12.1.tar.gz
+  url: github_files:libpinyin/ibus-libpinyin/releases/download/1.12.1/ibus-libpinyin-1.12.1.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/libpinyin.bst b/elements/vm/libpinyin.bst
index 32f71d30b..4c01bc92a 100644
--- a/elements/vm/libpinyin.bst
+++ b/elements/vm/libpinyin.bst
@@ -1,17 +1,21 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: github_com:libpinyin/libpinyin/releases/download/2.6.1/libpinyin-2.6.1.tar.gz
+  url: github_files:libpinyin/libpinyin/releases/download/2.6.1/libpinyin-2.6.1.tar.gz
 - kind: tar
-  url: downloads.sourceforge.net:libpinyin/models/model17.text.tar.gz
+  url: sourceforge:libpinyin/models/model17.text.tar.gz
   base-dir: ''
   directory: data
+
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
+
 depends:
 - sdk/glib.bst
 - vm/kyotocabinet.bst
 - freedesktop-sdk.bst:bootstrap-import.bst
+
 variables:
   conf-local: >-
     --with-dbm=KyotoCabinet
diff --git a/elements/vm/nss-mdns.bst b/elements/vm/nss-mdns.bst
index 9f63b6c7b..d03263377 100644
--- a/elements/vm/nss-mdns.bst
+++ b/elements/vm/nss-mdns.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz
+  url: github_files:lathiat/nss-mdns/releases/download/v0.14.1/nss-mdns-0.14.1.tar.gz
 
 runtime-depends:
 - freedesktop-sdk.bst:components/avahi.bst
diff --git a/elements/vm/ntfs-3g.bst b/elements/vm/ntfs-3g.bst
index 49a031d97..22998ddb5 100644
--- a/elements/vm/ntfs-3g.bst
+++ b/elements/vm/ntfs-3g.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: gnome_download:teams/releng/tarballs-needing-help/ntfs-3g/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
+  url: github_files:tuxera/ntfs-3g/archive/refs/tags/2021.8.22.tar.gz
 
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/vm/openfortivpn.bst b/elements/vm/openfortivpn.bst
index 74ad133a1..5b334c163 100644
--- a/elements/vm/openfortivpn.bst
+++ b/elements/vm/openfortivpn.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: tar
-  url: github_com:adrienverge/openfortivpn/archive/refs/tags/v1.16.0.tar.gz
+  url: github_files:adrienverge/openfortivpn/archive/refs/tags/v1.16.0.tar.gz
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/vm/opensc.bst b/elements/vm/opensc.bst
index bd8c07583..56557ee80 100644
--- a/elements/vm/opensc.bst
+++ b/elements/vm/opensc.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: tar
-  url: github_com:OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
+  url: github_files:OpenSC/OpenSC/releases/download/0.21.0/opensc-0.21.0.tar.gz
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
 depends:
diff --git a/elements/vm/toolbox.bst b/elements/vm/toolbox.bst
index 8f8ba0572..7254aa699 100644
--- a/elements/vm/toolbox.bst
+++ b/elements/vm/toolbox.bst
@@ -2,84 +2,84 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://github.com/containers/toolbox/releases/download/0.0.99.1/toolbox-0.0.99.1.tar.xz
+  url: github_files:containers/toolbox/releases/download/0.0.99.1/toolbox-0.0.99.1.tar.xz
 - kind: git_tag
-  url: https://github.com/HarryMichal/go-version.git
+  url: github:HarryMichal/go-version.git
   track: v1.0.0
   track-tags: false
   directory: 'src/vendor/github.com/HarryMichal/go-version'
 - kind: git_tag
-  url: https://github.com/acobaugh/osrelease.git
+  url: github:acobaugh/osrelease.git
   track: a93a0a55a249
   track-tags: false
   directory: 'src/vendor/github.com/acobaugh/osrelease'
 - kind: git_tag
-  url: https://github.com/briandowns/spinner.git
+  url: github:briandowns/spinner.git
   track: v1.10.0
   track-tags: false
   directory: 'src/vendor/github.com/briandowns/spinner'
 - kind: git_tag
-  url: https://github.com/docker/go-units.git
+  url: github:docker/go-units.git
   track: v0.4.0
   track-tags: false
   directory: 'src/vendor/github.com/docker/go-units'
 - kind: git_tag
-  url: https://github.com/fsnotify/fsnotify.git
+  url: github:fsnotify/fsnotify.git
   track: v1.4.7
   track-tags: false
   directory: 'src/vendor/github.com/fsnotify/fsnotify'
 - kind: git_tag
-  url: https://github.com/fatih/color.git
+  url: github:fatih/color.git
   track: v1.7.0
   track-tags: false
   directory: 'src/vendor/github.com/fatih/color'
 - kind: git_tag
-  url: https://github.com/godbus/dbus.git
+  url: github:godbus/dbus.git
   track: v5.0.3
   track-tags: false
   directory: 'src/vendor/github.com/godbus/dbus/v5'
 - kind: git_tag
-  url: https://github.com/inconshreveable/mousetrap.git
+  url: github:inconshreveable/mousetrap.git
   track: v1.0.0
   track-tags: false
   directory: 'src/vendor/github.com/inconshreveable/mousetrap'
 - kind: git_tag
-  url: https://github.com/konsorten/go-windows-terminal-sequences.git
+  url: github:konsorten/go-windows-terminal-sequences.git
   track: v1.0.1
   track-tags: false
   directory: 'src/vendor/github.com/konsorten/go-windows-terminal-sequences'
 - kind: git_tag
-  url: https://github.com/mattn/go-colorable.git
+  url: github:mattn/go-colorable.git
   track: v0.1.2
   track-tags: false
   directory: 'src/vendor/github.com/mattn/go-colorable'
 - kind: git_tag
-  url: https://github.com/mattn/go-isatty.git
+  url: github:mattn/go-isatty.git
   track: v0.0.8
   track-tags: false
   directory: 'src/vendor/github.com/mattn/go-isatty'
 - kind: git_tag
-  url: https://github.com/sirupsen/logrus.git
+  url: github:sirupsen/logrus.git
   track: v1.4.2
   track-tags: false
   directory: 'src/vendor/github.com/sirupsen/logrus'
 - kind: git_tag
-  url: https://github.com/spf13/cobra.git
+  url: github:spf13/cobra.git
   track: v0.0.5
   track-tags: false
   directory: 'src/vendor/github.com/spf13/cobra'
 - kind: git_tag
-  url: https://github.com/spf13/pflag.git
+  url: github:spf13/pflag.git
   track: v1.0.3
   track-tags: false
   directory: 'src/vendor/github.com/spf13/pflag'
 - kind: git_tag
-  url: https://github.com/golang/crypto.git
+  url: github:golang/crypto.git
   track: 505ab145d0a9
   track-tags: false
   directory: 'src/vendor/golang.org/x/crypto'
 - kind: git_tag
-  url: https://github.com/golang/sys.git
+  url: github:golang/sys.git
   track: 66c3f260301c
   track-tags: false
   directory: 'src/vendor/golang.org/x/sys'
diff --git a/elements/vm/uresourced.bst b/elements/vm/uresourced.bst
index 3728bba99..b653b3408 100644
--- a/elements/vm/uresourced.bst
+++ b/elements/vm/uresourced.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: https://gitlab.freedesktop.org/benzea/uresourced/-/archive/v0.4.0/uresourced-v0.4.0.tar.bz2
+  url: freedesktop_files:benzea/uresourced/-/archive/v0.4.0/uresourced-v0.4.0.tar.bz2
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
diff --git a/elements/vm/vpnc.bst b/elements/vm/vpnc.bst
index 8c866d216..72385f62c 100644
--- a/elements/vm/vpnc.bst
+++ b/elements/vm/vpnc.bst
@@ -2,7 +2,7 @@ kind: make
 
 sources:
 - kind: git_tag
-  url: github_com:streambinder/vpnc.git
+  url: github:streambinder/vpnc.git
   track: 43780cecd7a61668002f73b6f8b9f9ba61af74ad
   track-tags: false
 
diff --git a/elements/world/accerciser.bst b/elements/world/accerciser.bst
index d79c204ad..b54aab3e3 100644
--- a/elements/world/accerciser.bst
+++ b/elements/world/accerciser.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/accerciser.git
+  url: gnome:accerciser.git
   track: master
 
 build-depends:
diff --git a/elements/world/atkmm.bst b/elements/world/atkmm.bst
index 687c01ba7..c143534c6 100644
--- a/elements/world/atkmm.bst
+++ b/elements/world/atkmm.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/atkmm.git
+  url: gnome:atkmm.git
   track: master
 
 build-depends:
diff --git a/elements/world/bijiben.bst b/elements/world/bijiben.bst
index ea0ac4f33..86bfa4566 100644
--- a/elements/world/bijiben.bst
+++ b/elements/world/bijiben.bst
@@ -1,12 +1,12 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/bijiben.git
+  url: gnome:bijiben.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
 
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/world/cairomm.bst b/elements/world/cairomm.bst
index 5bade72b5..006083569 100644
--- a/elements/world/cairomm.bst
+++ b/elements/world/cairomm.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: tar
-  url: cairo_org:releases/cairomm-1.16.0.tar.xz
+  url: cairo:releases/cairomm-1.16.0.tar.xz
 
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/world/evolution.bst b/elements/world/evolution.bst
index 93a218482..247daa80c 100644
--- a/elements/world/evolution.bst
+++ b/elements/world/evolution.bst
@@ -1,7 +1,7 @@
 kind: cmake
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/evolution.git
+  url: gnome:evolution.git
   track: master
 
 build-depends:
diff --git a/elements/world/file-roller.bst b/elements/world/file-roller.bst
index 9175d6515..ce414930f 100644
--- a/elements/world/file-roller.bst
+++ b/elements/world/file-roller.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/file-roller.git
+  url: gnome:file-roller.git
   track: master
 
 build-depends:
diff --git a/elements/world/five-or-more.bst b/elements/world/five-or-more.bst
index d77582ad7..a9b3fe2fc 100644
--- a/elements/world/five-or-more.bst
+++ b/elements/world/five-or-more.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/five-or-more.git
+  url: gnome:five-or-more.git
   track: master
 
 build-depends:
diff --git a/elements/world/four-in-a-row.bst b/elements/world/four-in-a-row.bst
index 35c1b853b..50596c5f6 100644
--- a/elements/world/four-in-a-row.bst
+++ b/elements/world/four-in-a-row.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/four-in-a-row.git
+  url: gnome:four-in-a-row.git
   track: master
 build-depends:
 - sdk/appstream-glib.bst
diff --git a/elements/world/geary.bst b/elements/world/geary.bst
index 30cd6a714..c26b93fe7 100644
--- a/elements/world/geary.bst
+++ b/elements/world/geary.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/geary.git
+  url: gnome:geary.git
   track: master
 
 build-depends:
diff --git a/elements/world/gedit.bst b/elements/world/gedit.bst
index 3b99cf11c..6a9d835c0 100644
--- a/elements/world/gedit.bst
+++ b/elements/world/gedit.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gedit.git
+  url: gnome:gedit.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
 
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/world/ghex.bst b/elements/world/ghex.bst
index 2c2c58e37..ff0ad68e2 100644
--- a/elements/world/ghex.bst
+++ b/elements/world/ghex.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/ghex.git
+  url: gnome:ghex.git
   track: master
 
 build-depends:
diff --git a/elements/world/gitg.bst b/elements/world/gitg.bst
index 0f75b8e73..a57db1636 100644
--- a/elements/world/gitg.bst
+++ b/elements/world/gitg.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gitg.git
+  url: gnome:gitg.git
   track: master
 
 build-depends:
diff --git a/elements/world/glade.bst b/elements/world/glade.bst
index 99a3ee3b9..681bda5b3 100644
--- a/elements/world/glade.bst
+++ b/elements/world/glade.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/glade.git
+  url: gnome:glade.git
   track: master
 
 build-depends:
diff --git a/elements/world/glibmm.bst b/elements/world/glibmm.bst
index bcebe9b3a..f1a970201 100644
--- a/elements/world/glibmm.bst
+++ b/elements/world/glibmm.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/glibmm.git
+  url: gnome:glibmm.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-2048.bst b/elements/world/gnome-2048.bst
index f78c62dc1..4f9be70e4 100644
--- a/elements/world/gnome-2048.bst
+++ b/elements/world/gnome-2048.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-2048.git
+  url: gnome:gnome-2048.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-chess.bst b/elements/world/gnome-chess.bst
index cae313ade..93f36c1c4 100644
--- a/elements/world/gnome-chess.bst
+++ b/elements/world/gnome-chess.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-chess.git
+  url: gnome:gnome-chess.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-code-assistance.bst b/elements/world/gnome-code-assistance.bst
index b222bb215..e35f735e8 100644
--- a/elements/world/gnome-code-assistance.bst
+++ b/elements/world/gnome-code-assistance.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-code-assistance.git
+  url: gnome:gnome-code-assistance.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/world/gnome-devel-docs.bst b/elements/world/gnome-devel-docs.bst
index 4147a4848..0a1ad6e80 100644
--- a/elements/world/gnome-devel-docs.bst
+++ b/elements/world/gnome-devel-docs.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-devel-docs.git
+  url: gnome:gnome-devel-docs.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-dictionary.bst b/elements/world/gnome-dictionary.bst
index bdacdfe9e..78ea39e03 100644
--- a/elements/world/gnome-dictionary.bst
+++ b/elements/world/gnome-dictionary.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-dictionary.git
+  url: gnome:gnome-dictionary.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-documents.bst b/elements/world/gnome-documents.bst
index 48d50f4f6..5b7778101 100644
--- a/elements/world/gnome-documents.bst
+++ b/elements/world/gnome-documents.bst
@@ -2,12 +2,12 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-documents.git
+  url: gnome:gnome-documents.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
 
 build-depends:
 - freedesktop-sdk.bst:components/desktop-file-utils.bst
diff --git a/elements/world/gnome-games.bst b/elements/world/gnome-games.bst
index 86eec7730..384499b2f 100644
--- a/elements/world/gnome-games.bst
+++ b/elements/world/gnome-games.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-games.git
+  url: gnome:gnome-games.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-klotski.bst b/elements/world/gnome-klotski.bst
index 894e9fe43..46c70113f 100644
--- a/elements/world/gnome-klotski.bst
+++ b/elements/world/gnome-klotski.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-klotski.git
+  url: gnome:gnome-klotski.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-mahjongg.bst b/elements/world/gnome-mahjongg.bst
index 73d10e185..7ca93db7b 100644
--- a/elements/world/gnome-mahjongg.bst
+++ b/elements/world/gnome-mahjongg.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-mahjongg.git
+  url: gnome:gnome-mahjongg.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-mines.bst b/elements/world/gnome-mines.bst
index c9715a21c..98bc3acb0 100644
--- a/elements/world/gnome-mines.bst
+++ b/elements/world/gnome-mines.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-mines.git
+  url: gnome:gnome-mines.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-multi-writer.bst b/elements/world/gnome-multi-writer.bst
index cd9fde9c0..310364da9 100644
--- a/elements/world/gnome-multi-writer.bst
+++ b/elements/world/gnome-multi-writer.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-multi-writer.git
+  url: gnome:gnome-multi-writer.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-nibbles.bst b/elements/world/gnome-nibbles.bst
index b51d6c38d..92b816037 100644
--- a/elements/world/gnome-nibbles.bst
+++ b/elements/world/gnome-nibbles.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-nibbles.git
+  url: gnome:gnome-nibbles.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-online-miners.bst b/elements/world/gnome-online-miners.bst
index 5205fce18..ba6110dad 100644
--- a/elements/world/gnome-online-miners.bst
+++ b/elements/world/gnome-online-miners.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-online-miners.git
+  url: gnome:gnome-online-miners.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-recipes.bst b/elements/world/gnome-recipes.bst
index 24674f2d2..80df2ed2a 100644
--- a/elements/world/gnome-recipes.bst
+++ b/elements/world/gnome-recipes.bst
@@ -1,12 +1,12 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/recipes.git
+  url: gnome:recipes.git
   track: master
   submodules:
     subprojects/libgd:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgd.git
+      url: gnome:libgd.git
 
 build-depends:
 - freedesktop-sdk.bst:components/itstool.bst
diff --git a/elements/world/gnome-robots.bst b/elements/world/gnome-robots.bst
index 5d6e3c3d0..691116971 100644
--- a/elements/world/gnome-robots.bst
+++ b/elements/world/gnome-robots.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-robots.git
+  url: gnome:gnome-robots.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-sound-recorder.bst b/elements/world/gnome-sound-recorder.bst
index 3f3932a9c..b3ab539ae 100644
--- a/elements/world/gnome-sound-recorder.bst
+++ b/elements/world/gnome-sound-recorder.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-sound-recorder.git
+  url: gnome:gnome-sound-recorder.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-sudoku.bst b/elements/world/gnome-sudoku.bst
index 03dfdaf95..9b95fbfa3 100644
--- a/elements/world/gnome-sudoku.bst
+++ b/elements/world/gnome-sudoku.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-sudoku.git
+  url: gnome:gnome-sudoku.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-taquin.bst b/elements/world/gnome-taquin.bst
index 87f6be3da..f2bdf4981 100644
--- a/elements/world/gnome-taquin.bst
+++ b/elements/world/gnome-taquin.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-taquin.git
+  url: gnome:gnome-taquin.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-terminal.bst b/elements/world/gnome-terminal.bst
index 86d73ce7e..708f88266 100644
--- a/elements/world/gnome-terminal.bst
+++ b/elements/world/gnome-terminal.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-terminal.git
+  url: gnome:gnome-terminal.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-tetravex.bst b/elements/world/gnome-tetravex.bst
index b19f39c46..1f27e6fe4 100644
--- a/elements/world/gnome-tetravex.bst
+++ b/elements/world/gnome-tetravex.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-tetravex.git
+  url: gnome:gnome-tetravex.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-themes-extra.bst b/elements/world/gnome-themes-extra.bst
index 0346cdbfc..a2bd92079 100644
--- a/elements/world/gnome-themes-extra.bst
+++ b/elements/world/gnome-themes-extra.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-themes-extra.git
+  url: gnome:gnome-themes-extra.git
   track: master
 build-depends:
 - core-deps/intltool.bst
diff --git a/elements/world/gnome-todo.bst b/elements/world/gnome-todo.bst
index 0a8ba35e4..1a45a8b5d 100644
--- a/elements/world/gnome-todo.bst
+++ b/elements/world/gnome-todo.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-todo.git
+  url: gnome:gnome-todo.git
   track: master
 
 build-depends:
diff --git a/elements/world/gnome-tweaks.bst b/elements/world/gnome-tweaks.bst
index bcfbdc854..41f1a7064 100644
--- a/elements/world/gnome-tweaks.bst
+++ b/elements/world/gnome-tweaks.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gnome-tweaks.git
+  url: gnome:gnome-tweaks.git
   track: master
 
 build-depends:
diff --git a/elements/world/gtkmm.bst b/elements/world/gtkmm.bst
index 9c39b593d..1c3705f20 100644
--- a/elements/world/gtkmm.bst
+++ b/elements/world/gtkmm.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gtkmm.git
+  url: gnome:gtkmm.git
   track: master
 
 build-depends:
diff --git a/elements/world/gupnp-igd.bst b/elements/world/gupnp-igd.bst
index c2a6e440c..5ad16a825 100644
--- a/elements/world/gupnp-igd.bst
+++ b/elements/world/gupnp-igd.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/gupnp-igd.git
+  url: gnome:gupnp-igd.git
   track: master
 
 build-depends:
diff --git a/elements/world/hitori.bst b/elements/world/hitori.bst
index 38bf9f617..d0ffd2cc5 100644
--- a/elements/world/hitori.bst
+++ b/elements/world/hitori.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/hitori.git
+  url: gnome:hitori.git
   track: master
 
 build-depends:
diff --git a/elements/world/iagno.bst b/elements/world/iagno.bst
index b51b04850..955e2d63c 100644
--- a/elements/world/iagno.bst
+++ b/elements/world/iagno.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/iagno.git
+  url: gnome:iagno.git
   track: master
 
 build-depends:
diff --git a/elements/world/libaperture.bst b/elements/world/libaperture.bst
index e4c3270a8..6fa8cdb37 100644
--- a/elements/world/libaperture.bst
+++ b/elements/world/libaperture.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:jwestman/libaperture.git
+  url: gnome_gitlab:jwestman/libaperture.git
   track: master
 
 build-depends:
diff --git a/elements/world/libgepub.bst b/elements/world/libgepub.bst
index 59de08359..bca5ae04f 100644
--- a/elements/world/libgepub.bst
+++ b/elements/world/libgepub.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgepub.git
+  url: gnome:libgepub.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/world/libgnome-games-support.bst b/elements/world/libgnome-games-support.bst
index 68fcd3062..b0fe1aabe 100644
--- a/elements/world/libgnome-games-support.bst
+++ b/elements/world/libgnome-games-support.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgnome-games-support.git
+  url: gnome:libgnome-games-support.git
   track: master
 
 build-depends:
diff --git a/elements/world/libgrss.bst b/elements/world/libgrss.bst
index 624b3b2cd..8bd82a64e 100644
--- a/elements/world/libgrss.bst
+++ b/elements/world/libgrss.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libgrss.git
+  url: gnome:libgrss.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/world/libshumate.bst b/elements/world/libshumate.bst
index 8bbed921d..bfb2a1372 100644
--- a/elements/world/libshumate.bst
+++ b/elements/world/libshumate.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:mlundblad/libshumate.git
+  url: gnome_gitlab:mlundblad/libshumate.git
   track: master
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/world/libsigcplusplus.bst b/elements/world/libsigcplusplus.bst
index 5ead677e4..0c67fe344 100644
--- a/elements/world/libsigcplusplus.bst
+++ b/elements/world/libsigcplusplus.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: github_com:libsigcplusplus/libsigcplusplus.git
+  url: github:libsigcplusplus/libsigcplusplus.git
   track: master
 build-depends:
 - core-deps/mm-common.bst
diff --git a/elements/world/libzapojit.bst b/elements/world/libzapojit.bst
index 2fb4046d3..4f9e0d92a 100644
--- a/elements/world/libzapojit.bst
+++ b/elements/world/libzapojit.bst
@@ -2,7 +2,7 @@ kind: autotools
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/libzapojit.git
+  url: gnome:libzapojit.git
   track: master
 
 build-depends:
diff --git a/elements/world/lightsoff.bst b/elements/world/lightsoff.bst
index 3983987c9..d8d2095c5 100644
--- a/elements/world/lightsoff.bst
+++ b/elements/world/lightsoff.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/lightsoff.git
+  url: gnome:lightsoff.git
   track: master
 
 build-depends:
diff --git a/elements/world/network-manager-applet.bst b/elements/world/network-manager-applet.bst
index f373371c9..7fafcf537 100644
--- a/elements/world/network-manager-applet.bst
+++ b/elements/world/network-manager-applet.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/network-manager-applet.git
+  url: gnome:network-manager-applet.git
   track: master
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/world/pangomm.bst b/elements/world/pangomm.bst
index 42445a38f..8c7409b1e 100644
--- a/elements/world/pangomm.bst
+++ b/elements/world/pangomm.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/pangomm.git
+  url: gnome:pangomm.git
   track: master
 
 build-depends:
diff --git a/elements/world/phoc.bst b/elements/world/phoc.bst
index 50bf51138..81c951e64 100644
--- a/elements/world/phoc.bst
+++ b/elements/world/phoc.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:World/Phosh/phoc.git
+  url: gnome_gitlab:World/Phosh/phoc.git
   track: master
 
 build-depends:
diff --git a/elements/world/phosh.bst b/elements/world/phosh.bst
index a9116f501..36a60c58a 100644
--- a/elements/world/phosh.bst
+++ b/elements/world/phosh.bst
@@ -2,15 +2,15 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:World/Phosh/phosh.git
+  url: gnome_gitlab:World/Phosh/phosh.git
   track: main
   submodules:
     subprojects/gvc:
       checkout: true
-      url: gitlab_gnome_org:GNOME/libgnome-volume-control.git
+      url: gnome:libgnome-volume-control.git
     subprojects/libcall-ui:
       checkout: true
-      url: gitlab_gnome_org:World/Phosh/libcall-ui.git
+      url: gnome_gitlab:World/Phosh/libcall-ui.git
 
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/world/pinhole.bst b/elements/world/pinhole.bst
index d88fb0bac..1c9d6ddb1 100644
--- a/elements/world/pinhole.bst
+++ b/elements/world/pinhole.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:jwestman/camera.git
+  url: gnome_gitlab:jwestman/camera.git
   track: master
 
 build-depends:
diff --git a/elements/world/polari.bst b/elements/world/polari.bst
index b34c6ffda..336dcb638 100644
--- a/elements/world/polari.bst
+++ b/elements/world/polari.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/polari.git
+  url: gnome:polari.git
   track: main
 
 build-depends:
diff --git a/elements/world/qqwing.bst b/elements/world/qqwing.bst
index c5f3dd9ae..350cf9165 100644
--- a/elements/world/qqwing.bst
+++ b/elements/world/qqwing.bst
@@ -1,6 +1,8 @@
 kind: autotools
+
 sources:
 - kind: tar
-  url: qqwing:qqwing-1.3.4.tar.gz
+  url: github_files:stephenostermiller/qqwing/archive/v1.3.4.zip
+
 depends:
 - freedesktop-sdk.bst:bootstrap-import.bst
diff --git a/elements/world/quadrapassel.bst b/elements/world/quadrapassel.bst
index aba20a881..cb770c89d 100644
--- a/elements/world/quadrapassel.bst
+++ b/elements/world/quadrapassel.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/quadrapassel.git
+  url: gnome:quadrapassel.git
   track: master
 
 build-depends:
diff --git a/elements/world/retro-gtk.bst b/elements/world/retro-gtk.bst
index 6712c96a3..650009c42 100644
--- a/elements/world/retro-gtk.bst
+++ b/elements/world/retro-gtk.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/retro-gtk.git
+  url: gnome:retro-gtk.git
   track: master
 
 build-depends:
diff --git a/elements/world/seahorse.bst b/elements/world/seahorse.bst
index e83d3c22b..38dce0f26 100644
--- a/elements/world/seahorse.bst
+++ b/elements/world/seahorse.bst
@@ -2,7 +2,7 @@ kind: meson
 
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/seahorse.git
+  url: gnome:seahorse.git
   track: master
 
 build-depends:
diff --git a/elements/world/swell-foop.bst b/elements/world/swell-foop.bst
index 1843331ca..8b9b59882 100644
--- a/elements/world/swell-foop.bst
+++ b/elements/world/swell-foop.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/swell-foop.git
+  url: gnome:swell-foop.git
   track: master
 
 build-depends:
diff --git a/elements/world/tali.bst b/elements/world/tali.bst
index 596e3e57e..051e5121d 100644
--- a/elements/world/tali.bst
+++ b/elements/world/tali.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/tali.git
+  url: gnome:tali.git
   track: master
 
 build-depends:
diff --git a/elements/world/telepathy-glib.bst b/elements/world/telepathy-glib.bst
index c6f543a4c..e559f62b9 100644
--- a/elements/world/telepathy-glib.bst
+++ b/elements/world/telepathy-glib.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: github_com:TelepathyIM/telepathy-glib.git
+  url: github:TelepathyIM/telepathy-glib.git
   track: master
 build-depends:
 - sdk/gobject-introspection.bst
diff --git a/elements/world/telepathy-logger.bst b/elements/world/telepathy-logger.bst
index 0032fb3c5..9a94d1969 100644
--- a/elements/world/telepathy-logger.bst
+++ b/elements/world/telepathy-logger.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: github_com:TelepathyIM/telepathy-logger.git
+  url: github:TelepathyIM/telepathy-logger.git
   track: master
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/world/telepathy-mission-control.bst b/elements/world/telepathy-mission-control.bst
index f212cc457..ce68bdb96 100644
--- a/elements/world/telepathy-mission-control.bst
+++ b/elements/world/telepathy-mission-control.bst
@@ -1,7 +1,7 @@
 kind: autotools
 sources:
 - kind: git_tag
-  url: github_com:TelepathyIM/telepathy-mission-control.git
+  url: github:TelepathyIM/telepathy-mission-control.git
   track: telepathy-mission-control-5.16
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-autotools.bst
diff --git a/elements/world/tracker-2.bst b/elements/world/tracker-2.bst
index 6fe4ec3d2..34cee9444 100644
--- a/elements/world/tracker-2.bst
+++ b/elements/world/tracker-2.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/tracker.git
+  url: gnome:tracker.git
   track: tracker-2.3
 build-depends:
 - sdk/gtk-doc.bst
diff --git a/elements/world/tracker-miners-2.bst b/elements/world/tracker-miners-2.bst
index 424c570e0..22b32390f 100644
--- a/elements/world/tracker-miners-2.bst
+++ b/elements/world/tracker-miners-2.bst
@@ -1,7 +1,7 @@
 kind: meson
 sources:
 - kind: git_tag
-  url: gitlab_gnome_org:GNOME/tracker-miners.git
+  url: gnome:tracker-miners.git
   track: tracker-miners-2.3
 build-depends:
 - core-deps/intltool.bst
diff --git a/include/aliases.yml b/include/aliases.yml
new file mode 100644
index 000000000..7d59c330c
--- /dev/null
+++ b/include/aliases.yml
@@ -0,0 +1,26 @@
+# Source aliases.
+#
+# These are used in the individual element.bst files in
+# place of specifying full uris.
+#
+# The location from where source code is downloaded can
+# be changed without triggering a rebuild.
+#
+aliases:
+  # file aliases (e.g. tarballs)
+  cairo: https://cairographics.org/
+  freedesktop_files: https://gitlab.freedesktop.org/
+  ftp_gnu_org: https://ftp.gnu.org/gnu/
+  github_files: https://github.com/
+  gitlab_files: https://gitlab.com/
+  gnome_downloads: https://download.gnome.org/sources/
+  libburnia: http://files.libburnia-project.org/releases/
+  sourceforge: https://downloads.sourceforge.net/
+  spice: https://www.spice-space.org/download/
+  webkitgtk: https://webkitgtk.org/releases/
+
+  # git aliases go here
+  github: https://github.com/
+  gitlab: https://gitlab.com/
+  gnome: https://gitlab.gnome.org/GNOME/
+  gnome_gitlab: https://gitlab.gnome.org/
diff --git a/include/mirrors.yml b/include/mirrors.yml
new file mode 100644
index 000000000..c6e2c9d2e
--- /dev/null
+++ b/include/mirrors.yml
@@ -0,0 +1,13 @@
+mirrors:
+- name: kernel_org
+  aliases:
+    ftp_gnu_org:
+    - https://mirrors.kernel.org/gnu/
+- name: gnome
+  aliases:
+    github:
+    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/github_com/
+    gitlab:
+    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_com/
+    purism:
+    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/source_puri_sm/
diff --git a/project.conf b/project.conf
index b1c72de1d..bc56f5993 100644
--- a/project.conf
+++ b/project.conf
@@ -19,6 +19,8 @@ fatal-warnings:
 
 (@):
 - freedesktop-sdk.bst:include/strip.yml
+- include/aliases.yml
+- include/mirrors.yml
 
 # Options to specify for the project, these provide
 # command line switches which control the behavior of
@@ -41,53 +43,6 @@ options:
     default: false
     description: mount host resources similar to toolbox
 
-
-# Source aliases.
-#
-# These are used in the individual element.bst files in
-# place of specifying full uris.
-# 
-# The location from where source code is downloaded can
-# be changed without triggering a rebuild.
-#
-aliases:
-  gnome_downloads: https://download.gnome.org/sources/
-  cairo_org: https://cairographics.org/
-  cdn_kernel_org: https://cdn.kernel.org/pub/
-  downloads.sourceforge.net: https://downloads.sourceforge.net/
-  ftp_gnu_org: https://ftp.gnu.org/gnu/
-  git_code_sf_net: https://git.code.sf.net/
-  git_freedesktop_org: https://gitlab.freedesktop.org/
-  github_com: https://github.com/
-  gitlab_com: https://gitlab.com/
-  gitlab_gnome_org: https://gitlab.gnome.org/
-  gnome_download: https://download.gnome.org/
-  gstreamer: https://gstreamer.freedesktop.org/src/
-  icon_theme_freedesktop_org: https://icon-theme.freedesktop.org/releases/
-  iso_codes: https://pkg-isocodes.alioth.debian.org/downloads/
-  libburnia: http://files.libburnia-project.org/releases/
-  people_freedesktop_org: https://people.freedesktop.org/
-  purism: https://source.puri.sm/
-  qqwing: https://qqwing.com/
-  sourceforge_net: https://sourceforge.net/projects/
-  spice: https://www.spice-space.org/download/
-  tarballs_needing_help: https://people.gnome.org/~mcatanzaro/tarballs-needing-help/
-  webkitgtk_org: https://webkitgtk.org/releases/
-
-mirrors:
-- name: kernel_org
-  aliases:
-    ftp_gnu_org:
-    - https://mirrors.kernel.org/gnu/
-- name: gnome
-  aliases:
-    github_com:
-    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/github_com/
-    gitlab_com:
-    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/gitlab_com/
-    purism:
-    - https://gitlab.gnome.org/Infrastructure/Mirrors/lorry-mirrors/source_puri_sm/
-
 # Some overrides to the default sandbox execution environment
 #
 environment:


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]