diff --git a/.github/workflows/container-build-push.yaml b/.github/workflows/container-build-push.yaml
index 6279a7e8..b7a47a76 100644
--- a/.github/workflows/container-build-push.yaml
+++ b/.github/workflows/container-build-push.yaml
@@ -17,7 +17,9 @@ jobs:
         uses: actions/checkout@v3
       - name: Build the CNeuroMax image
         run: podman build -t cneuromod/cneuromax:latest -f Containerfile .
-      - name: Remove dangling images
-        run: podman image prune
       - name: Push the CNeuroMax image to Docker Hub
         run: podman push docker.io/cneuromod/cneuromax:latest
+      - name: Remove Buildah containers
+        run: buildah rm --all
+      - name: Remove dangling images
+        run: podman image prune -f
diff --git a/Containerfile b/Containerfile
index ec25e6ac..2eac9c79 100644
--- a/Containerfile
+++ b/Containerfile
@@ -21,8 +21,6 @@ RUN apt update && apt install -y \
     python3-dev \
     # Python package manager
     python3-pip \
-    # OpenCV requires system packages, best to install through Ubuntu
-    python3-opencv \
     # To pip install GitHub packages
     git \
     # Java (to build our fork of Hydra)
@@ -35,6 +33,6 @@ ADD pyproject.toml /cneuromax/pyproject.toml
 ADD cneuromax /cneuromax/cneuromax
 
 # Install Python dependencies
-RUN pip install --user --no-cache-dir --upgrade pip \
-    && pip install --user --no-cache-dir -e cneuromax \
+RUN pip install --no-cache-dir --upgrade pip \
+    && pip install --no-cache-dir -e cneuromax \
     && pip uninstall -y cneuromax
diff --git a/pyproject.toml b/pyproject.toml
index 4662dcdf..6d2801b5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,10 +22,12 @@ dependencies = [
     # Required for cneuromax/fitting/deeplearning/
     "torch==2.1.0",
     "lightning==2.1.0",
+    "transformers==4.34.0",
     # Required for cneuromax/fitting/neuroevolution/
     "mpi4py==3.1.5",
+    # Computer Vision packages
     "torchvision==0.16.0",
-    "transformers==4.34.0",
+    "opencv-python==4.8.1.78",
     # Torch shapes
     "jaxtyping==0.2.22",
     "beartype==0.16.3",
@@ -51,7 +53,6 @@ dependencies = [
     "pytest==7.4.2",
     "pytest-cov==4.1.0",
     # W&B
-    "protobuf==3.20.3",
     "wandb==0.15.12",
     "wandb-osh==1.1.2",
 ]