diff --git a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
index c8237c00bc..1db3016b80 100644
--- a/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
+++ b/roles/openshift-apps/release-monitoring/templates/buildconfig.yml
@@ -11,7 +11,7 @@ items:
     source:
       dockerfile: |-
 {% if env == 'staging' %}
-        FROM fedora:34
+        FROM fedora:36
 {% else %}
         FROM fedora:32
 {% endif %}
@@ -82,7 +82,11 @@ items:
                 rm -rf anitya
         # Let's use staging auth server in staging
 {% if env == 'staging' %}
-        RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.9/site-packages/social_auth_core-4.1.0-py3.9.egg/social_core/backends/fedora.py
+        RUN sed -i 's/id.fedoraproject.org/id.stg.fedoraproject.org/g' /usr/local/lib/python3.10/site-packages/social_core/backends/fedora.py
+
+        # Hotfix for social_auth-sqlalchemy
+        # Could be removed when we switch to something else
+        RUN sed -i 's/base64.encodestring/base64.encodebytes/g' /usr/local/lib/python3.10/site-packages/social_sqlalchemy/storage.py
 {% endif %}
         RUN mkdir /httpdir
         RUN chmod 777 /httpdir