diff --git a/.github/workflows/dockercd-harbor-dask.yml b/.github/workflows/dockercd-harbor-dask.yml
index 8f29344f..f98b2fa6 100644
--- a/.github/workflows/dockercd-harbor-dask.yml
+++ b/.github/workflows/dockercd-harbor-dask.yml
@@ -17,10 +17,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [coffea-casa,
-                coffea-casa-analysis,
-                coffea-casa-cc7,
-                coffea-casa-analysis-cc7]
+        IMAGE: [cc-base-ubuntu,
+                cc-base-centos7,
+                cc-analysis-ubuntu,
+                cc-analysis-centos7
+                cc-centos7,
+                cc-ubuntu,
+                cc-skyhook-ubuntu,
+                cc-skyhook-centos7]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
 
@@ -39,8 +43,8 @@ jobs:
           password: ${{ secrets.HARBOR_PASSWORD }}
       - name: Build Container Image
         run: |
-          cd docker/${{ matrix.IMAGE }}
-          docker build --build-arg TAG="development" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development .
+          cd docker
+          docker build --build-arg TAG="development" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
       - name: Push to Openscience Harbor Registry
         run: |
           docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development
\ No newline at end of file
diff --git a/.github/workflows/dockerci-dask-base.yml b/.github/workflows/dockerci-dask-base.yml
new file mode 100644
index 00000000..4fe2adae
--- /dev/null
+++ b/.github/workflows/dockerci-dask-base.yml
@@ -0,0 +1,35 @@
+# Only test building images
+name: PullRequest-Base
+on:
+  pull_request:
+    paths:
+      - './docker/Dockerfile.cc-base-cc7'
+      - './docker/Dockerfile.cc-base-ubuntu'
+    branches:
+      - master
+      - develop
+env:
+  DOCKER_ORG: coffeateam
+  GITHUB_SHA: ${{ github.sha }}
+  GITHUB_REF: ${{ github.ref }}
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        IMAGE: [cc-base-ubuntu,
+                cc-base-centos7]
+    name: ${{ matrix.IMAGE }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v2
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: Dockerfile.${{ matrix.IMAGE }}
+        tags: ${{ matrix.IMAGE }}:PR
+        platforms: linux/amd64
\ No newline at end of file
diff --git a/.github/workflows/dockerci-dask.yml b/.github/workflows/dockerci-dask.yml
index a2c3904f..7c33941c 100644
--- a/.github/workflows/dockerci-dask.yml
+++ b/.github/workflows/dockerci-dask.yml
@@ -1,5 +1,5 @@
 # Only test building images
-name: PullRequest
+name: PullRequest-All
 
 on:
   pull_request:
@@ -19,24 +19,53 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [coffea-casa,
-                coffea-casa-analysis,
-                coffea-casa-cc7,
-                coffea-casa-analysis-cc7]
+        IMAGE: [cc-analysis-ubuntu,
+                cc-analysis-centos7,
+                cc-centos7,
+                cc-ubuntu,
+                cc-skyhook-ubuntu,
+                cc-skyhook-centos7]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
       uses: actions/checkout@v2
-    - name: Build Image
-      run: |
-        cd docker/${{ matrix.IMAGE }}
-        docker build --build-arg GITHUB_ACTIONS=$GITHUB_ACTIONS -t  ${DOCKER_ORG}/${{ matrix.IMAGE }}:PR .
+    - name: Build base cc7 image
+      uses: docker/build-push-action@v2
+      with:
+        context: ./docker
+        file: ./docker/Dockerfile.cc-base-cc7
+        push: false
+        load: true
+        platforms: linux/amd64
+        tags: coffeateam/cc-base-cc7:PR
+    - name: Build base ubuntu image
+      uses: docker/build-push-action@v2
+      with:
+        context: ./docker
+        file: ./docker/Dockerfile.cc-base-ubuntu
+        push: false
+        load: true
+        platforms: linux/amd64
+        tags: coffeateam/cc-base-ubuntu:PR
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        context: ./docker
+        file: ./docker/Dockerfile.${{ matrix.IMAGE }}
+        tags: ${{ matrix.IMAGE }}:PR
+        platforms: linux/amd64
+        build-args: |
+            GITHUB_ACTIONS=$GITHUB_ACTIONS
+    - name: Build all other images
+      uses: docker/build-push-action@v2
+      with:
+        context: ./docker
+        file: ./docker/Dockerfile.${{ matrix.IMAGE }}
+        platforms: linux/amd64
+        tags: ${{ matrix.IMAGE }}:PR
+        build-args: |
+            python=${{ matrix.python }}
     - name: Export Full Conda Environment
       run: |
-        docker run -e GITHUB_ACTIONS=$GITHUB_ACTIONS ${DOCKER_ORG}/${{ matrix.IMAGE }}:PR conda list --export
-
-    # FIXME: add some tests
-    #- name: Test Image
-    #  run: |
-    #    docker run -u 1000 -w /srv/test -v $PWD:/srv/test ${DOCKER_ORG}/${{ matrix.IMAGE }}:PR ./run_tests.sh ${{ matrix.IMAGE }}
+        docker run -e GITHUB_ACTIONS=$GITHUB_ACTIONS ${DOCKER_ORG}/${{ matrix.IMAGE }}:PR conda list --export
\ No newline at end of file
diff --git a/.github/workflows/dockerci-hub.yml b/.github/workflows/dockerci-hub.yml
index 513d04ad..1c0dd0f3 100644
--- a/.github/workflows/dockerci-hub.yml
+++ b/.github/workflows/dockerci-hub.yml
@@ -7,7 +7,6 @@ on:
       - 'charts/coffea-casa/docker/**'
     branches:
       - master
-      - develop
 
 env:
   DOCKER_ORG: coffeateam
diff --git a/.github/workflows/dockerpublish-harbor-tag.yml b/.github/workflows/dockerpublish-harbor-tag.yml
index b7db8d3f..6d36bf9a 100644
--- a/.github/workflows/dockerpublish-harbor-tag.yml
+++ b/.github/workflows/dockerpublish-harbor-tag.yml
@@ -15,10 +15,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [coffea-casa,
-                coffea-casa-analysis,
-                coffea-casa-cc7,
-                coffea-casa-analysis-cc7]
+        IMAGE: [cc-base-ubuntu,
+                cc-base-centos7,
+                cc-analysis-ubuntu,
+                cc-analysis-centos7
+                cc-centos7,
+                cc-ubuntu,
+                cc-skyhook-ubuntu,
+                cc-skyhook-centos7]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
 
@@ -38,7 +42,7 @@ jobs:
       - name: Build Container Image
         run: |
           cd docker/${{ matrix.IMAGE }}
-          docker build -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:latest -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:$TAG .
+          docker build -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:latest -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:$TAG -f Dockerfile.${{ matrix.IMAGE }} .
       - name: Push to Openscience Harbor Registry
         run: |
           docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:latest
diff --git a/.github/workflows/dockerpublish-tag.yml b/.github/workflows/dockerpublish-tag.yml
index 50fa54ff..cdc65e05 100644
--- a/.github/workflows/dockerpublish-tag.yml
+++ b/.github/workflows/dockerpublish-tag.yml
@@ -19,10 +19,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [coffea-casa,
-                coffea-casa-analysis,
-                coffea-casa-cc7,
-                coffea-casa-analysis-cc7]
+        IMAGE: [cc-base-ubuntu,
+                cc-base-centos7,
+                cc-analysis-ubuntu,
+                cc-analysis-centos7
+                cc-centos7,
+                cc-ubuntu,
+                cc-skyhook-ubuntu,
+                cc-skyhook-centos7]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
 
@@ -38,7 +42,7 @@ jobs:
     - name: Build image
       run: |
         cd docker/${{ matrix.IMAGE }}
-        docker build -t ${DOCKER_ORG}/${{ matrix.IMAGE }}:release .
+        docker build -t ${DOCKER_ORG}/${{ matrix.IMAGE }}:release -f Dockerfile.${{ matrix.IMAGE }} .
 
     - name: Log into registry
       run: echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin