diff --git a/hack/Makefile b/hack/Makefile
index 6cdc45f2fd..8b06f7e191 100644
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -320,7 +320,7 @@ TAGS ?= black-box
 BROWSER ?= Firefox
 test-at-behave: test-at-build  ## AMAUAT: run behave, default is `make test-at-behave TAGS=black-box BROWSER=Firefox`.
 	$(call compose_amauat, \
-		run --rm -e HEADLESS=1 --no-deps archivematica-acceptance-tests /usr/local/bin/behave \
+		run --rm -e HEADLESS=1 --no-deps archivematica-acceptance-tests behave \
 			--no-capture --no-capture-stderr --no-logcapture \
 			$(subst $(SPACE), --tags=,$(SPACE)$(TAGS)) --no-skipped -v --stop \
 			-D driver_name=$(BROWSER) \
diff --git a/hack/docker-compose.acceptance-tests.yml b/hack/docker-compose.acceptance-tests.yml
index c55d91eeb4..81233e58b4 100644
--- a/hack/docker-compose.acceptance-tests.yml
+++ b/hack/docker-compose.acceptance-tests.yml
@@ -5,11 +5,15 @@ services:
     build:
       context: "./submodules/archivematica-acceptance-tests"
       dockerfile: "Dockerfile"
+      args:
+        TARGET: "archivematica-acceptance-tests"
+        USER_ID: ${USER_ID:-1000}
+        GROUP_ID: ${GROUP_ID:-1000}
+        PYTHON_VERSION: ${PYTHON_VERSION:-3.9}
     security_opt:
       - "seccomp:unconfined"
     volumes:
       - "/dev/shm:/dev/shm"
-      - "./submodules/archivematica-acceptance-tests:/home/archivematica/acceptance-tests:rw"
       - "./submodules/archivematica-sampledata:/home/archivematica/archivematica-sampledata:ro"
       - "archivematica_pipeline_data:/var/archivematica/sharedDirectory:ro"
     links: