diff --git a/Makefile b/Makefile
index 73267f87d..acda6f18e 100644
--- a/Makefile
+++ b/Makefile
@@ -32,10 +32,10 @@ update: # Update everything (i.e. after a branch update)
 	$(MAKE) up
 
 test:
-	docker-compose run --rm --user=azuracast web composer run cleanup-and-test
+	docker-compose exec --user=azuracast web composer run cleanup-and-test
 
 bash:
-	docker-compose run --rm --user=azuracast web bash
+	docker-compose exec --user=azuracast web bash
 
 frontend-bash:
 	docker-compose -f frontend/docker-compose.yml build
diff --git a/src/Console/Command/SyncCommand.php b/src/Console/Command/SyncCommand.php
index 1d73eaf88..f58e815c7 100644
--- a/src/Console/Command/SyncCommand.php
+++ b/src/Console/Command/SyncCommand.php
@@ -11,9 +11,11 @@ class SyncCommand extends CommandAbstract
 {
     public function __invoke(
         Runner $sync,
-        string $task = App\Event\GetSyncTasks::SYNC_NOWPLAYING,
+        ?string $task = null,
         bool $force = false
     ): int {
+        $task ??= App\Event\GetSyncTasks::SYNC_NOWPLAYING;
+
         $sync->runSyncTask($task, $force);
         return 0;
     }