diff --git a/.circleci/config.yml b/.circleci/config.yml
index c7f52f18..16b2b38c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,11 +56,15 @@ commands:
             mount.efs --version
   build-rpm:
     steps:
-      - checkout
       - run:
           name: Install dependencies
           command: |
-            yum -y install rpm-build make systemd
+            yum -y install rpm-build make systemd git
+      - run:
+          name: Add local build repo as safe git directory
+          command: |
+            git config --global --add safe.directory /tmp/_circleci_local_build_repo
+      - checkout
       - run:
           name: Build RPM
           command: |
@@ -216,6 +220,9 @@ workflows:
       - build-rpm-package:
           name: rocky8
           image: rockylinux/rockylinux:8
+      - build-rpm-package:
+          name: rocky9
+          image: rockylinux/rockylinux:9
       - build-rpm-package:
           name: amazon-linux-latest
           image: amazonlinux:latest