diff --git a/Dockerfile b/Dockerfile
index 1bce3a7b..cba374a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN /usr/bin/yarn --cwd website \
   && /usr/bin/yarn --cwd website build
 
 # Main image derived from openvsx-server
-FROM docker.io/amvanbaren/openvsx-server:cb611288
+FROM ghcr.io/eclipse/openvsx-server:2252936
 
 COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/
 COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/ config/
diff --git a/configuration/application.yml b/configuration/application.yml
index 05cfbc38..eba74584 100644
--- a/configuration/application.yml
+++ b/configuration/application.yml
@@ -130,8 +130,8 @@ ovsx:
   webui:
     frontendRoutes: "/extension/**,/namespace/**,/user-settings/**,/admin-dashboard/**,/about,/publisher-agreement-*,/terms-of-use"
   eclipse:
-    # TODO change back to https://api-staging.eclipse.org/ after testing.
-    base-url: https://api.eclipse.org/
+    # TODO change back to https://api.eclipse.org/ after testing.
+    base-url: https://api-staging.eclipse.org/
     publisher-agreement:
       version: 1
       timezone: US/Eastern