diff --git a/.zuul.yaml b/.zuul.yaml
index 34d9e4e049..f20329b7b6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -187,6 +187,32 @@
     vars: *jinja-init_vars
     files: *jinja-init_files
 
+- job:
+    name: system-config-build-image-gitea-init
+    description: Build a gitea-init image
+    parent: system-config-build-image
+    vars: &gitea-init_vars
+      images:
+        - context: docker/gitea-init
+          target: gitea-init
+          repository: opendevorg/gitea-init
+    files: &gitea-init_files
+      - docker/gitea-init/.*
+
+- job:
+    name: system-config-upload-image-gitea-init
+    description: Build and upload a gitea-init image
+    parent: system-config-upload-image
+    vars: *gitea-init_vars
+    files: *gitea-init_files
+
+- job:
+    name: system-config-promote-image-gitea-init
+    description: Promote a previously published gitea-init image to latest
+    parent: system-config-promote-image
+    vars: *gitea-init_vars
+    files: *gitea-init_files
+
 # Role integration jobs.  These test the top-level generic roles/*
 # under Zuul.  The range of platforms should be the same as those for
 # openstack-zuul-jobs.
@@ -471,6 +497,7 @@
         - system-config-run-docker
         - system-config-build-image-gitea
         - system-config-build-image-jinja-init
+        - system-config-build-image-gitea-init
     gate:
       jobs:
         - tox-linters
@@ -486,7 +513,9 @@
         - system-config-run-docker
         - system-config-upload-image-gitea
         - system-config-upload-image-jinja-init
+        - system-config-upload-image-gitea-init
     promote:
       jobs:
         - system-config-promote-image-gitea
         - system-config-promote-image-jinja-init
+        - system-config-promote-image-gitea-init
diff --git a/docker/gitea-init/Dockerfile b/docker/gitea-init/Dockerfile
index 74cf56ed44..2534ed9ea7 100644
--- a/docker/gitea-init/Dockerfile
+++ b/docker/gitea-init/Dockerfile
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-FROM jeblair/jinja-init
+FROM opendevorg/jinja-init
 
 COPY entrypoint.sh /