diff --git a/Makefile_v1 b/Makefile_v1
index 9c5c96c..b21e7bd 100644
--- a/Makefile_v1
+++ b/Makefile_v1
@@ -402,7 +402,7 @@ endif
 
 .phony: demo demo_all demo_Insta demo_EJBCA demo_CloudCA
 demo: demo_Insta
-demo_all: demo demo_EJBCA demo_CloudCA
+demo_all: demo demo_EJBCA
 demo_Insta: get_Insta_crls
 	$(MAKE) -f Makefile_v1 run_demo BIN_DIR="$(BIN_DIR)" CA_SECTION="Insta" SLEEP="sleep 1"
         # for Insta, sleep 1 helps avoid ERROR: server response error : Code=503,Reason=Service Unavailable
@@ -484,7 +484,7 @@ EJBCA_CRL_INTERVAL=5
 start_EJBCA: $(EJBCA_DOCKER_DIR)
 ifeq ($(EJBCA_CONFIG),)
 	@echo "starting EJBCA"
-	@cd $(EJBCA_DOCKER_DIR) && docker-compose -f docker-compose.yml up -d
+	@cd $(EJBCA_DOCKER_DIR) && docker compose -f docker-compose.yml up -d
 	@echo "probing until EJBCA docker is ready - usually takes some 70 seconds..."
 	@wget -q --tries=100 -nv http://${EJBCA_HOST}:${EJBCA_HTTPS_PORT}/ejbca -O /dev/null
 	@echo "EJBCA docker is ready now to accept requests."
@@ -501,7 +501,7 @@ endif
 stop_EJBCA: $(EJBCA_DOCKER_DIR)
 ifeq ($(EJBCA_CONFIG),)
 	@echo "stopping EJBCA"
-	@cd $(EJBCA_DOCKER_DIR) && docker-compose -f docker-compose.yml down
+	@cd $(EJBCA_DOCKER_DIR) && docker compose -f docker-compose.yml down
 endif
 
 .phony: start_Simple stop_Simple