diff --git a/.github/workflows/integration-test-build-push.yaml b/.github/workflows/integration-test-build-push.yaml
deleted file mode 100644
index e52d11288..000000000
--- a/.github/workflows/integration-test-build-push.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: Build and push edge tag
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths-ignore:
-      - 'docs/**'
-      - 'helm/**'
-      - 'assets/**'
-      - '**.md'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Login to Docker Hub
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-      
-      - name: Build and push
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/integration-test-run.yaml b/.github/workflows/integration-test.yaml
similarity index 85%
rename from .github/workflows/integration-test-run.yaml
rename to .github/workflows/integration-test.yaml
index b095f4aba..1f33c1ff2 100644
--- a/.github/workflows/integration-test-run.yaml
+++ b/.github/workflows/integration-test.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
       - name: Start compose
-        run: docker-compose up --exit-code-from quest quest 
+        run: docker-compose up --build --exit-code-from quest quest 
       - name: Stop compose
         if: always()
         run: docker-compose down
diff --git a/Dockerfile.ubi b/Dockerfile.ubi
new file mode 100644
index 000000000..a54dbea0e
--- /dev/null
+++ b/Dockerfile.ubi
@@ -0,0 +1,35 @@
+# Copyright (C) 2023 Parseable, Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+FROM registry.access.redhat.com/ubi8/ubi:latest as builder
+
+LABEL org.opencontainers.image.title="Parseable"
+LABEL maintainer="Parseable Team <hi@parseable.io>"
+LABEL org.opencontainers.image.vendor="Cloudnatively Pvt Ltd"
+LABEL org.opencontainers.image.licenses="AGPL-3.0"
+
+WORKDIR /parseable
+
+RUN yum install -y rust-toolset-1.67.0
+
+COPY . .
+
+RUN cargo build --release --target x86_64-unknown-linux-gnu
+
+FROM registry.access.redhat.com/ubi8/ubi:minimal
+
+COPY --from=builder /parseable/target/x86_64-unknown-linux-gnu/release/parseable /usr/bin/parseable
+
+CMD ["parseable"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0ef2bc68f..b1316c8b7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -27,7 +27,9 @@ services:
       - parseable-internal
 
   parseable:
-    image: ghcr.io/parseablehq/parseable:main
+    build:
+      context: .
+      dockerfile: Dockerfile
     command: ["parseable", "s3-store"]
     ports:
       - 8000