diff --git a/.github/workflows/arch-build.yml b/.github/workflows/arch-build.yml
index 407e5f0..395339a 100644
--- a/.github/workflows/arch-build.yml
+++ b/.github/workflows/arch-build.yml
@@ -14,13 +14,22 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  arch-build:
+    container: archlinux:latest
     runs-on: ubuntu-latest
-    container:
-      image: erikreider/swaync:archlinux
+    env:
+      PACKAGES: meson gtk3 gobject-introspection vala json-glib libhandy gtk-layer-shell scdoc
     steps:
-      - uses: actions/checkout@v2
+      - name: Install packages
+        run: |
+          pacman-key --init
+          pacman -Sy --noconfirm $PACKAGES
+
+      - name: Check out sources
+        uses: actions/checkout@v3
+
       - name: Meson configure
         run: meson build
+
       - name: Build
         run: ninja -C build
diff --git a/.github/workflows/fedora-build.yml b/.github/workflows/fedora-build.yml
index f304f49..844dc24 100644
--- a/.github/workflows/fedora-build.yml
+++ b/.github/workflows/fedora-build.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  package:
+  fedora-build:
     container: fedora:rawhide
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/fedora-copr.yml b/.github/workflows/fedora-copr.yml
index 5613c5e..cb6cb3b 100644
--- a/.github/workflows/fedora-copr.yml
+++ b/.github/workflows/fedora-copr.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  package:
+  fedora-copr:
     container: fedora:latest
     runs-on: ubuntu-latest
 
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
index 58ecbdb..e321054 100644
--- a/.github/workflows/linting.yml
+++ b/.github/workflows/linting.yml
@@ -14,7 +14,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  lint:
+  vala-linting:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
diff --git a/.github/workflows/ubuntu-build.yml b/.github/workflows/ubuntu-build.yml
index d49f314..61d119d 100644
--- a/.github/workflows/ubuntu-build.yml
+++ b/.github/workflows/ubuntu-build.yml
@@ -14,13 +14,23 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  ubuntu-LTS-build:
+    container: ubuntu:22.04
     runs-on: ubuntu-latest
-    container:
-      image: erikreider/swaync:ubuntu
+    env:
+      DEBIAN_FRONTEND: noninteractive
+      PACKAGES: meson libwayland-dev libgtk-3-dev gobject-introspection libgirepository1.0-dev valac libjson-glib-dev libhandy-1-dev libgtk-layer-shell-dev scdoc
     steps:
-      - uses: actions/checkout@v2
+      - name: Install packages
+        run: |
+          apt update
+          apt install -y $PACKAGES
+
+      - name: Check out sources
+        uses: actions/checkout@v3
+
       - name: Meson configure
         run: meson build
+
       - name: Build
         run: ninja -C build
diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux
deleted file mode 100644
index f04146b..0000000
--- a/Dockerfiles/archlinux
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: ft=Dockerfile
-
-FROM archlinux:latest
-
-RUN pacman-key --init
-RUN pacman -Sy --noconfirm meson gtk3 gobject-introspection vala json-glib libhandy gtk-layer-shell scdoc
diff --git a/Dockerfiles/ubuntu b/Dockerfiles/ubuntu
deleted file mode 100644
index 8334b35..0000000
--- a/Dockerfiles/ubuntu
+++ /dev/null
@@ -1,6 +0,0 @@
-# vim: ft=Dockerfile
-
-FROM ubuntu:22.04
-
-RUN apt-get update
-RUN DEBIAN_FRONTEND=noninteractive apt install -y meson libwayland-dev libgtk-3-dev gobject-introspection libgirepository1.0-dev valac libjson-glib-dev libhandy-1-dev libgtk-layer-shell-dev scdoc