diff --git a/composer.json b/composer.json
index dc49dc3..c80dec7 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
         "drupal/gin": "^3.0-rc",
         "drupal/core": "^9",
         "drush/drush": "^11.4",
-        "os2forms/os2forms": "dev-f/OSF-25_repo_cleanup",
+        "os2forms/os2forms": "^3.6",
         "os2web/os2web_simplesaml": "8.x-dev"
     },
     "require-dev": {