diff --git a/oscbot/__init__.py b/oscbot/__init__.py
index 27d4c40..57f87b9 100644
--- a/oscbot/__init__.py
+++ b/oscbot/__init__.py
@@ -14,8 +14,6 @@ from maubot.handlers import command
 from mautrix.util.config import BaseProxyConfig, ConfigUpdateHelper
 
 
-API_URL = "https://api.opensuse.org"
-
 HEADER_TEMPLATE = """
 ### Package status
 
@@ -78,7 +76,8 @@ class OSCBot(Plugin):
         username = self.config["username"]
         password = self.config["password"]
 
-        api_call = f"{API_URL}/build/{project}/_result"
+        api_url = self.config["api_url"]
+        api_call = f"{api_url}/build/{project}/_result"
 
         auth = aiohttp.BasicAuth(username, password)
 
@@ -153,10 +152,16 @@ class OSCBot(Plugin):
                      repository: Optional[str] = None,
                      arch: Optional[str] = None) -> None:
 
+        # There is no concept of non-positional arguments in maubot
+        # So we just use "all" in case we want to skip something
         if state == "all":
             state = None
         if package == "all":
             package = None
+        if repository == "all":
+            repository = None
+        if arch == "all":
+            arch = None
 
         response = await self.parse_status(project, package, state=state,
                                            repo=repository, arch=arch)