diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dc105923..d2d40f91e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,7 +48,7 @@ frontend image:
   stage: build images
   script:
   # TODO: define make target for this?
-    - make -- --docker-build-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman
+    - make -- --docker-build-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
     - podman image save frontend | gzip > docker/frontend/image.tar.gz
   artifacts:
     paths:
@@ -61,7 +61,7 @@ frontend build:
       artifacts: true
   script:
     - &load-frontend-image zcat docker/frontend/image.tar.gz | podman image load
-    - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman
+    - make -- --docker-run-frontend-build FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
   artifacts:
     paths:
       - /fradrive/node_modules
@@ -80,7 +80,7 @@ frontend lint:
       artifacts: true
   script:
     - *load-frontend-image
-    - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman
+    - make -- --docker-run-frontend-lint FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
   cache: *frontend-cache
 
 frontend test:
@@ -92,7 +92,7 @@ frontend test:
       artifacts: true
   script:
     - *load-frontend-image
-    - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman
+    - make -- --docker-run-frontend-test FRADRIVE_SERVICE=frontend CONTAINER_RUNNER=podman-compose
 
   cache: *frontend-cache
 
@@ -114,7 +114,7 @@ backend image:
   stage: build images
   script:
   # TODO: define make target for this?
-    - make -- --docker-build-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman
+    - make -- --docker-build-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
     - podman image save backend | gzip > docker/backend/image.tar.gz
   artifacts:
     paths:
@@ -129,7 +129,7 @@ backend build:
       artifacts: true
   script:
     - &load-backend-image zcat docker/backend/image.tar.gz | podman image load
-    - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman
+    - make -- --docker-run-backend-build FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
   artifacts:
     paths:
       - /fradrive/.stack/
@@ -143,7 +143,7 @@ backend lint:
       artifacts: true
   script:
     - *load-backend-image
-    - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman
+    - make -- --docker-run-backend-lint FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
   cache: *backend-cache
 
 backend test:
@@ -155,7 +155,7 @@ backend test:
       artifacts: true
   script:
     - *load-backend-image
-    - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman
+    - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
   cache: *backend-cache
 
 push backend image:
diff --git a/Makefile b/Makefile
index 119f23c71..adfc188f6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 db ?= -cf
 
-CONTAINER_RUNNER ?= docker
+CONTAINER_RUNNER ?= docker compose
 
 .PHONY: help
 help:
@@ -169,6 +169,6 @@ well-known/.well-known:
 # 	run-s frontend:build --parallel "frontend:build:watch" "yesod:start"
 
 --docker-build-%:
-	$(CONTAINER_RUNNER) compose build $(FRADRIVE_SERVICE)
+	$(CONTAINER_RUNNER) build $(FRADRIVE_SERVICE)
 --docker-run-%:
-	$(CONTAINER_RUNNER) compose run -u `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_SERVICE)
\ No newline at end of file
+	$(CONTAINER_RUNNER) run -u `id -u`:`id -g` --env FRADRIVE_MAKE_TARGET=$* $(FRADRIVE_SERVICE)
\ No newline at end of file