diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bd14d1877..a26b795c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,6 @@ sniffers:compose:
   stage: sniffers
   script:
     - composer -vvv -V
-    # Can't use --strict cause we need dev versions for d9 compatibility
     - time composer validate --profile
   only:
     - branches
diff --git a/Makefile b/Makefile
index d8693df0a..f34c3c451 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ ifneq ("$(wildcard settings/settings.local.php)","")
 	$(call php, drush cr)
 endif
 
-REDIS_IS_INSTALLED := $(shell grep "redis.connection" web/sites/default/settings.php | tail -1 | wc -l || echo "0")
+REDIS_IS_INSTALLED := $(shell grep "redis.connection" web/sites/default/settings.php 2> /dev/null | tail -1 | wc -l || echo "0")
 redis-settings:
 ifeq ($(REDIS_IS_INSTALLED), 1)
 	@echo "Redis settings already installed, nothing to do"
@@ -200,8 +200,11 @@ DIRS = web/core web/libraries web/modules/contrib web/profiles/contrib web/sites
 ## Totally remove project build folder, docker containers and network
 clean: info
 	make -s down
-	$(eval SCAFFOLD = $(shell docker run --rm -v $(CURDIR):/mnt -w /mnt --user $(CUID):$(CGID) $(IMAGE_PHP) composer run-script list-scaffold-files | grep -P '^(?!>)'))
-	@docker run --rm --user 0:0 -v $(CURDIR):/mnt -w /mnt -e RMLIST="$(addprefix web/,$(SCAFFOLD)) $(DIRS)" $(IMAGE_PHP) sh -c 'for i in $$RMLIST; do rm -fr $$i && echo "Removed $$i"; done'
+ifdef CURDIR
+	@echo "CURDIR=$(CURDIR)"
+	#$(eval SCAFFOLD = $(shell docker run --rm -v $(CURDIR):/mnt -w /mnt --user $(CUID):$(CGID) $(IMAGE_PHP) composer run-script list-scaffold-files | grep -P '^(?!>)'))
+	#@docker run --rm --user 0:0 -v $(CURDIR):/mnt -w /mnt -e RMLIST="$(addprefix web/,$(SCAFFOLD)) $(DIRS)" $(IMAGE_PHP) sh -c 'for i in $$RMLIST; do rm -fr $$i && echo "Removed $$i"; done'
+endif
 ifdef DB_MOUNT_DIR
 	@echo "Clean-up database data from $(DB_MOUNT_DIR) ..."
 	docker run --rm --user 0:0 -v $(shell dirname $(DB_MOUNT_DIR)):/mnt $(IMAGE_PHP) sh -c "rm -fr /mnt/`basename $(DB_MOUNT_DIR)`"
diff --git a/scripts/makefile/system-detection.mk b/scripts/makefile/system-detection.mk
index 400c10e8f..6046b426e 100644
--- a/scripts/makefile/system-detection.mk
+++ b/scripts/makefile/system-detection.mk
@@ -24,7 +24,11 @@ else
 	    SYSTEM_OS = 'LINUX'
     endif
     ifeq ($(UNAME_S),Darwin)
-	    SYSTEM_OS = 'OS_X'
+        SYSTEM_OS = 'OS_X'
+        CUID=1000
+        CGID=1000
+        PHP_VERSION=7
+        COMPOSE_HTTP_TIMEOUT=1024
     endif
     UNAME_P := $(shell uname -p)
     ifeq ($(UNAME_P),x86_64)