diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7c0024..40a36da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,12 +88,10 @@ build-debian:
     - docker build --cache-from $IMAGE_BASE/debian --tag $IMAGE_BASE/debian:$CI_COMMIT_SHA --tag $IMAGE_BASE/debian:latest -f Dockerfile.debian .
     - docker push $IMAGE_BASE/debian:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/debian:latest
-  only:
-    refs:
-      - master@openlp/runners
-    changes:
-      - Dockerfile.debian
-
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+      changes:
+        - Dockerfile.debian
 
 build-ubuntu:
   stage: build
@@ -102,11 +100,10 @@ build-ubuntu:
     - docker build --cache-from $IMAGE_BASE/ubuntu --tag $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA --tag $IMAGE_BASE/ubuntu:latest -f Dockerfile.ubuntu .
     - docker push $IMAGE_BASE/ubuntu:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/ubuntu:latest
-  only:
-    refs:
-      - master@openlp/runners
-    changes:
-      - Dockerfile.ubuntu
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+      changes:
+        - Dockerfile.ubuntu
 
 build-fedora:
   stage: build
@@ -115,11 +112,10 @@ build-fedora:
     - docker build --cache-from $IMAGE_BASE/fedora --tag $IMAGE_BASE/fedora:$CI_COMMIT_SHA --tag $IMAGE_BASE/fedora:latest -f Dockerfile.fedora .
     - docker push $IMAGE_BASE/fedora:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/fedora:latest
-  only:
-    refs:
-      - master@openlp/runners
-    changes:
-      - Dockerfile.fedora
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+      changes:
+        - Dockerfile.fedora
 
 build-arch:
   stage: build
@@ -128,11 +124,10 @@ build-arch:
     - docker build --cache-from $IMAGE_BASE/arch --tag $IMAGE_BASE/arch:$CI_COMMIT_SHA --tag $IMAGE_BASE/arch:latest -f Dockerfile.arch .
     - docker push $IMAGE_BASE/arch:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/arch:latest
-  only:
-    refs:
-      - master@openlp/runners
-    changes:
-      - Dockerfile.arch
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+      changes:
+        - Dockerfile.arch
 
 build-angular:
   stage: build
@@ -141,11 +136,10 @@ build-angular:
     - docker build --cache-from $IMAGE_BASE/angular --tag $IMAGE_BASE/angular:$CI_COMMIT_SHA --tag $IMAGE_BASE/angular:latest -f Dockerfile.angular .
     - docker push $IMAGE_BASE/angular:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/angular:latest
-  only:
-    refs:
-      - master@openlp/runners
-    changes:
-      - Dockerfile.angular
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+      changes:
+        - Dockerfile.angular
 
 build-documentation:
   stage: build
@@ -154,11 +148,10 @@ build-documentation:
     - docker build --cache-from $IMAGE_BASE/documentation --tag $IMAGE_BASE/documentation:$CI_COMMIT_SHA --tag $IMAGE_BASE/documentation:latest -f Dockerfile.documentation .
     - docker push $IMAGE_BASE/documentation:$CI_COMMIT_SHA
     - docker push $IMAGE_BASE/documentation:latest
-  only:
-    refs:
-      - master@openlp/runners
-    changes:
-      - Dockerfile.documentation
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master" && $CI_PROJECT_PATH_SLUG == "openlp/runners"
+      changes:
+        - Dockerfile.documentation
 
 build-all:
   stage: build
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 63e91ae..f33b1f3 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM fedora:39
 
 RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
                    https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm