diff --git a/.circleci/config.yml b/.circleci/config.yml
index d7e09ea..dfe23ac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,27 @@ jobs:
       - run:
           name: Push to Docker Hub
           command: docker push catdeployed/postal:latest
+      - run:
+          name: Push to Docker Hub
+          command: docker push catdeployed/postal:alpine
+  build-ubuntu:
+    machine: true
+    working_directory: ~/repo/ubuntu
+    steps:
+      - checkout:
+          path: ~/repo
+      - run:
+          name: Build Postal Docker Container
+          command: docker build -t catdeployed/postal:ubuntu .
+      - run:
+          name: Skip this job for Pull Requests
+          command: '[[ -v CIRCLE_PR_NUMBER ]] && circleci step halt || true'
+      - run:
+          name: Login to Docker Hub
+          command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+      - run:
+          name: Push to Docker Hub
+          command: docker push catdeployed/postal:latest
 workflows:
   version: 2
   nightly:
@@ -30,6 +51,8 @@ workflows:
                 - master
     jobs:
       - build-alpine
+      - build-ubuntu
   commit:
     jobs:
       - build-alpine
+      - build-ubuntu
diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index f684885..57550f4 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,12 +1,11 @@
 FROM ruby:2.4-alpine
 
-RUN apk --no-cache add nodejs mysql-client git bash python libcap py-setuptools py-pip build-base python-dev mariadb-dev tzdata \
+RUN apk --no-cache add nodejs mysql-client git bash python libcap py-setuptools py-pip build-base python-dev mariadb-dev \
 	&& pip install j2cli \
         && git clone https://github.com/atech/postal.git /opt/postal \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& gem install bundler \
 	&& gem install procodile \
-	&& gem install tzinfo-data \
 	&& addgroup -S postal \
 	&& adduser -S -G postal -h /opt/postal -s /bin/bash postal \
 	&& chown -R postal:postal /opt/postal/ \