diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5331112..eb2ed3c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,6 @@
-build-staging:
-  image: registry.ddbuild.io/docker:20.10.3
-  rules:
-    - if: '$CI_COMMIT_REF_NAME != "master"'
-  tags: ["runner:docker"]
-  script:
-    - docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=staging .
-    - docker push registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
-
 build-prod:
   image: registry.ddbuild.io/docker:20.10.3
-  rules:
-    - if: '$CI_COMMIT_REF_NAME == "master"'
   tags: ["runner:docker"]
   script:
-    - docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=prod .
+    - docker build -t registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA} --label target=prod --target dd-image -f Dockerfile .
     - docker push registry.ddbuild.io/kafka-kit:${CI_PIPELINE_ID}-${CI_COMMIT_SHORT_SHA}
diff --git a/Dockerfile b/Dockerfile
index 42e50baf..32149b24 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:21.04
+FROM ubuntu:22.04 as base
 
 # Install pre-reqs
 ARG DEBIAN_FRONTEND=noninteractive
@@ -69,3 +69,9 @@ RUN apt clean
 
 COPY entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]
+
+FROM registry.ddbuild.io/images/base/gbi-ubuntu_2204 as dd-image
+
+COPY --from=base /entrypoint.sh /
+COPY --from=base /go/bin /usr/bin
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 2864ab18..0f0ef275 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,6 +75,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+      target: base
     ports:
       - "8080"
       - "8090"