diff --git a/.github/workflows/rebuild-devfile-registry.yml b/.github/workflows/rebuild-devfile-registry.yml
index bdfa193..92216b0 100644
--- a/.github/workflows/rebuild-devfile-registry.yml
+++ b/.github/workflows/rebuild-devfile-registry.yml
@@ -12,8 +12,8 @@ name: Rebuild Devfile Registry
 on:
   push:
     branches:
-      - 'devspaces-[0-9].[0-9]+-rhel-8'
-      - devspaces-3-rhel-8
+      - 'devspaces-[0-9].[0-9]+-rhel-9'
+      - devspaces-3-rhel-9
 
 jobs:
   publish:
diff --git a/devfile.yaml b/devfile.yaml
index 40f5545..3b02d5b 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -4,7 +4,7 @@ metadata:
 components:
   - name: tools
     container:
-      image: registry.redhat.io/devspaces/udi-rhel8:3.19
+      image: registry.redhat.io/devspaces/udi-rhel9:3.19
       memoryLimit: '2Gi'
       memoryRequest: '1Gi'
       cpuLimit: '1'