diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5fdc602..2dbf243e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,16 +36,16 @@ jobs:
           make dockerbuild
       - name: Start services
         run: |
-          docker-compose up -d
+          make up
       - name: Run tests
         run: |
           make test
-      - name: Read docker-compose logs
+      - name: Read docker compose logs
         run: |
-          docker-compose logs
+          make logs
       - name: Read migrid logs
         run: |
           tail -n +1 state/log/*
       - name: Stop services
         run: |
-          docker-compose down
+          make down
diff --git a/Makefile b/Makefile
index 2689424b..18c4a31c 100755
--- a/Makefile
+++ b/Makefile
@@ -100,6 +100,9 @@ dockerclean: initcomposevars
 	${DOCKER} image prune -f
 	${DOCKER} builder prune -f || true
 
+logs:	initcomposevars
+	${DOCKER_COMPOSE} logs
+
 dockerpush:
 	${DOCKER} push $(OWNER)/$(IMAGE)${CONTAINER_TAG}