diff --git a/shippable.yml b/shippable.yml
index a4ed31f424..f7644d063a 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -8,14 +8,19 @@ env:
   - AWX_BUILD_TARGET=ui-test-ci
   - AWX_BUILD_TARGET="flake8 jshint"
 
+branches:
+  only:
+    - devel
+    - release_*
+
 build:
   pre_ci:
     - docker build -t ansible/awx_devel -f tools/docker-compose/Dockerfile .
-    - docker tag ansible/awx_devel gcr.io/ansible-tower-engineering/awx_devel:${BASE_BRANCH:-latest}
+    - docker tag ansible/awx_devel gcr.io/ansible-tower-engineering/awx_devel:latest
   pre_ci_boot:
     options: "-v /awx_devel:/awx_devel"
   ci:
     - cp -R . /awx_devel
     - pip install -U docker-compose
-    - docker-compose -f tools/docker-compose/unit-tests/docker-compose.yml build --build-arg TAG=${BASE_BRANCH:-latest} unit-tests
-    - docker-compose -f tools/docker-compose/unit-tests/docker-compose.yml run -v /awx_devel:/awx_devel unit-tests "make ${AWX_BUILD_TARGET}"
+    - docker-compose -f tools/docker-compose/unit-tests/docker-compose-shippable.yml build --build-arg TAG=latest unit-tests
+    - docker-compose -f tools/docker-compose/unit-tests/docker-compose-shippable.yml run unit-tests "make ${AWX_BUILD_TARGET}" 
diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile
index 15d8d25c22..9398c89398 100644
--- a/tools/docker-compose/unit-tests/Dockerfile
+++ b/tools/docker-compose/unit-tests/Dockerfile
@@ -1,5 +1,4 @@
-ARG TAG=latest
-FROM gcr.io/ansible-tower-engineering/awx_devel:$TAG
+FROM gcr.io/ansible-tower-engineering/awx_devel:latest
 
 # For UI tests
 RUN yum install -y bzip2 gcc-c++
diff --git a/tools/docker-compose/unit-tests/docker-compose-shippable.yml b/tools/docker-compose/unit-tests/docker-compose-shippable.yml
new file mode 100644
index 0000000000..b314d6acdd
--- /dev/null
+++ b/tools/docker-compose/unit-tests/docker-compose-shippable.yml
@@ -0,0 +1,14 @@
+---
+version: '3'
+services:
+  unit-tests:
+    build:
+      context: ../../../
+      dockerfile: tools/docker-compose/unit-tests/Dockerfile
+    image: gcr.io/ansible-tower-engineering/unit-test-runner:${GIT_BRANCH:-latest}
+    environment:
+      SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
+      TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests awx/sso/tests
+    command: ["make test"]
+    volumes:
+      - /awx_devel:/awx_devel