diff --git a/Dockerfile b/Dockerfile
index fd605d9..824f241 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,8 @@
 # Docker image for Python Behavior Driven Development Pipeline
-FROM python:3.9-slim
+FROM rofrano/nyu-devops-base:sp23
 
-RUN apt-get update && apt-get install -y \
-    curl \
-    wget \
-    chromium-driver \
-    python3-selenium
+RUN sudo apt-get update && \
+    sudo apt-get install -y chromium-driver python3-selenium
 
 WORKDIR /app
 
diff --git a/Makefile b/Makefile
index dff884d..591d0f2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PLATFORM ?= "linux/amd64,linux/arm64"
 
 DOCKER_BUILDKIT = 1
 
-all: build
+all: init build
 
 ## help:	Lists help on the commands
 .PHONY: help
@@ -32,7 +32,8 @@ clean:	## Removes all dangling build cache
 init: export DOCKER_BUILDKIT=1
 init:	## Creates the buildx instance
 	$(info Initializing Builder...)
-	docker buildx create --use --name=qemu
+	-docker buildx create qemu
+	docker buildx use qemu
 	docker buildx inspect --bootstrap
 
 .PHONY: build