diff --git a/.github/workflows/ros.yml b/.github/workflows/ros.yml
deleted file mode 100644
index 0b06398..0000000
--- a/.github/workflows/ros.yml
+++ /dev/null
@@ -1,110 +0,0 @@
-name: ros
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-jobs:
-  # Job to run change detection
-  changes:
-    runs-on: [self-hosted]
-    outputs:
-      images: ${{ steps.filter.outputs.changes }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          base: ${{ github.ref }}
-          filters: |
-            ros/humble/ubuntu/jammy: 'ros/humble/ubuntu/jammy/**'
-            ros/jazzy/ubuntu/noble: 'ros/jazzy/ubuntu/noble/**'
-
-  build:
-    needs: changes
-    strategy:
-      matrix:
-        image: ${{ fromJSON(needs.changes.outputs.images) }}
-    if: ${{ needs.changes.outputs.images != '[]' && needs.changes.outputs.images != '' }}
-    runs-on: [self-hosted]
-    defaults:
-      run:
-        working-directory: ${{ matrix.image }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Check the Containerfile with hadolint
-        shell: bash
-        working-directory: ${{ matrix.image }}
-        run: |
-          $(git rev-parse --show-toplevel)/bin/lint.sh
-
-      - name: Install QEMU static binaries
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build locally for testing
-        uses: docker/bake-action@v4
-        with:
-          workdir: ${{ matrix.image }}
-          targets: local
-          load: true
-
-      - name: Run tests on the image with cinc-auditor
-        shell: bash
-        working-directory: ${{ matrix.image }}
-        run: |
-          json_data="$(docker buildx bake local --print 2>/dev/null)"
-          test_image=$(echo "$json_data" | jq -r '.target | to_entries[0].value | .tags[0]')
-          $(git rev-parse --show-toplevel)/bin/test-matrix.sh $test_image
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
-        with:
-          username: ${{ secrets.CONTAINER_REGISTRY_USERNAME }}
-          password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
-
-      - name: Build and push
-        uses: docker/bake-action@v4
-        with:
-          workdir: ${{ matrix.image }}
-          push: ${{ github.event_name != 'pull_request' }}
-
-      - name: Get the image name
-        if: ${{ github.event_name != 'pull_request' }}
-        id: image_name
-        shell: bash
-        working-directory: ${{ matrix.image }}
-        run: |
-          echo "image_name=$($(git rev-parse --show-toplevel)/bin/image-name.sh)" >> $GITHUB_ENV
-
-      - name: Get the image description
-        if: ${{ github.event_name != 'pull_request' }}
-        id: image_description
-        shell: bash
-        working-directory: ${{ matrix.image }}
-        run: |
-          echo "image_description=$($(git rev-parse --show-toplevel)/bin/image-description.sh)" >> $GITHUB_ENV
-
-      - name: Get the image readme filepath
-        if: ${{ github.event_name != 'pull_request' }}
-        id: image_readme_filepath
-        shell: bash
-        working-directory: ${{ matrix.image }}
-        run: |
-          echo "image_readme_filepath=$($(git rev-parse --show-toplevel)/bin/image-readme.sh)" >> $GITHUB_ENV
-
-      - name: Update Docker Hub Description
-        if: ${{ github.event_name != 'pull_request' }}
-        uses: peter-evans/dockerhub-description@v4
-        with:
-          username: ${{ secrets.CONTAINER_REGISTRY_USERNAME }}
-          password: ${{ secrets.CONTAINER_DESCRIPTION_PASSWORD }}
-          repository: boxcutter/${{ env.image_name }}
-          short-description: ${{ env.image_description }}
-          readme-filepath: ${{ env.image_readme_filepath }}
diff --git a/ros/noetic/ubuntu/focal/Containerfile b/ros/noetic/ubuntu/focal/Containerfile
index 8858cae..636ba4d 100644
--- a/ros/noetic/ubuntu/focal/Containerfile
+++ b/ros/noetic/ubuntu/focal/Containerfile
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG BASE_IMAGE=docker.io/ubuntu:focal-20240530
+# hadolint ignore=DL3006
 FROM ${BASE_IMAGE} AS base
 
 FROM base AS download
@@ -67,7 +68,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 
 # bootstrap rosdep
 RUN rosdep init && \
-  rosdep update --rosdistro $ROS_DISTRO
+  rosdep update --rosdistro "${ROS_DISTRO}"
 
 # install ros packages
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/ros/noetic/ubuntu/focal/docker-bake.hcl b/ros/noetic/ubuntu/focal/docker-bake.hcl
index 7e6f2ff..d64bc37 100644
--- a/ros/noetic/ubuntu/focal/docker-bake.hcl
+++ b/ros/noetic/ubuntu/focal/docker-bake.hcl
@@ -1,5 +1,5 @@
 variable "TAG_PREFIX" {
-  default = "docker.io/polymathrobotics/ros"
+  default = "docker.io/boxcutter/ros"
 }
 
 # There's no darwin-based Docker, so if we're running on macOS, change the platform to linux