diff --git a/.github/workflows/dockercd-dev.yml b/.github/workflows/dockercd-dev.yml
index 928760b2..54e7d745 100644
--- a/.github/workflows/dockercd-dev.yml
+++ b/.github/workflows/dockercd-dev.yml
@@ -74,9 +74,9 @@ jobs:
           file: docker/Dockerfile.${{ matrix.image }}
           push: ${{  github.event_name == 'push' }}
           platforms: linux/amd64
-          tags: ${{ steps.date.outputs.tags }}
+          tags: ${{ steps.tags.outputs.tags }}
           build-args: 
             DEV=true
-            TAG=${{ steps.date.outputs.releasetag }}
+            TAG=${{ steps.tags.outputs.releasetag }}
             PROJECT=${{ env.PROJECT }} 
             GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
diff --git a/.github/workflows/dockercd-tag.yml_ b/.github/workflows/dockercd-tag.yml_
deleted file mode 100644
index 39e066d4..00000000
--- a/.github/workflows/dockercd-tag.yml_
+++ /dev/null
@@ -1,339 +0,0 @@
-name: Build docker images and push it in Harbor
-
-on:
-  release:
-    types: [published]
-
-env:
-  PROJECT: 'coffea-casa'
-  GITHUB_ACTIONS: 'true'
-  REGISTRY: 'hub.opensciencegrid.org'
-  CACHE_PATH: /tmp/.buildx-cache
-
-jobs:
-  dask-base:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-          driver-opts: network=host
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/coffea-casa/cc-base-ubuntu
-          flavor: latest=false
-          tags: |
-            type=ref,event=tag
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Login to Harbor Hub
-        if: success() && github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: hub.opensciencegrid.org
-          username: ${{ secrets.HARBOR_USER }}
-          password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build
-        uses: docker/build-push-action@v3.0.0
-        with:
-          push: true
-          cache-from: |
-            type=local,src=${{ env.CACHE_PATH }}
-          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: docker/
-          file: docker/Dockerfile.cc-base-ubuntu
-          tags: |
-            ${{ steps.meta.outputs.tags }}
-          build-args: |
-            TAG=${{ github.ref_name }}
-            PROJECT=${{ env.PROJECT }} 
-            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-            REGISTRY=${{ env.REGISTRY }}
-
-  dask-cc:
-    runs-on: ubuntu-latest
-    needs: [dask-base]
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-          driver-opts: network=host
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/coffea-casa/cc-ubuntu
-          flavor: latest=false
-          tags: |
-            type=ref,event=tag
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Login to Harbor Hub
-        if: success() && github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.HARBOR_USER }}
-          password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build
-        uses: docker/build-push-action@v3.0.0
-        with:
-          #push: ${{ github.event_name != 'pull_request' }}
-          push: true
-          cache-from: |
-            type=local,src=${{ env.CACHE_PATH }}
-          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-          context: docker/
-          file: docker/Dockerfile.cc-ubuntu
-          tags: |
-            ${{ steps.meta.outputs.tags }}
-          build-args: |
-            TAG=${{ github.ref_name }}
-            PROJECT=${{ env.PROJECT }} 
-            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-            REGISTRY=${{ env.REGISTRY }}
-
-#  dask-skyhook:
-#    runs-on: ubuntu-latest
-#    needs: [dask-cc]
-#    steps:
-#      - name: Check out code
-#        uses: actions/checkout@v2
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v2
-#      - name: Set up Docker Buildx
-#        id: buildx
-#        uses: docker/setup-buildx-action@v2
-#        with:
-#          version: latest
-#          driver-opts: network=host
-#      - name: Cache Docker layers
-#        uses: actions/cache@v2
-#        id: cache
-#        with:
-#          path: ${{ env.CACHE_PATH }}
-#          key: ${{ runner.os }}-buildx-${{ github.sha }}
-#          restore-keys: |
-#            ${{ runner.os }}-buildx-
-#      - name: Login to Harbor Hub
-#        if: success() && github.event_name != 'pull_request'
-#        uses: docker/login-action@v2
-#        with:
-#          registry: ${{ env.REGISTRY }}
-#          username: ${{ secrets.HARBOR_USER }}
-#          password: ${{ secrets.HARBOR_PASSWORD }}
-#      - name: Build
-#        uses: docker/docker/build-push-action@v3.0.0
-#        with:
-#          push: ${{ github.event_name != 'pull_request' }}
-#          cache-from: |
-#            type=local,src=${{ env.CACHE_PATH }}
-#          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-#          context: docker/
-#          file: docker/Dockerfile.cc-base-centos7
-#          tags: |
-#            ${{ env.REGISTRY }}/coffea-casa/cc-ubuntu-skyhook:${{ steps.meta.outputs.tags }}
-#          build-args: |
-#            TAG=${{ github.ref_name }}
-#            PROJECT=${{ env.PROJECT }} 
-#            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-#            REGISTRY=${{ env.REGISTRY }}
-#      - name: Cleanup
-#        run: |
-#          docker stop registry
-
-  dask-analysis:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-          driver-opts: network=host
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ env.REGISTRY }}/coffea-casa/cc-analysis-ubuntu
-          flavor: latest=false
-          tags: |
-            type=ref,event=tag
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Login to Harbor Hub
-        if: success() && github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.HARBOR_USER }}
-          password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          #push: ${{ github.event_name != 'pull_request' }}
-          push: true
-          #outputs: type=docker,dest=/tmp/cc-analysis-ubuntu.tar
-          cache-from: |
-            type=local,src=${{ env.CACHE_PATH }}
-          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-          context: docker/
-          file: docker/Dockerfile.cc-analysis-ubuntu
-          tags: |
-            ${{ steps.meta.outputs.tags }}
-          build-args: |
-            TAG=${{ github.ref_name }} 
-            PROJECT=${{ env.PROJECT }} 
-            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-            REGISTRY=${{ env.REGISTRY }}
-
-#  dask-analysis-skyhook:
-#    runs-on: ubuntu-latest
-#    needs: [dask-analysis]
-#    steps:
-#      - name: Check out code
-#        uses: actions/checkout@v2
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v2
-#      - name: Set up Docker Buildx
-#        id: buildx
-#        uses: docker/setup-buildx-action@v2
-#        with:
-#          version: latest
-#          driver-opts: network=host
-#      - name: Cache Docker layers
-#        uses: actions/cache@v2
-#        id: cache
-#        with:
-#          path: ${{ env.CACHE_PATH }}
-#          key: ${{ runner.os }}-buildx-${{ github.sha }}
-#          restore-keys: |
-#            ${{ runner.os }}-buildx-
-#      - name: Login to Harbor Hub
-#        if: success() && github.event_name != 'pull_request'
-#        uses: docker/login-action@v2
-#        with:
-#          registry: ${{ env.REGISTRY }}
-#          username: ${{ secrets.HARBOR_USER }}
-#          password: ${{ secrets.HARBOR_PASSWORD }}
-#      - name: Build
-#        uses: docker/build-push-action@v3.0.0
-#        with:
-#          #push: ${{ github.event_name != 'pull_request' }}
-#          push: true
-#          cache-from: |
-#            type=local,src=${{ env.CACHE_PATH }}
-#          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-#          context: docker/
-#          file: docker/Dockerfile.cc-analysis-ubuntu-skyhook
-#          tags: |
-#            ${{ env.REGISTRY }}/coffea-casa/cc-analysis-ubuntu-skyhook:${{ steps.meta.outputs.tags }}
-#          build-args: |
-#            TAG=${{ github.ref_name }}
-#            PROJECT=${{ env.PROJECT }} 
-#            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-#            REGISTRY=${{ env.REGISTRY }}
-
-
-name: Test docker images
-
-on:
-  pull_request:
-    paths:
-      - docker/**
-    branches:
-      - master
-  workflow_dispatch:
-
-env:
-  PROJECT: 'coffea-casa'
-  GITHUB_ACTIONS: 'true'
-  #REGISTRY: 'localhost:5000'
-  #REGISTRY_PATH: ${{ github.workspace }}/registry
-  #CACHE_PATH: /tmp/.buildx-cache
-
-jobs:
-  matrix-build:
-    strategy:
-      fail-fast: false
-      matrix:
-        image: [cc-base-ubuntu, cc-analysis-ubuntu]
-        # Keep this line in sync with gh actions @ coffea-dask repo
-        # python: [3.8, 3.9, '3.10']
-        #exclude:
-        #  - image: cc7
-        #    python: 3.8           
-    name: ${{ matrix.image }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Fetch current date (with timestamp)
-        id: date
-        run: |
-          echo "::set-output name=date::$(date +"%Y-%m-%d_%H-%M-%S")"
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-          driver-opts: network=host
-      - name: Login to Harbor Hub
-        if: success() && github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: hub.opensciencegrid.org
-          username: ${{ secrets.HARBOR_USER }}
-          password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build and push
-        uses: docker/build-push-action@v3.0.0
-        with:
-          context: docker/
-          file: docker/Dockerfile.${{ matrix.image }}
-          push: ${{  github.event_name == 'push' }}
-          platforms: linux/amd64
-          tags: coffea-casa/${{ matrix.image }}:development
-          build-args: 
-            DEV=true
-            TAG=development 
-            PROJECT=${{ env.PROJECT }} 
-            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}