diff --git a/.github/workflows/push-container.yml b/.github/workflows/push-container.yml
index 5a4f783..4d72a75 100644
--- a/.github/workflows/push-container.yml
+++ b/.github/workflows/push-container.yml
@@ -4,50 +4,13 @@ on:
   push:
     branches: ["main"]
     tags:
-      - v[0-9]+.[0-9]+.[0-9]+ # Semver Release (non-prerelease)
+      - 'v*.*.*' # glob for semver tags (including prereleases)
   pull_request:
     branches: [main]
 
 jobs:
-  docker:
-    if: startsWith(github.repository, 'osg-htc/')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: "recursive"
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: hub.opensciencegrid.org/opensciencegrid/osdf-website
-          # New: apply the 'latest' tag to non-prerelease semver tags
-          tags: |
-            type=raw,value=sha-{{sha}}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')}}
-            type=raw,value=latest-itb,enable=${{ startsWith(github.ref, 'refs/tags/v') && contains(github.ref, '-')}}
-            type=raw,value=latest-,suffix={{date 'YYYYMMDDHHmmss'}},enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-')}}
-            type=raw,value=latest-itb-,suffix={{date 'YYYYMMDDHHmmss'}}
-            type=ref,event=pr
-            type=ref,event=branch,suffix=-{{date 'YYYYMMDDHHmmss'}}
-            type=semver,pattern={{version}}
-          flavor: |
-            latest=false
-      - name: Set up Docker BuildX
-        uses: docker/setup-buildx-action@v2
-      - name: Login to OSG DockerHub
-        uses: docker/login-action@v2
-        with:
-          registry: hub.opensciencegrid.org
-          username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
-          password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+  call-build-image:
+    uses: osg-htc/build-push/.github/workflows/build-push.yaml@main
+    secrets: inherit
+    with:
+      image: 'hub.opensciencegrid.org/opensciencegrid/osdf-website'