diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a33e945..ba39ef4 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ 'el7', 'el8', 'el9', 'd10', 'd11', 'd12', 'u18', 'u20', 'u22' ]
+        os: [ 'el7', 'el8', 'ol8', 'el9', 'd10', 'd11', 'd12', 'u18', 'u20', 'u22' ]
 
     runs-on: ubuntu-latest
     permissions:
@@ -73,7 +73,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker images
         id: build-and-push
-        if: ${{ matrix.os == 'el7' || matrix.os == 'el8' || matrix.os == 'el9' }}
+        if: ${{ matrix.os == 'el7' || matrix.os == 'el8' || matrix.os == 'ol8'|| matrix.os == 'el9' }}
         uses: docker/build-push-action@v3
         with:
           context: .
diff --git a/docker-envs/Dockerfile-ol8 b/docker-envs/Dockerfile-ol8
new file mode 100644
index 0000000..0eb8d8b
--- /dev/null
+++ b/docker-envs/Dockerfile-ol8
@@ -0,0 +1,20 @@
+FROM oraclelinux:8 AS unibuild-image
+
+#Install pre-requisites
+#Install utils like tree useful for debugging
+#Enable powertools since contains common dependencies
+RUN dnf update -y && \
+    dnf install -y rpm rpm-build rpmdevtools m4 make sudo dnf-plugins-core epel-release tree && \
+    dnf config-manager --set-enabled powertools
+
+#Copy unibuild source
+COPY . /usr/share/unibuild/
+
+#Install unibuild
+WORKDIR /usr/share/unibuild
+RUN make RELEASE=1
+RUN /usr/share/unibuild/libexec/prep/prep
+
+#Shared volume for code to build
+VOLUME /app
+WORKDIR /app