diff --git a/components/runners/claude-code-runner/Dockerfile b/components/runners/claude-code-runner/Dockerfile
index 8580dd598..1b0e3e63e 100644
--- a/components/runners/claude-code-runner/Dockerfile
+++ b/components/runners/claude-code-runner/Dockerfile
@@ -1,13 +1,13 @@
-FROM python:3.11-slim
+FROM registry.access.redhat.com/ubi9/python-311@sha256:d0b35f779ca0ae87deaf17cd1923461904f52d3ef249a53dbd487e02bdabdde6
 
-# Install system dependencies
-RUN apt-get update && apt-get install -y \
-    git \
-    curl \
-    jq \
-    gh \
-    ca-certificates \
-    && rm -rf /var/lib/apt/lists/*
+USER 0
+
+# Add GitHub CLI repository and install packages
+RUN dnf install -y 'dnf-command(config-manager)' && \
+    dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo && \
+    dnf install -y gh --repo gh-cli && \
+    dnf install -y git jq && \
+    dnf clean all
 
 # Create working directory
 WORKDIR /app
@@ -34,5 +34,7 @@ ENV TERM=xterm-256color
 # OpenShift compatibility
 RUN chmod -R g=u /app && chmod -R g=u /usr/local && chmod g=u /etc/passwd
 
+USER 1001
+
 # Default command - run via runner-shell
 CMD ["python", "/app/claude-runner/wrapper.py"]