diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index b8392e5b..47cf5d53 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -183,7 +183,7 @@ def get_default_cachedir():
     removed.
 
     """
-    appname = __name__.split('.')[0]
+    appname = __name__.split('.', maxsplit=1)[0]
     try:
         import platformdirs
 
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 0a9762fe..ce71e9b3 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1420,9 +1420,9 @@ def parse_ios_screenshot_name(path):
     s = path.stem.split('@')
     if len(s) >= 2:
         if "iphone" in s[0].lower():
-            return ("phoneScreenshots", s[0].strip(), ('@'.join(s[1:])).split('-')[0].strip())
+            return ("phoneScreenshots", s[0].strip(), ('@'.join(s[1:])).split('-', maxsplit=1)[0].strip())
         elif "ipad" in s[0].lower():
-            return ("tenInchScreenshots", s[0].strip(), ('@'.join(s[1:])).split('-')[0].strip())
+            return ("tenInchScreenshots", s[0].strip(), ('@'.join(s[1:])).split('-', maxsplit=1)[0].strip())
     else:
         fragments = path.stem.lower().split("_")
         device = "unknown"