diff --git a/.drone.env b/.drone.env
index 0bea9423b04..a5fc70130c7 100644
--- a/.drone.env
+++ b/.drone.env
@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=9c3511d2b08de25b16be3d309d0a7710b6848747
-OCIS_BRANCH=master
+OCIS_COMMITID=6d2d79ba1dfc99f653f3c08267dfcacf992fb716
+OCIS_BRANCH=stable-4.0
diff --git a/.drone.star b/.drone.star
index ca5f563b107..1ca2c52f2e4 100644
--- a/.drone.star
+++ b/.drone.star
@@ -11,7 +11,7 @@ OC_CI_BAZEL_BUILDIFIER = "owncloudci/bazel-buildifier"
 OC_CI_CORE_NODEJS = "owncloudci/core:nodejs14"
 OC_CI_DRONE_ANSIBLE = "owncloudci/drone-ansible:latest"
 OC_CI_DRONE_SKIP_PIPELINE = "owncloudci/drone-skip-pipeline"
-OC_CI_GOLANG = "owncloudci/golang:1.19"
+OC_CI_GOLANG = "owncloudci/golang:1.20"
 OC_CI_HUGO = "owncloudci/hugo:0.115.2"
 OC_CI_NODEJS = "owncloudci/nodejs:18"
 OC_CI_PHP = "owncloudci/php:7.4"