diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
index ef0219ac3..7800ff902 100644
--- a/.github/workflows/gettext.yml
+++ b/.github/workflows/gettext.yml
@@ -2,13 +2,13 @@ name: Gettext Updates
 
 on:
   push:
-    branches: master
+    branches: [master]
 
 jobs:
   build:
     runs-on: ubuntu-22.04
     container:
-      image: elementary/docker:next-unstable
+      image: ghcr.io/elementary/docker:next-unstable
 
     steps:
     - name: Install git
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c8bab267..a3f1be81a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,10 +11,14 @@ jobs:
   build:
 
     runs-on: ubuntu-22.04
-    
+
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [stable, unstable, development-target]
     container:
-      image: elementary/docker:unstable
-    
+      image: ghcr.io/elementary/docker:${{ matrix.version }}
+
     steps:
     - uses: actions/checkout@v3
     - name: Install Dependencies
@@ -31,14 +35,14 @@ jobs:
   lint:
 
     runs-on: ubuntu-latest
-    
+
     container:
       image: valalang/lint
-      
+
     steps:
     - uses: actions/checkout@v3
     - name: Lint
       run: |
         io.elementary.vala-lint -d compositor
         io.elementary.vala-lint -d src
-        
+
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3b9ed1d52..fc7c64885 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,8 +2,8 @@ name: Release
 
 on:
   pull_request:
-    branches: master
-    types: closed
+    branches: [master]
+    types: [closed]
 jobs:
   release:
      runs-on: ubuntu-latest