diff --git a/packages/grid/backend/worker_cpu.dockerfile b/packages/grid/backend/worker_cpu.dockerfile
index e1cfe97b287..1970469e062 100644
--- a/packages/grid/backend/worker_cpu.dockerfile
+++ b/packages/grid/backend/worker_cpu.dockerfile
@@ -24,4 +24,4 @@ RUN --mount=type=cache,target=/var/cache/apk,sharing=locked \
     apk update && \
     apk add ${SYSTEM_PACKAGES} && \
     pip install --user ${PIP_PACKAGES} && \
-    ${CUSTOM_CMD}
+    bash -c "$CUSTOM_CMD"
diff --git a/tox.ini b/tox.ini
index 47a5002b672..eaa36993902 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1055,21 +1055,22 @@ setenv =
 commands =
     bash -c 'docker buildx use default || true'
     ; Build the base image
-    bash -c 'docker build -f ./grid/backend/syft_base_cpu.dockerfile . -t cpu-worker:latest'
+    bash -c 'docker build -f ./grid/backend/worker_cpu.dockerfile . -t cpu-worker:latest'
     bash -c 'docker rmi cpu-worker:latest'
 
     bash -c '\
         docker build \
-            -f grid/backend/syft_base_cpu.dockerfile . \
+            -f grid/backend/worker_cpu.dockerfile . \
             -t cpu-worker:opendp \
             --build-arg PIP_PACKAGES="$PIP_PACKAGES" \
             --build-arg SYSTEM_PACKAGES="$SYSTEM_PACKAGES"'
     bash -c 'for pkg in $PIP_PACKAGES; do docker run --rm cpu-worker:opendp pip list | grep "$pkg"; done'
     bash -c 'for pkg in $SYSTEM_PACKAGES; do docker run --rm cpu-worker:opendp apk -e info "$pkg"; done'
+    bash -c 'docker rmi cpu-worker:opendp'
 
     bash -c '\
         docker build \
-            -f grid/backend/syft_base_cpu.dockerfile . \
+            -f grid/backend/worker_cpu.dockerfile . \
             -t cpu-worker:custom-cmd  \
             --build-arg SYSTEM_PACKAGES="perl wget curl make " \
             --build-arg CUSTOM_CMD="""wget -O - "https://github.com/cowsay-org/cowsay/archive/refs/tags/v3.7.0.tar.gz" | tar xvzf - && cd cowsay-3.7.0 && make"""'