diff --git a/manifest.yml b/manifest.yml
index bcf27884..e8c04dde 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -32,12 +32,27 @@ DISTGEN_MULTI_RULES:
   - src: src/Dockerfile
     dest: Dockerfile.c9s
 
+  - src: src/Dockerfile
+    dest: Dockerfile.c8s
+
   - src: src/Dockerfile.fedora
     dest: Dockerfile.fedora
 
 
 # Files to copy
 COPY_RULES:
+  - src: src/CentOS-Stream-AppStream.repo
+    dest: CentOS-Stream-AppStream.repo
+
+  - src: src/CentOS-Stream-BaseOS.repo
+    dest: CentOS-Stream-BaseOS.repo
+
+  - src: src/CentOS-Stream-Extras.repo
+    dest: CentOS-Stream-Extras.repo
+
+  - src: src/CentOS-Stream-Extras-common.repo
+    dest: CentOS-Stream-Extras-common.repo
+
   - src: src/root/usr/libexec/fix-permissions
     dest: root/usr/libexec/fix-permissions
     mode: "0755"
diff --git a/specs/multispec.yml b/specs/multispec.yml
index d4bc0911..10f1cc68 100644
--- a/specs/multispec.yml
+++ b/specs/multispec.yml
@@ -42,6 +42,21 @@ specs:
            { yum -y module enable postgresql:{{ spec.version }} || :; } && \
        post_install: >-4
            (yum -y reinstall tzdata || yum -y update tzdata ) && \
+    c8s:
+      distros:
+        - centos-stream-8-x86_64
+      s2i_base: quay.io/sclorg/s2i-core-c8s:c8s
+      org: "sclorg"
+      prod: "c8s"
+      openshift_tags: "database,postgresql,postgresql{{ spec.short }},postgresql-{{ spec.short }}"
+      redhat_component: "postgresql-{{ spec.short }}-container"
+      img_name: "{{ spec.org }}/postgresql-{{ spec.short }}-{{ spec.prod }}"
+      pkgs: "postgresql-server postgresql-contrib"
+      environment_setup: >-4
+          yum -y module enable postgresql:{{ spec.version }} && \
+      post_install: >-4
+          yum -y reinstall tzdata && \
+
     c9s:
       distros:
         - centos-stream-9-x86_64
@@ -106,16 +121,22 @@ specs:
 
 matrix:
   include:
+    - version: "10"
+      distros:
+        - rhel-8-x86_64
+        - centos-stream-8-x86_64
     - version: "12"
       distros:
         - rhel-8-x86_64
         - fedora-38-x86_64
+        - centos-stream-8-x86_64
     - version: "13"
       distros:
         - rhel-8-x86_64
         - rhel-9-x86_64
         - centos-stream-9-x86_64
         - fedora-38-x86_64
+        - centos-stream-8-x86_64
     - version: "14"
       distros:
         - fedora-38-x86_64
@@ -124,10 +145,12 @@ matrix:
         - rhel-8-x86_64
         - rhel-9-x86_64
         - centos-stream-9-x86_64
+        - centos-stream-8-x86_64
         - fedora-38-x86_64
     - version: "16"
       distros:
         - rhel-8-x86_64
         - rhel-9-x86_64
         - centos-stream-9-x86_64
+        - centos-stream-8-x86_64
         - fedora-38-x86_64
diff --git a/src/CentOS-Stream-AppStream.repo b/src/CentOS-Stream-AppStream.repo
new file mode 100644
index 00000000..5f1c9c7d
--- /dev/null
+++ b/src/CentOS-Stream-AppStream.repo
@@ -0,0 +1,17 @@
+# CentOS-Stream-AppStream.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[appstream]
+name=CentOS Stream 8 - AppStream
+#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
+baseurl=https://vault.centos.org/8-stream/AppStream/$basearch/os/
+gpgcheck=0
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/src/CentOS-Stream-BaseOS.repo b/src/CentOS-Stream-BaseOS.repo
new file mode 100644
index 00000000..98e565d7
--- /dev/null
+++ b/src/CentOS-Stream-BaseOS.repo
@@ -0,0 +1,17 @@
+# CentOS-Stream-BaseOS.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[baseos]
+name=CentOS Stream 8 - BaseOS
+#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
+baseurl=https://vault.centos.org/8-stream/BaseOS/$basearch/os/
+gpgcheck=0
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/src/CentOS-Stream-Extras-common.repo b/src/CentOS-Stream-Extras-common.repo
new file mode 100644
index 00000000..374d5a5f
--- /dev/null
+++ b/src/CentOS-Stream-Extras-common.repo
@@ -0,0 +1,17 @@
+# CentOS-Stream-Extras-common.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[extras-common]
+name=CentOS Stream 8 - Extras common
+#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
+baseurl=https://vault.centos.org/8-stream/centosplus/$basearch/os/
+gpgcheck=0
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
\ No newline at end of file
diff --git a/src/CentOS-Stream-Extras.repo b/src/CentOS-Stream-Extras.repo
new file mode 100644
index 00000000..b2c4ad57
--- /dev/null
+++ b/src/CentOS-Stream-Extras.repo
@@ -0,0 +1,17 @@
+# CentOS-Stream-Extras.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[extras]
+name=CentOS Stream 8 - Extras
+#mirrorlist=https://vault.centos.org/8-stream?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
+baseurl=https://vault.centos.org/8-stream/extras/$basearch/os/
+gpgcheck=0
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/src/Dockerfile b/src/Dockerfile
index 3d020c1c..7be68672 100644
--- a/src/Dockerfile
+++ b/src/Dockerfile
@@ -48,6 +48,7 @@ LABEL summary="$SUMMARY" \
 EXPOSE 5432
 
 COPY root/usr/libexec/fix-permissions /usr/libexec/fix-permissions
+COPY CentOS-Stream-AppStream.repo CentOS-Stream-BaseOS.repo CentOS-Stream-Extras.repo CentOS-Stream-Extras-common.repo /etc/yum.repos.d/
 
 # This image must forever use UID 26 for postgres user so our volumes are
 # safe in the future. This should *never* change, the last test is there